diff options
| author | NeoBrainX <NeoBrainX@googlemail.com> | 2011-01-24 11:57:17 +0000 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@googlemail.com> | 2011-01-24 11:57:17 +0000 |
| commit | f33cd7cbbd3daefe8e12593d19e2eb310a10069f (patch) | |
| tree | e7f7d7835d36aaeef075a7505fc26e0da8e19603 /Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | |
| parent | e0c609272110d543941693e3ec6cd8fc0e0934f1 (diff) | |
DX11 code maintenance, part 5:
Move shader and input layout management from EmuGfxState to Vertex/PixelShaderCache and D3DVertexFormat.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6906 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoDX11/Src/Render.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp index 713dd707d0..fb26f3b759 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp @@ -1190,7 +1190,7 @@ void Renderer::ApplyState(bool bUseDstAlpha) hr = D3D::device->CreateBlendState(&gx_state.blenddc, &blstate); if (FAILED(hr)) PanicAlert("Failed to create blend state at %s %d\n", __FILE__, __LINE__); D3D::stateman->PushBlendState(blstate); - D3D::SetDebugObjectName((ID3D11DeviceChild*)blstate, "a blend state of EmuGfxState"); + D3D::SetDebugObjectName((ID3D11DeviceChild*)blstate, "blend state used to emulate the GX pipeline"); SAFE_RELEASE(blstate); ID3D11DepthStencilState* depth_state; @@ -1233,6 +1233,9 @@ void Renderer::ApplyState(bool bUseDstAlpha) SetBlendMode(false); SetLogicOpMode(); } + + D3D::context->PSSetShader(PixelShaderCache::GetActiveShader(), NULL, 0); + D3D::context->VSSetShader(VertexShaderCache::GetActiveShader(), NULL, 0); } void Renderer::RestoreState() |