gobj: Remove vestigial virtual methods on ShaderContext

panda/src/glstuff/glShaderContext_src.h

@@ -52,9 +52,9 @@ public:
   ~CLP(ShaderContext)();
   ALLOC_DELETED_CHAIN(CLP(ShaderContext));
 
-  bool valid(void) override;
+  bool valid(void);
   void bind(RenderAttrib::PandaCompareFunc alpha_test_mode);
-  void unbind() override;
+  void unbind();
 
   bool compile_for(RenderAttrib::PandaCompareFunc alpha_test_mode);
 
@@ -83,19 +83,19 @@ private:
   void set_state_and_transform(const RenderState *state,
                                const TransformState *modelview_transform,
                                const TransformState *camera_transform,
-                               const TransformState *projection_transform) override;
+                               const TransformState *projection_transform);
 
-  void issue_parameters(int altered) override;
-  void disable_shader_vertex_arrays() override;
-  bool update_shader_vertex_arrays(ShaderContext *prev, bool force) override;
-  void disable_shader_texture_bindings() override;
-  void update_shader_texture_bindings(ShaderContext *prev) override;
-  void update_shader_buffer_bindings(ShaderContext *prev) override;
+  void issue_parameters(int altered);
+  void disable_shader_vertex_arrays();
+  bool update_shader_vertex_arrays(ShaderContext *prev, bool force);
+  void disable_shader_texture_bindings();
+  void update_shader_texture_bindings(ShaderContext *prev);
+  void update_shader_buffer_bindings(ShaderContext *prev);
 
-  bool uses_standard_vertex_arrays(void) override {
+  bool uses_standard_vertex_arrays(void) {
     return _uses_standard_vertex_arrays;
   }
-  bool uses_custom_vertex_arrays(void) override {
+  bool uses_custom_vertex_arrays(void) {
     return true;
   }
 

panda/src/gobj/shaderContext.h

@@ -32,25 +32,6 @@ class EXPCL_PANDA_GOBJ ShaderContext: public SavedContext {
 public:
   INLINE ShaderContext(Shader *se);
 
-  virtual void set_display_region(const DisplayRegion *display_region) {}
-  virtual void set_state_and_transform(const RenderState *,
-                                       const TransformState *,
-                                       const TransformState *,
-                                       const TransformState *) {};
-
-  INLINE virtual bool valid() { return false; }
-  INLINE virtual void bind() {};
-  INLINE virtual void unbind() {};
-  INLINE virtual void issue_parameters(int altered) {};
-  INLINE virtual void disable_shader_vertex_arrays() {};
-  INLINE virtual bool update_shader_vertex_arrays(ShaderContext *prev, bool force) { return false; };
-  INLINE virtual void disable_shader_texture_bindings() {};
-  INLINE virtual void update_shader_texture_bindings(ShaderContext *prev) {};
-  INLINE virtual void update_shader_buffer_bindings(ShaderContext *prev) {};
-
-  INLINE virtual bool uses_standard_vertex_arrays(void) { return true; };
-  INLINE virtual bool uses_custom_vertex_arrays(void) { return false; };
-
 PUBLISHED:
   INLINE Shader *get_shader() const;
   MAKE_PROPERTY(shader, get_shader);