diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2015-11-02 11:41:43 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2015-11-02 11:41:43 +0100 |
| commit | 89f645151357f652a8e5bfef996b611a2992245e (patch) | |
| tree | e3af8cbfbadf076220b0eb2e26a025ef574702b1 /Source/Core/VideoBackends/OGL/VertexManager.cpp | |
| parent | baf438fc9fb3558f78eb1439471727dfdb0084fb (diff) | |
| parent | 983978ee66cc15c010b2af6703aab866f3a41dcf (diff) | |
Merge pull request #3218 from Tilka/components
VideoCommon: flush vertex manager if components change
Diffstat (limited to 'Source/Core/VideoBackends/OGL/VertexManager.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/VertexManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp index e2ea5e8fe3..82f9763808 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.cpp +++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp @@ -160,11 +160,11 @@ void VertexManager::vFlush(bool useDstAlpha) // the same pass as regular rendering. if (useDstAlpha && dualSourcePossible) { - ProgramShaderCache::SetShader(DSTALPHA_DUAL_SOURCE_BLEND, nativeVertexFmt->m_components, current_primitive_type); + ProgramShaderCache::SetShader(DSTALPHA_DUAL_SOURCE_BLEND, current_primitive_type); } else { - ProgramShaderCache::SetShader(DSTALPHA_NONE, nativeVertexFmt->m_components, current_primitive_type); + ProgramShaderCache::SetShader(DSTALPHA_NONE, current_primitive_type); } // upload global constants @@ -178,7 +178,7 @@ void VertexManager::vFlush(bool useDstAlpha) // run through vertex groups again to set alpha if (useDstAlpha && !dualSourcePossible) { - ProgramShaderCache::SetShader(DSTALPHA_ALPHA_PASS, nativeVertexFmt->m_components, current_primitive_type); + ProgramShaderCache::SetShader(DSTALPHA_ALPHA_PASS, current_primitive_type); // only update alpha glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE); |