3 files changed, 20 insertions, 18 deletions

diff --git a/servers/rendering/dummy/rasterizer_scene_dummy.h b/servers/rendering/dummy/rasterizer_scene_dummy.h
index 7dac1f5966..4a2a947b94 100644
--- a/servers/rendering/dummy/rasterizer_scene_dummy.h
+++ b/servers/rendering/dummy/rasterizer_scene_dummy.h
@@ -197,7 +197,7 @@ public:
 	void sub_surface_scattering_set_quality(RS::SubSurfaceScatteringQuality p_quality) override {}
 	void sub_surface_scattering_set_scale(float p_scale, float p_depth_scale) override {}
 
-	TypedArray<Image> bake_render_uv2(RID p_base, const Vector<RID> &p_material_overrides, const Size2i &p_image_size) override { return TypedArray<Image>(); }
+	TypedArray<Image> bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size) override { return TypedArray<Image>(); }
 
 	bool free(RID p_rid) override {
 		if (is_environment(p_rid)) {
diff --git a/servers/rendering/dummy/storage/material_storage.h b/servers/rendering/dummy/storage/material_storage.h
index e25a2ac3a9..ed8fefc558 100644
--- a/servers/rendering/dummy/storage/material_storage.h
+++ b/servers/rendering/dummy/storage/material_storage.h
@@ -40,21 +40,21 @@ class MaterialStorage : public RendererMaterialStorage {
 public:
 	/* GLOBAL SHADER UNIFORM API */
 
-	virtual void global_shader_uniform_add(const StringName &p_name, RS::GlobalShaderUniformType p_type, const Variant &p_value) override {}
-	virtual void global_shader_uniform_remove(const StringName &p_name) override {}
-	virtual Vector<StringName> global_shader_uniform_get_list() const override { return Vector<StringName>(); }
+	virtual void global_shader_parameter_add(const StringName &p_name, RS::GlobalShaderParameterType p_type, const Variant &p_value) override {}
+	virtual void global_shader_parameter_remove(const StringName &p_name) override {}
+	virtual Vector<StringName> global_shader_parameter_get_list() const override { return Vector<StringName>(); }
 
-	virtual void global_shader_uniform_set(const StringName &p_name, const Variant &p_value) override {}
-	virtual void global_shader_uniform_set_override(const StringName &p_name, const Variant &p_value) override {}
-	virtual Variant global_shader_uniform_get(const StringName &p_name) const override { return Variant(); }
-	virtual RS::GlobalShaderUniformType global_shader_uniform_get_type(const StringName &p_name) const override { return RS::GLOBAL_VAR_TYPE_MAX; }
+	virtual void global_shader_parameter_set(const StringName &p_name, const Variant &p_value) override {}
+	virtual void global_shader_parameter_set_override(const StringName &p_name, const Variant &p_value) override {}
+	virtual Variant global_shader_parameter_get(const StringName &p_name) const override { return Variant(); }
+	virtual RS::GlobalShaderParameterType global_shader_parameter_get_type(const StringName &p_name) const override { return RS::GLOBAL_VAR_TYPE_MAX; }
 
-	virtual void global_shader_uniforms_load_settings(bool p_load_textures = true) override {}
-	virtual void global_shader_uniforms_clear() override {}
+	virtual void global_shader_parameters_load_settings(bool p_load_textures = true) override {}
+	virtual void global_shader_parameters_clear() override {}
 
-	virtual int32_t global_shader_uniforms_instance_allocate(RID p_instance) override { return 0; }
-	virtual void global_shader_uniforms_instance_free(RID p_instance) override {}
-	virtual void global_shader_uniforms_instance_update(RID p_instance, int p_index, const Variant &p_value) override {}
+	virtual int32_t global_shader_parameters_instance_allocate(RID p_instance) override { return 0; }
+	virtual void global_shader_parameters_instance_free(RID p_instance) override {}
+	virtual void global_shader_parameters_instance_update(RID p_instance, int p_index, const Variant &p_value) override {}
 
 	/* SHADER API */
 
@@ -66,11 +66,11 @@ public:
 	virtual void shader_set_path_hint(RID p_shader, const String &p_code) override {}
 
 	virtual String shader_get_code(RID p_shader) const override { return ""; }
-	virtual void shader_get_shader_uniform_list(RID p_shader, List<PropertyInfo> *p_param_list) const override {}
+	virtual void get_shader_parameter_list(RID p_shader, List<PropertyInfo> *p_param_list) const override {}
 
-	virtual void shader_set_default_texture_param(RID p_shader, const StringName &p_name, RID p_texture, int p_index) override {}
-	virtual RID shader_get_default_texture_param(RID p_shader, const StringName &p_name, int p_index) const override { return RID(); }
-	virtual Variant shader_get_param_default(RID p_material, const StringName &p_param) const override { return Variant(); }
+	virtual void shader_set_default_texture_parameter(RID p_shader, const StringName &p_name, RID p_texture, int p_index) override {}
+	virtual RID shader_get_default_texture_parameter(RID p_shader, const StringName &p_name, int p_index) const override { return RID(); }
+	virtual Variant shader_get_parameter_default(RID p_material, const StringName &p_param) const override { return Variant(); }
 
 	virtual RS::ShaderNativeSourceCode shader_get_native_source_code(RID p_shader) const override { return RS::ShaderNativeSourceCode(); };
 
@@ -89,7 +89,7 @@ public:
 
 	virtual bool material_is_animated(RID p_material) override { return false; }
 	virtual bool material_casts_shadows(RID p_material) override { return false; }
-	virtual void material_get_instance_shader_uniforms(RID p_material, List<InstanceShaderParam> *r_parameters) override {}
+	virtual void material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) override {}
 	virtual void material_update_dependency(RID p_material, DependencyTracker *p_instance) override {}
 };
 
diff --git a/servers/rendering/dummy/storage/mesh_storage.h b/servers/rendering/dummy/storage/mesh_storage.h
index 1eb4fd854f..b0914e70e4 100644
--- a/servers/rendering/dummy/storage/mesh_storage.h
+++ b/servers/rendering/dummy/storage/mesh_storage.h
@@ -81,6 +81,7 @@ public:
 		s->vertex_count = p_surface.vertex_count;
 		s->index_data = p_surface.index_data;
 		s->index_count = p_surface.index_count;
+		s->skin_data = p_surface.skin_data;
 	}
 
 	virtual int mesh_get_blend_shape_count(RID p_mesh) const override { return 0; }
@@ -98,6 +99,7 @@ public:
 	virtual RS::SurfaceData mesh_get_surface(RID p_mesh, int p_surface) const override {
 		DummyMesh *m = mesh_owner.get_or_null(p_mesh);
 		ERR_FAIL_COND_V(!m, RS::SurfaceData());
+		ERR_FAIL_INDEX_V(p_surface, m->surfaces.size(), RS::SurfaceData());
 		RS::SurfaceData s = m->surfaces[p_surface];
 		return s;
 	}