diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-02-02 18:28:16 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-02-02 18:28:16 +0300 |
| commit | c1057ac19641c8a08bec9d8885b0f8e7d885cf75 (patch) | |
| tree | 32148cc2c849428c87c703d1a09d1c9acd0cdd32 | |
| parent | b1add8e5bd55222080da8dc539b782970a49f3a7 (diff) | |
Fix ogl warnings.
| -rw-r--r-- | source/blender/gpu/intern/gpu_texture.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c index 91159227069..2cc709db3b3 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); |