diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-11-30 16:52:46 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-11-30 16:55:46 +0300 |
commit | f61ad0e1017bcf924b0529738c08c3a74d1e7476 (patch) | |
tree | 9c09708721736b557a126d39e503f9e2b9ba95ef /source/blender/gpu/opengl | |
parent | 6fba2726c77167f8a4746312cb0d522fd43e4c63 (diff) |
Fix T83203 BGL: shader.program wrongly always returns 0
This was a leftover from the 2.91 GPU module refactor.
This is an exception that should be removed when we remove BGL.
Diffstat (limited to 'source/blender/gpu/opengl')
-rw-r--r-- | source/blender/gpu/opengl/gl_shader.cc | 5 | ||||
-rw-r--r-- | source/blender/gpu/opengl/gl_shader.hh | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc index cc5f83228d6..28b89ad48f5 100644 --- a/source/blender/gpu/opengl/gl_shader.cc +++ b/source/blender/gpu/opengl/gl_shader.cc @@ -426,4 +426,9 @@ void GLShader::vertformat_from_shader(GPUVertFormat *format) const } } +int GLShader::program_handle_get(void) const +{ + return (int)this->shader_program_; +} + /** \} */ diff --git a/source/blender/gpu/opengl/gl_shader.hh b/source/blender/gpu/opengl/gl_shader.hh index a686014f4c5..befb2bce8b0 100644 --- a/source/blender/gpu/opengl/gl_shader.hh +++ b/source/blender/gpu/opengl/gl_shader.hh @@ -71,6 +71,9 @@ class GLShader : public Shader { void vertformat_from_shader(GPUVertFormat *format) const override; + /* DEPRECATED: Kept only because of BGL API. */ + int program_handle_get(void) const override; + private: char *glsl_patch_get(void); |