possible fix for issue 3014
thanks to iceman4love77 for tracking the error git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6501 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
63ec59f6c2
commit
28216fc7f2
|
@ -716,7 +716,7 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE
|
||||||
|
|
||||||
// Color is passed in bgra mode so we need to convert it to rgba
|
// Color is passed in bgra mode so we need to convert it to rgba
|
||||||
u32 rgbaColor = (color & 0xFF00FF00) | ((color >> 16) & 0xFF) | ((color << 16) & 0xFF0000);
|
u32 rgbaColor = (color & 0xFF00FF00) | ((color >> 16) & 0xFF) | ((color << 16) & 0xFF0000);
|
||||||
D3D::drawClearQuad(rgbaColor, (z & 0xFFFFFF) / float(0xFFFFFF), PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader(), VertexShaderCache::GetClearInputLayout());
|
D3D::drawClearQuad((rgbaColor | (alphaEnable ? 0x0 : 0xFF000000)), (z & 0xFFFFFF) / float(0xFFFFFF), PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader(), VertexShaderCache::GetClearInputLayout());
|
||||||
|
|
||||||
D3D::stateman->PopDepthState();
|
D3D::stateman->PopDepthState();
|
||||||
D3D::stateman->PopBlendState();
|
D3D::stateman->PopBlendState();
|
||||||
|
|
|
@ -807,7 +807,7 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE
|
||||||
vp.MinZ = 0.0;
|
vp.MinZ = 0.0;
|
||||||
vp.MaxZ = 1.0;
|
vp.MaxZ = 1.0;
|
||||||
D3D::dev->SetViewport(&vp);
|
D3D::dev->SetViewport(&vp);
|
||||||
D3D::drawClearQuad(color, (z & 0xFFFFFF) / float(0xFFFFFF), PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader());
|
D3D::drawClearQuad((color | (alphaEnable ? 0x0 : 0xFF000000)), (z & 0xFFFFFF) / float(0xFFFFFF), PixelShaderCache::GetClearProgram(), VertexShaderCache::GetClearVertexShader());
|
||||||
RestoreAPIState();
|
RestoreAPIState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -831,7 +831,7 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE
|
||||||
((color >> 16) & 0xFF) / 255.0f,
|
((color >> 16) & 0xFF) / 255.0f,
|
||||||
((color >> 8) & 0xFF) / 255.0f,
|
((color >> 8) & 0xFF) / 255.0f,
|
||||||
(color & 0xFF) / 255.0f,
|
(color & 0xFF) / 255.0f,
|
||||||
((color >> 24) & 0xFF) / 255.0f
|
(alphaEnable ? ((color >> 24) & 0xFF) / 255.0f : 1.0f)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (zEnable)
|
if (zEnable)
|
||||||
|
|
Loading…
Reference in New Issue