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.

1 files changed, 5 insertions, 1 deletions

diff --git a/source/blender/gpu/intern/gpu_shader_private.hh b/source/blender/gpu/intern/gpu_shader_private.hh
index d51c3b03ecb..e5af22cae92 100644
--- a/source/blender/gpu/intern/gpu_shader_private.hh
+++ b/source/blender/gpu/intern/gpu_shader_private.hh
@@ -29,11 +29,15 @@
 namespace blender {
 namespace gpu {
 
-class Shader : public GPUShader {
+class Shader {
  public:
   /** Uniform & attribute locations for shader. */
   ShaderInterface *interface;
 
+ protected:
+  /** For debugging purpose. */
+  char name[64];
+
  public:
   Shader(const char *name);
   virtual ~Shader();