Merge pull request #191 from Jezze/for-dolphin

Some cleanups for OGL/Vertexmanager.cpp
This commit is contained in:
Tony Wasserka 2014-03-18 20:47:44 +01:00
commit 51fdf8a9b2

View File

@ -143,19 +143,11 @@ void VertexManager::vFlush(bool useDstAlpha)
// Makes sure we can actually do Dual source blending // Makes sure we can actually do Dual source blending
bool dualSourcePossible = g_ActiveConfig.backend_info.bSupportsDualSourceBlend; bool dualSourcePossible = g_ActiveConfig.backend_info.bSupportsDualSourceBlend;
// finally bind
if (dualSourcePossible)
{
if (useDstAlpha)
{
// If host supports GL_ARB_blend_func_extended, we can do dst alpha in // If host supports GL_ARB_blend_func_extended, we can do dst alpha in
// the same pass as regular rendering. // the same pass as regular rendering.
ProgramShaderCache::SetShader(DSTALPHA_DUAL_SOURCE_BLEND, g_nativeVertexFmt->m_components); if (useDstAlpha && dualSourcePossible)
}
else
{ {
ProgramShaderCache::SetShader(DSTALPHA_NONE,g_nativeVertexFmt->m_components); ProgramShaderCache::SetShader(DSTALPHA_DUAL_SOURCE_BLEND, g_nativeVertexFmt->m_components);
}
} }
else else
{ {
@ -166,7 +158,6 @@ void VertexManager::vFlush(bool useDstAlpha)
ProgramShaderCache::UploadConstants(); ProgramShaderCache::UploadConstants();
// setup the pointers // setup the pointers
if (g_nativeVertexFmt)
g_nativeVertexFmt->SetupVertexPointers(); g_nativeVertexFmt->SetupVertexPointers();
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();