Skip to content

Commit

Permalink
RenderingServer reorganization
Browse files Browse the repository at this point in the history
  • Loading branch information
@reduz
reduz committed Dec 4, 2020
1 parent 3dc8aaa commit 2787ad6
Show file tree
Hide file tree
Showing 107 changed files with 3,171 additions and 2,954 deletions.
38 changes: 19 additions & 19 deletions drivers/dummy/rasterizer_dummy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down Expand Up @@ -179,7 +179,7 @@ class RasterizerSceneDummy : public RasterizerScene {
~RasterizerSceneDummy() {}
};

class RasterizerStorageDummy : public RasterizerStorage {
class RasterizerStorageDummy : public RendererStorage {
public:
/* TEXTURE API */
struct DummyTexture {
Expand Down Expand Up @@ -383,7 +383,7 @@ class RasterizerStorageDummy : public RasterizerStorage {
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, RendererSceneRender::InstanceBase *p_instance) override {}

/* MESH API */

Expand Down Expand Up @@ -642,8 +642,8 @@ class RasterizerStorageDummy : public RasterizerStorage {
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, RendererSceneRender::InstanceBase *p_instance) override {}
void skeleton_update_dependency(RID p_base, RendererSceneRender::InstanceBase *p_instance) override {}

/* DECAL API */

Expand Down Expand Up @@ -710,20 +710,20 @@ class RasterizerStorageDummy : public RasterizerStorage {
/* 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();
}
}

_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;
}
Expand Down Expand Up @@ -826,8 +826,8 @@ class RasterizerStorageDummy : public RasterizerStorage {
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, RendererSceneRender::InstanceBase *p_instance) override {}
void particles_remove_collision(RID p_particles, RendererSceneRender::InstanceBase *p_instance) override {}

void update_particles() override {}

Expand Down Expand Up @@ -927,7 +927,7 @@ class RasterizerStorageDummy : public RasterizerStorage {
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 {}
Expand All @@ -941,7 +941,7 @@ class RasterizerStorageDummy : public RasterizerStorage {
~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 {}
Expand Down Expand Up @@ -970,7 +970,7 @@ class RasterizerCanvasDummy : public RasterizerCanvas {
~RasterizerCanvasDummy() {}
};

class RasterizerDummy : public Rasterizer {
class RasterizerDummy : public RendererCompositor {
private:
uint64_t frame = 1;
float delta = 0;
Expand All @@ -981,9 +981,9 @@ class RasterizerDummy : public Rasterizer {
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 {}

Expand All @@ -1004,7 +1004,7 @@ class RasterizerDummy : public Rasterizer {

void finalize() override {}

static Rasterizer *_create_current() {
static RendererCompositor *_create_current() {
return memnew(RasterizerDummy);
}

Expand Down
2 changes: 1 addition & 1 deletion glsl_builders.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def build_rd_header(filename):

out_file_class = out_file_base.replace(".glsl.gen.h", "").title().replace("_", "").replace(".", "") + "ShaderRD"
fd.write("\n")
fd.write('#include "servers/rendering/rasterizer_rd/shader_rd.h"\n\n')
fd.write('#include "servers/rendering/renderer_rd/shader_rd.h"\n\n')
fd.write("class " + out_file_class + " : public ShaderRD {\n\n")
fd.write("public:\n\n")

Expand Down
4 changes: 2 additions & 2 deletions platform/android/display_server_android.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#if defined(VULKAN_ENABLED)
#include "drivers/vulkan/rendering_device_vulkan.h"
#include "platform/android/vulkan/vulkan_context_android.h"
#include "servers/rendering/rasterizer_rd/rasterizer_rd.h"
#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
#endif

DisplayServerAndroid *DisplayServerAndroid::get_singleton() {
Expand Down Expand Up @@ -447,7 +447,7 @@ DisplayServerAndroid::DisplayServerAndroid(const String &p_rendering_driver, Dis
rendering_device_vulkan = memnew(RenderingDeviceVulkan);
rendering_device_vulkan->initialize(context_vulkan);

RasterizerRD::make_current();
RendererCompositorRD::make_current();
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion platform/iphone/display_server_iphone.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#if defined(VULKAN_ENABLED)
#include "drivers/vulkan/rendering_device_vulkan.h"
#include "servers/rendering/rasterizer_rd/rasterizer_rd.h"
#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"

#include "vulkan_context_iphone.h"

Expand Down
2 changes: 1 addition & 1 deletion platform/iphone/display_server_iphone.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
rendering_device_vulkan = memnew(RenderingDeviceVulkan);
rendering_device_vulkan->initialize(context_vulkan);

RasterizerRD::make_current();
RendererCompositorRD::make_current();
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion platform/iphone/os_iphone.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "ios.h"
#include "joypad_iphone.h"
#include "servers/audio_server.h"
#include "servers/rendering/rasterizer.h"
#include "servers/rendering/renderer_compositor.h"

#if defined(VULKAN_ENABLED)
#include "drivers/vulkan/rendering_device_vulkan.h"
Expand Down
2 changes: 1 addition & 1 deletion platform/iphone/os_iphone.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#import <dlfcn.h>

#if defined(VULKAN_ENABLED)
#include "servers/rendering/rasterizer_rd/rasterizer_rd.h"
#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
#import <QuartzCore/CAMetalLayer.h>
#include <vulkan/vulkan_metal.h>
#endif
Expand Down
4 changes: 2 additions & 2 deletions platform/linuxbsd/display_server_x11.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include "scene/resources/texture.h"

#if defined(VULKAN_ENABLED)
#include "servers/rendering/rasterizer_rd/rasterizer_rd.h"
#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
#endif

#include <limits.h>
Expand Down Expand Up @@ -4088,7 +4088,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
rendering_device_vulkan = memnew(RenderingDeviceVulkan);
rendering_device_vulkan->initialize(context_vulkan);

RasterizerRD::make_current();
RendererCompositorRD::make_current();
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion platform/linuxbsd/display_server_x11.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include "drivers/unix/os_unix.h"
#include "joypad_linux.h"
#include "servers/audio_server.h"
#include "servers/rendering/rasterizer.h"
#include "servers/rendering/renderer_compositor.h"
#include "servers/rendering_server.h"

#if defined(OPENGL_ENABLED)
Expand Down
2 changes: 1 addition & 1 deletion platform/linuxbsd/os_linuxbsd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "drivers/unix/os_unix.h"
#include "joypad_linux.h"
#include "servers/audio_server.h"
#include "servers/rendering/rasterizer.h"
#include "servers/rendering/renderer_compositor.h"
#include "servers/rendering_server.h"

class OS_LinuxBSD : public OS_Unix {
Expand Down
4 changes: 2 additions & 2 deletions platform/osx/display_server_osx.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#endif

#if defined(VULKAN_ENABLED)
#include "servers/rendering/rasterizer_rd/rasterizer_rd.h"
#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"

#include <QuartzCore/CAMetalLayer.h>
#endif
Expand Down Expand Up @@ -3870,7 +3870,7 @@ Point2i window_position(
rendering_device_vulkan = memnew(RenderingDeviceVulkan);
rendering_device_vulkan->initialize(context_vulkan);

RasterizerRD::make_current();
RendererCompositorRD::make_current();
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion platform/server/os_server.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include "platform/x11/crash_handler_linuxbsd.h"
#endif
#include "servers/audio_server.h"
#include "servers/rendering/rasterizer.h"
#include "servers/rendering/renderer_compositor.h"
#include "servers/rendering_server.h"

#undef CursorShape
Expand Down
2 changes: 1 addition & 1 deletion platform/uwp/os_uwp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "drivers/xaudio2/audio_driver_xaudio2.h"
#include "joypad_uwp.h"
#include "servers/audio_server.h"
#include "servers/rendering/rasterizer.h"
#include "servers/rendering/renderer_compositor.h"
#include "servers/rendering_server.h"

#include <fcntl.h>
Expand Down
2 changes: 1 addition & 1 deletion platform/windows/display_server_windows.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3205,7 +3205,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
rendering_device_vulkan = memnew(RenderingDeviceVulkan);
rendering_device_vulkan->initialize(context_vulkan);

RasterizerRD::make_current();
RendererCompositorRD::make_current();
}
#endif

Expand Down
4 changes: 2 additions & 2 deletions platform/windows/display_server_windows.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
#include "joypad_windows.h"
#include "key_mapping_windows.h"
#include "servers/audio_server.h"
#include "servers/rendering/rasterizer.h"
#include "servers/rendering/rasterizer_rd/rasterizer_rd.h"
#include "servers/rendering/renderer_compositor.h"
#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
#include "servers/rendering_server.h"

#ifdef XAUDIO2_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion platform/windows/os_windows.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include "drivers/winmidi/midi_driver_winmidi.h"
#include "key_mapping_windows.h"
#include "servers/audio_server.h"
#include "servers/rendering/rasterizer.h"
#include "servers/rendering/renderer_compositor.h"
#include "servers/rendering_server.h"
#ifdef XAUDIO2_ENABLED
#include "drivers/xaudio2/audio_driver_xaudio2.h"
Expand Down
2 changes: 1 addition & 1 deletion servers/register_server_types.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
#include "physics_3d/physics_server_3d_sw.h"
#include "physics_server_2d.h"
#include "physics_server_3d.h"
#include "rendering/rasterizer.h"
#include "rendering/renderer_compositor.h"
#include "rendering/rendering_device.h"
#include "rendering/rendering_device_binds.h"
#include "rendering_server.h"
Expand Down
2 changes: 1 addition & 1 deletion servers/rendering/SCsub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Import("env")

env.add_source_files(env.servers_sources, "*.cpp")

SConscript("rasterizer_rd/SCsub")
SConscript("renderer_rd/SCsub")
Loading

0 comments on commit 2787ad6

Please sign in to comment.