浏览代码

Merge pull request #2065 from rextimmy/d3d11_crash_fix

Fix potential crash with D3D11
Areloch 8 年之前
父节点
当前提交
da1ac47a93
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 3 1
      Engine/source/gfx/D3D11/gfxD3D11Device.cpp
  2. 0 1
      Engine/source/gfx/D3D11/gfxD3D11Device.h

+ 3 - 1
Engine/source/gfx/D3D11/gfxD3D11Device.cpp

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

+ 0 - 1
Engine/source/gfx/D3D11/gfxD3D11Device.h

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