diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2020-08-21 00:03:51 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2020-08-21 00:03:51 +0300 |
| commit | 3b36e2b7817dee8a800f3c4f4b89b7f64da8155b (patch) | |
| tree | 62786e141de120bb7765a240ebe7321dfb4007cd /source/blender/gpu/opengl/gl_shader.cc | |
| parent | 57c3718447a4b3db92475ecc86a6d793bd839aef (diff) | |
| parent | ce0bcd5fbf40b44c515773434bc7187b093fdb53 (diff) | |
Merge branch 'master' into newboolean
Diffstat (limited to 'source/blender/gpu/opengl/gl_shader.cc')
| -rw-r--r-- | source/blender/gpu/opengl/gl_shader.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc index ea33ff00d69..93ed7a408c6 100644 --- a/source/blender/gpu/opengl/gl_shader.cc +++ b/source/blender/gpu/opengl/gl_shader.cc @@ -29,6 +29,7 @@ #include "GPU_platform.h" #include "gl_shader.hh" +#include "gl_shader_interface.hh" using namespace blender; using namespace blender::gpu; @@ -203,10 +204,7 @@ bool GLShader::finalize(void) return false; } - /* TODO(fclem) We need this to modify the image binding points using glUniform. - * This could be avoided using glProgramUniform in GL 4.1. */ - glUseProgram(shader_program_); - interface = GPU_shaderinterface_create(shader_program_); + interface = new GLShaderInterface(shader_program_); return true; } |