[Bf-blender-cvs] [c1057ac196] clay-engine: Fix ogl warnings.

[Clément Foucault]

Commit: c1057ac19641c8a08bec9d8885b0f8e7d885cf75
Author: Clément Foucault
Date:   Thu Feb 2 16:28:16 2017 +0100
Branches: clay-engine
https://developer.blender.org/rBc1057ac19641c8a08bec9d8885b0f8e7d885cf75

Fix ogl warnings.

===================================================================

M	source/blender/gpu/intern/gpu_texture.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index 9115922706..2cc709db3b 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -597,7 +597,13 @@ void GPU_texture_bind(GPUTexture *tex, int number)
 	else
 		GPU_invalid_tex_bind(tex->target_base);
 
-	glEnable(tex->target_base); /* TODO: remove this line once we're using GLSL everywhere */
+	/* TODO: remove this lines */
+	GLenum target = tex->target_base;
+	if (tex->target_base == GL_TEXTURE_1D_ARRAY)
+		target = GL_TEXTURE_2D;
+	if (tex->target_base == GL_TEXTURE_2D_ARRAY)
+		target = GL_TEXTURE_3D;
+	glEnable(target);
 
 	if (number != 0)
 		glActiveTexture(GL_TEXTURE0);
@@ -619,7 +625,14 @@ void GPU_texture_unbind(GPUTexture *tex)
 		glActiveTexture(GL_TEXTURE0 + tex->number);
 
 	glBindTexture(tex->target_base, 0);
-	glDisable(tex->target_base); /* TODO: remove this line */
+
+	/* TODO: remove this lines */
+	GLenum target = tex->target_base;
+	if (tex->target_base == GL_TEXTURE_1D_ARRAY)
+		target = GL_TEXTURE_2D;
+	if (tex->target_base == GL_TEXTURE_2D_ARRAY)
+		target = GL_TEXTURE_3D;
+	glDisable(target);
 
 	if (tex->number != 0)
 		glActiveTexture(GL_TEXTURE0);