diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-12-04 19:05:49 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 19:05:49 -0300 |
| commit | c833d64479c9da8f05d64f0bf195022de09b2f8d (patch) | |
| tree | 2f2cfbc02bddd77ba217797a5206767881184913 /platform/windows | |
| parent | 3dc8aaaccc642cddbd8d5c1841fef079db5c7edf (diff) | |
| parent | 2787ad65be12a8ac84b7cc8536749686e9fe80dc (diff) | |
Merge pull request #44094 from reduz/reorganize-rasterizer-scene
RenderingServer reorganization
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 2 | ||||
| -rw-r--r-- | platform/windows/display_server_windows.h | 4 | ||||
| -rw-r--r-- | platform/windows/os_windows.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 2581cc3af6..62fcd20f61 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -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 diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h index c64a1b3b09..684746919a 100644 --- a/platform/windows/display_server_windows.h +++ b/platform/windows/display_server_windows.h @@ -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 diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index a3dbb23182..5451e15d36 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -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" |