summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2014-12-14 14:42:07 +1100
committerskidau <skidau@gmail.com>2014-12-14 14:42:07 +1100
commit15f7e63cc20690f3a65100a7053821e1d935f1ac (patch)
tree6c541ca187265e51566133aefadc426a3c364c46 /Source/Core/VideoBackends/OGL/FramebufferManager.cpp
parent45dedfcb8ea71e85b4cea43256532265362e8adb (diff)
parent029f8c3c3f065de723a1a334f70d2882208b7cdf (diff)
Merge pull request #1650 from unknownbrackets/attributeless-fix
OGL: Unbind the active VAO before attributeless rendering
Diffstat (limited to 'Source/Core/VideoBackends/OGL/FramebufferManager.cpp')
-rw-r--r--Source/Core/VideoBackends/OGL/FramebufferManager.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
index c458b79dc6..1089884b96 100644
--- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
+++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
@@ -373,6 +373,8 @@ void FramebufferManager::ReinterpretPixelData(unsigned int convtype)
{
g_renderer->ResetAPIState();
+ OpenGL_BindAttributelessVAO();
+
GLuint src_texture = 0;
// We aren't allowed to render and sample the same texture in one draw call,