fixed submodulessoc-2020-soft-body

1 files changed, 10 insertions, 9 deletions

diff --git a/source/blender/gpu/opengl/gl_batch.hh b/source/blender/gpu/opengl/gl_batch.hh
index d70f43aed2a..9399148c68d 100644
--- a/source/blender/gpu/opengl/gl_batch.hh
+++ b/source/blender/gpu/opengl/gl_batch.hh
@@ -32,11 +32,12 @@
 
 #include "glew-mx.h"
 
-#include "GPU_shader_interface.h"
-
 namespace blender {
 namespace gpu {
 
+class GLContext;
+class GLShaderInterface;
+
 #define GPU_VAO_STATIC_LEN 3
 
 /* Vao management: remembers all geometry state (vertex attribute bindings & element buffer)
@@ -45,9 +46,9 @@ namespace gpu {
 class GLVaoCache {
  private:
   /** Context for which the vao_cache_ was generated. */
-  struct GLContext *context_ = NULL;
+  GLContext *context_ = NULL;
   /** Last interface this batch was drawn with. */
-  GPUShaderInterface *interface_ = NULL;
+  GLShaderInterface *interface_ = NULL;
   /** Cached vao for the last interface. */
   GLuint vao_id_ = 0;
   /** Used whend arb_base_instance is not supported. */
@@ -58,13 +59,13 @@ class GLVaoCache {
   union {
     /** Static handle count */
     struct {
-      const GPUShaderInterface *interfaces[GPU_VAO_STATIC_LEN];
+      const GLShaderInterface *interfaces[GPU_VAO_STATIC_LEN];
       GLuint vao_ids[GPU_VAO_STATIC_LEN];
     } static_vaos;
     /** Dynamic handle count */
     struct {
       uint count;
-      const GPUShaderInterface **interfaces;
+      const GLShaderInterface **interfaces;
       GLuint *vao_ids;
     } dynamic_vaos;
   };
@@ -76,9 +77,9 @@ class GLVaoCache {
   GLuint vao_get(GPUBatch *batch);
   GLuint base_instance_vao_get(GPUBatch *batch, int i_first);
 
-  GLuint lookup(const GPUShaderInterface *interface);
-  void insert(const GPUShaderInterface *interface, GLuint vao_id);
-  void remove(const GPUShaderInterface *interface);
+  GLuint lookup(const GLShaderInterface *interface);
+  void insert(const GLShaderInterface *interface, GLuint vao_id);
+  void remove(const GLShaderInterface *interface);
   void clear(void);
 
  private: