diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2017-09-03 19:25:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-03 19:25:46 -0700 |
| commit | 26e777d80bb125e12a4a93e0e727c804a0facd34 (patch) | |
| tree | fddffb3e8d0e85a0c69fac46b1ea69e695d155cb /Source/Core/VideoBackends/OGL/Render.cpp | |
| parent | 2e8bc0fa07d9b1b1a7eee6d14d135de829b14711 (diff) | |
| parent | 3dd675e61382685b2c3d6c82b1c822f135e83934 (diff) | |
Merge pull request #5337 from stenzek/d3d-common-blending-state
D3D: Use blending state from VideoCommon
Diffstat (limited to 'Source/Core/VideoBackends/OGL/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 7e36f0be22..8953b10831 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -1264,11 +1264,8 @@ void Renderer::ReinterpretPixelData(unsigned int convtype) } } -void Renderer::SetBlendMode(bool forceUpdate) +void Renderer::SetBlendingState(const BlendingState& state) { - BlendingState state; - state.Generate(bpmem); - bool useDualSource = state.usedualsrc && g_ActiveConfig.backend_info.bSupportsDualSourceBlend && (!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DUAL_SOURCE_BLENDING) || state.dstalpha); @@ -1791,7 +1788,7 @@ void Renderer::RestoreAPIState() SetGenerationMode(); BPFunctions::SetScissor(); SetDepthMode(); - SetBlendMode(true); + BPFunctions::SetBlendMode(); SetViewport(); ProgramShaderCache::BindLastVertexFormat(); |
