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

Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development

Browse source
This commit is contained in:
Areloch 2019-05-06 01:49:58 -05:00
commit 00b958aff9
549 changed files with 68656 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -825,10 +825,10 @@ 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);
//mD3DDeviceContext->PSSetShader(mLastPixShader, NULL, 0);
//mD3DDeviceContext->VSSetShader(mLastVertShader, NULL, 0);
// Mark everything dirty and flush to card, for sanity.
updateStates(true);
//updateStates(true);
}
void GFXD3D11Device::setupGenericShaders(GenericShaderType type)