TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-12 08:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix directx rendertarget crash

Browse source 
asset brower previews were asserting due to a cornercase rt assignment
also ditch mipgen for rts targetting a texture profile that's marked as nomip, and adjust hdr uopsampling shader to compensate for overdarks
This commit is contained in:
AzaezelX 2025-08-11 23:21:20 -05:00
parent 0404b743f6
commit 00ee42e2a8
4 changed files with 18 additions and 17 deletions
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);