mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-04 15:19:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DX11 code maintenance, part 5:

Browse source 
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
This commit is contained in:
NeoBrainX 2011-01-24 11:57:17 +00:00
commit f33cd7cbbd
11 changed files with 40 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
View file

@ -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()