diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2019-06-11 15:43:37 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-02-11 11:53:26 +0100 |
| commit | 3f335ce3d446372eeb9ed87f7e117099c4d2dd6a (patch) | |
| tree | 669db7ddb21f328215a9c26e9bdaf2565db8c853 /platform/windows | |
| parent | 9ffe57a10eecf79ab8df2f0497d0387383755df3 (diff) | |
Texture refactor
-Texture renamed to Texture2D
-TextureLayered as base now inherits 2Darray, cubemap and cubemap array
-Removed all references to flags in textures (they will go in the shader)
-Texture3D gone for now (will come back later done properly)
-Create base rasterizer for RenderDevice, RasterizerRD
Diffstat (limited to 'platform/windows')
| -rwxr-xr-x | platform/windows/os_windows.cpp | 2 | ||||
| -rw-r--r-- | platform/windows/os_windows.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 2daaf9359a..3a8e8bdb5a 100755 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2517,7 +2517,7 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap cursors_cache.erase(p_shape); } - Ref<Texture> texture = p_cursor; + Ref<Texture2D> texture = p_cursor; Ref<AtlasTexture> atlas_texture = p_cursor; Ref<Image> image; Size2 texture_size; diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index cf16295a70..5c6b09629f 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -43,7 +43,7 @@ #include "main/input_default.h" #include "power_windows.h" #include "servers/audio_server.h" -#include "servers/visual/rasterizer.h" +#include "servers/visual/rasterizer/rasterizer.h" #include "servers/visual_server.h" #ifdef XAUDIO2_ENABLED #include "drivers/xaudio2/audio_driver_xaudio2.h" |