From 8ff5329b496c4d599f95eb2703716506bff94ffa Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 3 May 2016 20:39:13 +0200
Subject: OPENGL: Assure color attributes for shader pipeline are always set.

---
 backends/graphics/opengl/pipelines/shader.cpp | 4 ++--
 backends/graphics/opengl/texture.cpp          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'backends/graphics/opengl')

diff --git a/backends/graphics/opengl/pipelines/shader.cpp b/backends/graphics/opengl/pipelines/shader.cpp
index 8e38458f73..a2dabb7c22 100644
--- a/backends/graphics/opengl/pipelines/shader.cpp
+++ b/backends/graphics/opengl/pipelines/shader.cpp
@@ -56,6 +56,8 @@ void ShaderPipeline::activateInternal() {
 	}
 
 	_activeShader->activate();
+
+	GL_CALL(glVertexAttribPointer(_colorAttribLocation, 4, GL_FLOAT, GL_FALSE, 0, _colorAttributes));
 }
 
 void ShaderPipeline::deactivateInternal() {
@@ -74,8 +76,6 @@ void ShaderPipeline::setColor(GLfloat r, GLfloat g, GLfloat b, GLfloat a) {
 		*dst++ = b;
 		*dst++ = a;
 	}
-
-	GL_CALL(glVertexAttribPointer(_colorAttribLocation, 4, GL_FLOAT, GL_FALSE, 0, _colorAttributes));
 }
 
 void ShaderPipeline::drawTexture(const GLTexture &texture, const GLfloat *coordinates) {
diff --git a/backends/graphics/opengl/texture.cpp b/backends/graphics/opengl/texture.cpp
index 8b94549971..33598b5488 100644
--- a/backends/graphics/opengl/texture.cpp
+++ b/backends/graphics/opengl/texture.cpp
@@ -509,6 +509,7 @@ TextureCLUT8GPU::TextureCLUT8GPU()
 	// Setup pipeline.
 	_clut8Pipeline->setFramebuffer(_target);
 	_clut8Pipeline->setPaletteTexture(&_paletteTexture);
+	_clut8Pipeline->setColor(1.0f, 1.0f, 1.0f, 1.0f);
 }
 
 TextureCLUT8GPU::~TextureCLUT8GPU() {
-- 
cgit v1.2.3