piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert Rodolfo's recent zcomploc commits until they actually work correctly.

Browse Source 
This reverts commit 402006a83a.
This reverts commit 48d8d71391.
This reverts commit 450dcc9d2c.
This commit is contained in:
NeoBrainX
2012-03-30 01:56:24 +02:00
parent f7c17c6351
commit 460610ea0e
16 changed files with 75 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
View File

@ -1211,11 +1211,11 @@ void Renderer::RestoreAPIState()
BPFunctions::SetScissor();
}
void Renderer::ApplyState(RenderStateMode mode)
void Renderer::ApplyState(bool bUseDstAlpha)
{
HRESULT hr;
if (mode == RSM_UseDstAlpha)
if (bUseDstAlpha)
{
// Colors should blend against SRC1_ALPHA
if (gx_state.blenddc.RenderTarget[0].SrcBlend == D3D11_BLEND_SRC_ALPHA)
@ -1275,7 +1275,7 @@ void Renderer::ApplyState(RenderStateMode mode)
D3D::stateman->Apply();
if (mode == RSM_UseDstAlpha)
if (bUseDstAlpha)
{
// restore actual state
SetBlendMode(false);
@ -1289,7 +1289,7 @@ void Renderer::ApplyState(RenderStateMode mode)
D3D::context->VSSetShader(VertexShaderCache::GetActiveShader(), NULL, 0);
}
void Renderer::RestoreState(RenderStateMode mode)
void Renderer::RestoreState()
{
ID3D11ShaderResourceView* shader_resources[8] = { NULL };
D3D::context->PSSetShaderResources(0, 8, shader_resources);

4
Source/Plugins/Plugin_VideoDX11/Src/Render.h
View File

@ -25,8 +25,8 @@ public:
void SetInterlacingMode();
// TODO: Fix confusing names (see ResetAPIState and RestoreAPIState)
void ApplyState(RenderStateMode mode);
void RestoreState(RenderStateMode mode);
void ApplyState(bool bUseDstAlpha);
void RestoreState();
void ApplyCullDisable();
void RestoreCull();

4
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
View File

@ -264,13 +264,13 @@ void VertexManager::vFlush()
unsigned int stride = g_nativeVertexFmt->GetVertexStride();
g_nativeVertexFmt->SetupVertexPointers();
g_renderer->ApplyState(useDstAlpha ? RSM_UseDstAlpha : RSM_None);
g_renderer->ApplyState(useDstAlpha);
LoadBuffers();
Draw(stride);
GFX_DEBUGGER_PAUSE_AT(NEXT_FLUSH, true);
g_renderer->RestoreState(useDstAlpha ? RSM_UseDstAlpha : RSM_None);
g_renderer->RestoreState();
shader_fail:
ResetBuffer();