diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-09-16 19:05:00 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-09-17 14:33:48 +0300 |
| commit | c3034afa586e3c5009f852e42c6a46000daa2551 (patch) | |
| tree | b81dc05c9da2b7164d95ce2c3bb2b3947a5d767c /source/blender/gpu/intern/gpu_basic_shader.c | |
| parent | 834cb93f4059973595fcb7a579e4ad369c1a430c (diff) | |
OpenGL: simplify basic_shader_bind
No need to enable/disable texturing with GLSL, just use textures in the fragment shader.
Diffstat (limited to 'source/blender/gpu/intern/gpu_basic_shader.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_basic_shader.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/source/blender/gpu/intern/gpu_basic_shader.c b/source/blender/gpu/intern/gpu_basic_shader.c index a2b89239344..c1b9d9acc65 100644 --- a/source/blender/gpu/intern/gpu_basic_shader.c +++ b/source/blender/gpu/intern/gpu_basic_shader.c @@ -422,23 +422,6 @@ void GPU_basic_shader_bind(int options) { if (USE_GLSL) { if (options) { - const int bound_options = GPU_MATERIAL_STATE.bound_options; - - /* texture options need to be set for basic shader too */ - if (options & GPU_SHADER_TEXTURE_2D) { - glEnable(GL_TEXTURE_2D); - } - else if (bound_options & GPU_SHADER_TEXTURE_2D) { - glDisable(GL_TEXTURE_2D); - } - - if (options & GPU_SHADER_TEXTURE_RECT) { - glEnable(GL_TEXTURE_RECTANGLE); - } - else if (bound_options & GPU_SHADER_TEXTURE_RECT) { - glDisable(GL_TEXTURE_RECTANGLE); - } - GPUShader *shader = gpu_basic_shader(options); if (shader) { |