TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-28 15:55:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2065 from rextimmy/d3d11_crash_fix

Browse source 
Fix potential crash with D3D11
This commit is contained in:
Areloch 2017-08-14 02:04:10 -05:00 • committed by GitHub
commit da1ac47a93
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/D3D11/gfxD3D11Device.cpp
View file

@ -824,7 +824,9 @@ void GFXD3D11Device::reset(DXGI_SWAP_CHAIN_DESC &d3dpp)
// Now re aquire all the resources we trashed earlier // Now re aquire all the resources we trashed earlier
reacquireDefaultPoolResources(); reacquireDefaultPoolResources();
//set last bound shaders
mD3DDeviceContext->PSSetShader(mLastPixShader, NULL, 0);
mD3DDeviceContext->VSSetShader(mLastVertShader, NULL, 0);
// Mark everything dirty and flush to card, for sanity. // Mark everything dirty and flush to card, for sanity.
updateStates(true); updateStates(true);
} }

1
Engine/source/gfx/D3D11/gfxD3D11Device.h
View file

@ -134,7 +134,6 @@ protected:
ID3D11DeviceContext1* mD3DDeviceContext1; ID3D11DeviceContext1* mD3DDeviceContext1;
ID3DUserDefinedAnnotation* mUserAnnotation; ID3DUserDefinedAnnotation* mUserAnnotation;
GFXShader* mCurrentShader;
GFXShaderRef mGenericShader[GS_COUNT]; GFXShaderRef mGenericShader[GS_COUNT];
GFXShaderConstBufferRef mGenericShaderBuffer[GS_COUNT]; GFXShaderConstBufferRef mGenericShaderBuffer[GS_COUNT];
GFXShaderConstHandle *mModelViewProjSC[GS_COUNT]; GFXShaderConstHandle *mModelViewProjSC[GS_COUNT];