TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1535 from Azaezel/alpha41/mipMangle

Browse source 
fix directx rendertarget crash
This commit is contained in:
Brian Roberts 2025-08-11 23:21:45 -05:00 committed by GitHub
parent 0404b743f6 00ee42e2a8
commit e2704b95c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Engine/source/gfx/D3D11/gfxD3D11Target.cpp
View file

@ -106,9 +106,9 @@ void GFXD3D11TextureTarget::attachTexture( RenderSlot slot, GFXTextureObject *te
else
{
// Cast the texture object to D3D...
AssertFatal(static_cast<GFXD3D11TextureObject*>(tex), "GFXD3D11TextureTarget::attachTexture - invalid texture object.");
AssertFatal(dynamic_cast<GFXD3D11TextureObject*>(tex), "GFXD3D11TextureTarget::attachTexture - invalid texture object.");
GFXD3D11TextureObject *d3dto = static_cast<GFXD3D11TextureObject*>(tex);
GFXD3D11TextureObject *d3dto = dynamic_cast<GFXD3D11TextureObject*>(tex);
// Grab the surface level.
if( slot == DepthStencil )
@ -134,7 +134,6 @@ void GFXD3D11TextureTarget::attachTexture( RenderSlot slot, GFXTextureObject *te
mTargets[slot]->AddRef();
mTargetViews[slot] = d3dto->getRTView();
mTargetViews[slot]->AddRef();
mResolveTargets[slot] = d3dto;
}
else
{
@ -271,17 +270,21 @@ void GFXD3D11TextureTarget::deactivate()
return;
//re-gen mip maps
for (U32 i = 0; i < 6; i++)
for (U32 i = GFXTextureTarget::Color0; i < GFXTextureTarget::MaxRenderSlotId; i++)
{
D3D11_TEXTURE2D_DESC desc;
if (mResolveTargets[GFXTextureTarget::Color0 + i])
GFXD3D11TextureObject* targ = mResolveTargets[i];
ID3D11ShaderResourceView* pSRView = mTargetSRViews[i];
if (targ && targ->getSurface() && pSRView)
{
mResolveTargets[GFXTextureTarget::Color0 + i]->get2DTex()->GetDesc(&desc);
if (desc.MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS)
ID3D11Texture2D* tex = dynamic_cast<ID3D11Texture2D*>(targ->getResource());
if (tex)
{
ID3D11ShaderResourceView* pSRView = mTargetSRViews[GFXTextureTarget::Color0 + i];
if (pSRView)
D3D11_TEXTURE2D_DESC desc;
tex->GetDesc(&desc);
if (desc.MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS)
{
D3D11DEVICECONTEXT->GenerateMips(pSRView);
}
}
}
}
@ -341,8 +344,8 @@ GFXD3D11WindowTarget::GFXD3D11WindowTarget()
GFXD3D11WindowTarget::~GFXD3D11WindowTarget()
{
SAFE_RELEASE(mDepthStencilView)
SAFE_RELEASE(mDepthStencil);
SAFE_RELEASE(mDepthStencilView);
SAFE_RELEASE(mDepthStencil);
SAFE_RELEASE(mBackBufferView);
SAFE_RELEASE(mBackBuffer);
SAFE_RELEASE(mSwapChain);

2
Engine/source/gfx/gfxTextureManager.cpp
View file

@ -1418,7 +1418,7 @@ void GFXTextureManager::_validateTexParams( const U32 width, const U32 height,
{
// If a texture is not power-of-2 in size for both dimensions, it must
// have only 1 mip level.
if (profile->isRenderTarget())
if (profile->isRenderTarget() && !profile->noMip())
{
if (inOutNumMips == 0) //auto
inOutNumMips = mFloor(mLog2(mMax(width, height))) + 1;

5
Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/upSampleP.glsl
View file

@ -55,11 +55,10 @@ void main()
upSample.rgb = e*4.0;
upSample.rgb += (b+d+f+h)*2.0;
upSample.rgb += (a+c+g+i);
upSample.rgb *= 1.0 / 16.0;
upSample.rgb += (a+c+g+i);
finalOut += upSample;
}
finalOut /= mipCount0;
finalOut /= pow(mipCount0,3);
finalOut.a = 1.0;
OUT_col = finalOut;

1
Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_Bloom/upSampleP.hlsl
View file

@ -51,7 +51,6 @@ float4 main(PFXVertToPix IN) : TORQUE_TARGET0
upSample.rgb = e*4.0;
upSample.rgb += (b+d+f+h)*2.0;
upSample.rgb += (a+c+g+i);
upSample.rgb *= 1.0 / 16.0;
finalOut += upSample;
}
finalOut /= mipCount0;