Browse Source

shaderpipeline: Fix assorted compiler warnings

rdb 1 month ago
parent
commit
e14539ed40

+ 1 - 2
panda/src/display/shaderInputBinding_impls.cxx

@@ -624,10 +624,9 @@ make_slider_table(const ShaderType *type) {
     const SliderTable *table = state.gsg->get_data_reader()->get_slider_table();
     float *sliders = (float *)into;
     memset(sliders, 0, num_elements * sizeof(float));
-    size_t i = 0;
     if (table != nullptr) {
       size_t num_transforms = std::min((size_t)num_elements, table->get_num_sliders());
-      for (size_t i = 0; i < num_elements; ++i) {
+      for (size_t i = 0; i < num_transforms; ++i) {
         sliders[i] = table->get_slider(i)->get_slider();
       }
     }

+ 13 - 13
panda/src/display/shaderInputBinding_impls.h

@@ -165,10 +165,10 @@ public:
 
   virtual void fetch_data(const State &state, void *into, bool packed) const override;
 
-  virtual ResourceId get_resource_id(int index) const;
+  virtual ResourceId get_resource_id(int index) const override;
   virtual PT(Texture) fetch_texture(const State &state,
                                     ResourceId index,
-                                    SamplerState &sampler, int &view) const;
+                                    SamplerState &sampler, int &view) const override;
 
 private:
   void fetch_light(const State &state, const NodePath &np, void *into) const;
@@ -211,10 +211,10 @@ public:
 
   virtual int get_state_dep() const override;
 
-  virtual ResourceId get_resource_id(int index) const;
+  virtual ResourceId get_resource_id(int index) const override;
   virtual PT(Texture) fetch_texture(const State &state,
                                     ResourceId resource_id,
-                                    SamplerState &sampler, int &view) const;
+                                    SamplerState &sampler, int &view) const override;
 
 protected:
   size_t const _count;
@@ -233,14 +233,14 @@ public:
 
   virtual int get_state_dep() const override;
 
-  virtual ResourceId get_resource_id(int index) const;
+  virtual ResourceId get_resource_id(int index) const override;
   virtual PT(Texture) fetch_texture(const State &state,
                                     ResourceId resource_id,
-                                    SamplerState &sampler, int &view) const;
+                                    SamplerState &sampler, int &view) const override;
   virtual PT(Texture) fetch_texture_image(const State &state,
                                           ResourceId resource_id,
                                           ShaderType::Access &access,
-                                          int &z, int &n) const;
+                                          int &z, int &n) const override;
 
 protected:
   CPT(InternalName) const _input;
@@ -257,9 +257,9 @@ public:
 
   virtual int get_state_dep() const override;
 
-  virtual ResourceId get_resource_id(int index) const;
+  virtual ResourceId get_resource_id(int index) const override;
   virtual PT(ShaderBuffer) fetch_shader_buffer(const State &state,
-                                               ResourceId resource_id) const;
+                                               ResourceId resource_id) const override;
 
 protected:
   CPT(InternalName) const _input;
@@ -338,16 +338,16 @@ public:
 
   virtual void fetch_data(const State &state, void *into, bool packed) const override;
 
-  virtual ResourceId get_resource_id(int index) const;
+  virtual ResourceId get_resource_id(int index) const override;
   virtual PT(Texture) fetch_texture(const State &state,
                                     ResourceId index,
-                                    SamplerState &sampler, int &view) const;
+                                    SamplerState &sampler, int &view) const override;
   virtual PT(Texture) fetch_texture_image(const State &state,
                                           ResourceId index,
                                           ShaderType::Access &access,
-                                          int &z, int &n) const;
+                                          int &z, int &n) const override;
   virtual PT(ShaderBuffer) fetch_shader_buffer(const State &state,
-                                               ResourceId resource_id) const;
+                                               ResourceId resource_id) const override;
 
 private:
   void r_collect_members(const InternalName *name, const ShaderType *type, size_t offset = 0);

+ 2 - 2
panda/src/gobj/shaderType.h

@@ -453,7 +453,7 @@ private:
  */
 class EXPCL_PANDA_GOBJ ShaderType::Resource : public ShaderType {
 public:
-  virtual int get_num_resources() const { return 1; }
+  virtual int get_num_resources() const override { return 1; }
 
   virtual bool contains_opaque_type() const override { return true; }
 
@@ -613,7 +613,7 @@ private:
 
 protected:
   virtual void write_datagram(BamWriter *manager, Datagram &dg) override;
-  virtual int complete_pointers(TypedWritable **plist, BamReader *manager);
+  virtual int complete_pointers(TypedWritable **plist, BamReader *manager) override;
   static TypedWritable *make_from_bam(const FactoryParams &params);
 
 public: