archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPUShader: Make GPUShader* an opaque pointer to blender::gpu::Shader

Browse Source 
This avoids the misleading inheritance.

Also cleanup by setting the blender::gpu::Shader as active shader to
avoid some casting.
This commit is contained in:
Clément Foucault
2020-08-21 13:48:34 +02:00
parent 1e95a7402c
commit 220fbdf593
7 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/opengl/gl_batch.cc
View File

@@ -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;