1 files changed, 30 insertions, 22 deletions

diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h
index dceda8e34f..bc34d2df9a 100644
--- a/drivers/dummy/rasterizer_dummy.h
+++ b/drivers/dummy/rasterizer_dummy.h
@@ -35,10 +35,10 @@
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
 #include "scene/resources/mesh.h"
-#include "servers/rendering/rasterizer.h"
+#include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering_server.h"
 
-class RasterizerSceneDummy : public RasterizerScene {
+class RasterizerSceneDummy : public RendererSceneRender {
 public:
 	/* SHADOW ATLAS API */
 
@@ -96,7 +96,7 @@ public:
 
 	void environment_set_tonemap(RID p_env, RS::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white, bool p_auto_exposure, float p_min_luminance, float p_max_luminance, float p_auto_exp_speed, float p_auto_exp_scale) override {}
 
-	void environment_set_adjustment(RID p_env, bool p_enable, float p_brightness, float p_contrast, float p_saturation, RID p_ramp) override {}
+	void environment_set_adjustment(RID p_env, bool p_enable, float p_brightness, float p_contrast, float p_saturation, bool p_use_1d_color_correction, RID p_color_correction) override {}
 
 	void environment_set_fog(RID p_env, bool p_enable, const Color &p_light_color, float p_light_energy, float p_sun_scatter, float p_density, float p_height, float p_height_density, float p_aerial_perspective) override {}
 	void environment_set_volumetric_fog(RID p_env, bool p_enable, float p_density, const Color &p_light, float p_light_energy, float p_length, float p_detail_spread, float p_gi_inject, RS::EnvVolumetricFogShadowFilter p_shadow_filter) override {}
@@ -175,11 +175,13 @@ public:
 	void update() override {}
 	void sdfgi_set_debug_probe_select(const Vector3 &p_position, const Vector3 &p_dir) override {}
 
+	bool is_low_end() const override { return true; }
+
 	RasterizerSceneDummy() {}
 	~RasterizerSceneDummy() {}
 };
 
-class RasterizerStorageDummy : public RasterizerStorage {
+class RasterizerStorageDummy : public RendererStorage {
 public:
 	/* TEXTURE API */
 	struct DummyTexture {
@@ -383,7 +385,7 @@ public:
 	bool material_is_animated(RID p_material) override { return false; }
 	bool material_casts_shadows(RID p_material) override { return false; }
 	void material_get_instance_shader_parameters(RID p_material, List<InstanceShaderParam> *r_parameters) override {}
-	void material_update_dependency(RID p_material, RasterizerScene::InstanceBase *p_instance) override {}
+	void material_update_dependency(RID p_material, InstanceBaseDependency *p_instance) override {}
 
 	/* MESH API */
 
@@ -599,6 +601,8 @@ public:
 	void light_directional_set_blend_splits(RID p_light, bool p_enable) override {}
 	bool light_directional_get_blend_splits(RID p_light) const override { return false; }
 	void light_directional_set_shadow_depth_range_mode(RID p_light, RS::LightDirectionalShadowDepthRangeMode p_range_mode) override {}
+	void light_directional_set_sky_only(RID p_light, bool p_sky_only) override {}
+	bool light_directional_is_sky_only(RID p_light) const override { return false; }
 	RS::LightDirectionalShadowDepthRangeMode light_directional_get_shadow_depth_range_mode(RID p_light) const override { return RS::LIGHT_DIRECTIONAL_SHADOW_DEPTH_RANGE_STABLE; }
 
 	RS::LightDirectionalShadowMode light_directional_get_shadow_mode(RID p_light) override { return RS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL; }
@@ -640,8 +644,8 @@ public:
 	float reflection_probe_get_origin_max_distance(RID p_probe) const override { return 0.0; }
 	bool reflection_probe_renders_shadows(RID p_probe) const override { return false; }
 
-	void base_update_dependency(RID p_base, RasterizerScene::InstanceBase *p_instance) override {}
-	void skeleton_update_dependency(RID p_base, RasterizerScene::InstanceBase *p_instance) override {}
+	void base_update_dependency(RID p_base, InstanceBaseDependency *p_instance) override {}
+	void skeleton_update_dependency(RID p_base, InstanceBaseDependency *p_instance) override {}
 
 	/* DECAL API */
 
@@ -708,10 +712,10 @@ public:
 	/* LIGHTMAP CAPTURE */
 #if 0
 	struct Instantiable {
-		SelfList<RasterizerScene::InstanceBase>::List instance_list;
+		SelfList<RendererSceneRender::InstanceBase>::List instance_list;
 
 		_FORCE_INLINE_ void instance_change_notify(bool p_aabb = true, bool p_materials = true) override {
-			SelfList<RasterizerScene::InstanceBase> *instances = instance_list.first();
+			SelfList<RendererSceneRender::InstanceBase> *instances = instance_list.first();
 			while (instances) override {
 				//instances->self()->base_changed(p_aabb, p_materials);
 				instances = instances->next();
@@ -719,9 +723,9 @@ public:
 		}
 
 		_FORCE_INLINE_ void instance_remove_deps() override {
-			SelfList<RasterizerScene::InstanceBase> *instances = instance_list.first();
+			SelfList<RendererSceneRender::InstanceBase> *instances = instance_list.first();
 			while (instances) override {
-				SelfList<RasterizerScene::InstanceBase> *next = instances->next();
+				SelfList<RendererSceneRender::InstanceBase> *next = instances->next();
 				//instances->self()->base_removed();
 				instances = next;
 			}
@@ -824,8 +828,8 @@ public:
 	int particles_get_draw_passes(RID p_particles) const override { return 0; }
 	RID particles_get_draw_pass_mesh(RID p_particles, int p_pass) const override { return RID(); }
 
-	void particles_add_collision(RID p_particles, RasterizerScene::InstanceBase *p_instance) override {}
-	void particles_remove_collision(RID p_particles, RasterizerScene::InstanceBase *p_instance) override {}
+	void particles_add_collision(RID p_particles, InstanceBaseDependency *p_instance) override {}
+	void particles_remove_collision(RID p_particles, InstanceBaseDependency *p_instance) override {}
 
 	void update_particles() override {}
 
@@ -883,6 +887,9 @@ public:
 	void render_target_disable_clear_request(RID p_render_target) override {}
 	void render_target_do_clear_request(RID p_render_target) override {}
 
+	void render_target_set_sdf_size_and_scale(RID p_render_target, RS::ViewportSDFOversize p_size, RS::ViewportSDFScale p_scale) override {}
+	Rect2i render_target_get_sdf_rect(RID p_render_target) const override { return Rect2i(); }
+
 	RS::InstanceType get_base_type(RID p_rid) const override {
 		if (mesh_owner.owns(p_rid)) {
 			return RS::INSTANCE_MESH;
@@ -922,7 +929,7 @@ public:
 	String get_video_adapter_name() const override { return String(); }
 	String get_video_adapter_vendor() const override { return String(); }
 
-	static RasterizerStorage *base_singleton;
+	static RendererStorage *base_singleton;
 
 	void capture_timestamps_begin() override {}
 	void capture_timestamp(const String &p_name) override {}
@@ -936,12 +943,12 @@ public:
 	~RasterizerStorageDummy() {}
 };
 
-class RasterizerCanvasDummy : public RasterizerCanvas {
+class RasterizerCanvasDummy : public RendererCanvasRender {
 public:
 	PolygonID request_polygon(const Vector<int> &p_indices, const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs = Vector<Point2>(), const Vector<int> &p_bones = Vector<int>(), const Vector<float> &p_weights = Vector<float>()) override { return 0; }
 	void free_polygon(PolygonID p_polygon) override {}
 
-	void canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_list, const Transform2D &p_canvas_transform, RS::CanvasItemTextureFilter p_default_filter, RS::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel) override {}
+	void canvas_render_items(RID p_to_render_target, Item *p_item_list, const Color &p_modulate, Light *p_light_list, Light *p_directional_list, const Transform2D &p_canvas_transform, RS::CanvasItemTextureFilter p_default_filter, RS::CanvasItemTextureRepeat p_default_repeat, bool p_snap_2d_vertices_to_pixel, bool &r_sdf_used) override {}
 	void canvas_debug_viewport_shadows(Light *p_lights_with_shadow) override {}
 
 	RID light_create() override { return RID(); }
@@ -950,8 +957,9 @@ public:
 	void light_update_shadow(RID p_rid, int p_shadow_index, const Transform2D &p_light_xform, int p_light_mask, float p_near, float p_far, LightOccluderInstance *p_occluders) override {}
 	void light_update_directional_shadow(RID p_rid, int p_shadow_index, const Transform2D &p_light_xform, int p_light_mask, float p_cull_distance, const Rect2 &p_clip_rect, LightOccluderInstance *p_occluders) override {}
 
+	void render_sdf(RID p_render_target, LightOccluderInstance *p_occluders) override {}
 	RID occluder_polygon_create() override { return RID(); }
-	void occluder_polygon_set_shape_as_lines(RID p_occluder, const Vector<Vector2> &p_lines) override {}
+	void occluder_polygon_set_shape(RID p_occluder, const Vector<Vector2> &p_points, bool p_closed) override {}
 	void occluder_polygon_set_cull_mode(RID p_occluder, RS::CanvasOccluderPolygonCullMode p_mode) override {}
 	void set_shadow_texture_size(int p_size) override {}
 
@@ -964,7 +972,7 @@ public:
 	~RasterizerCanvasDummy() {}
 };
 
-class RasterizerDummy : public Rasterizer {
+class RasterizerDummy : public RendererCompositor {
 private:
 	uint64_t frame = 1;
 	float delta = 0;
@@ -975,9 +983,9 @@ protected:
 	RasterizerSceneDummy scene;
 
 public:
-	RasterizerStorage *get_storage() override { return &storage; }
-	RasterizerCanvas *get_canvas() override { return &canvas; }
-	RasterizerScene *get_scene() override { return &scene; }
+	RendererStorage *get_storage() override { return &storage; }
+	RendererCanvasRender *get_canvas() override { return &canvas; }
+	RendererSceneRender *get_scene() override { return &scene; }
 
 	void set_boot_image(const Ref<Image> &p_image, const Color &p_color, bool p_scale, bool p_use_filter = true) override {}
 
@@ -998,7 +1006,7 @@ public:
 
 	void finalize() override {}
 
-	static Rasterizer *_create_current() {
+	static RendererCompositor *_create_current() {
 		return memnew(RasterizerDummy);
 	}