diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-21 14:48:34 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-21 15:16:42 +0300 |
commit | 220fbdf59341f620c06959280e2145132003c5df (patch) | |
tree | 32f1d80da91aee1bbe13e69b7f8ac3c93e429ccc /source/blender/gpu/opengl/gl_batch.cc | |
parent | 1e95a7402c62d2380710a56733e6c4cbe390b3be (diff) |
GPUShader: Make GPUShader* an opaque pointer to blender::gpu::Shader
This avoids the misleading inheritance.
Also cleanup by setting the blender::gpu::Shader as active shader to
avoid some casting.
Diffstat (limited to 'source/blender/gpu/opengl/gl_batch.cc')
-rw-r--r-- | source/blender/gpu/opengl/gl_batch.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/opengl/gl_batch.cc b/source/blender/gpu/opengl/gl_batch.cc index 9ca0a9f71db..89784a17ec6 100644 --- a/source/blender/gpu/opengl/gl_batch.cc +++ b/source/blender/gpu/opengl/gl_batch.cc @@ -225,7 +225,7 @@ GLuint GLVaoCache::base_instance_vao_get(GPUBatch *batch, int i_first) { this->context_check(); /* Make sure the interface is up to date. */ - Shader *shader = static_cast<Shader *>(GPU_context_active_get()->shader); + Shader *shader = GPU_context_active_get()->shader; GLShaderInterface *interface = static_cast<GLShaderInterface *>(shader->interface); if (interface_ != interface) { vao_get(batch); @@ -256,7 +256,7 @@ GLuint GLVaoCache::vao_get(GPUBatch *batch) { this->context_check(); - Shader *shader = static_cast<Shader *>(GPU_context_active_get()->shader); + Shader *shader = GPU_context_active_get()->shader; GLShaderInterface *interface = static_cast<GLShaderInterface *>(shader->interface); if (interface_ != interface) { interface_ = interface; |