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

2 files changed, 3 insertions, 3 deletions

diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 78d87c5629..7bbcb8cfa2 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -1424,7 +1424,7 @@ public:
 		return "Android";
 	}
 
-	virtual Ref<Texture> get_logo() const {
+	virtual Ref<Texture2D> get_logo() const {
 		return logo;
 	}
 
@@ -1639,7 +1639,7 @@ public:
 #undef CLEANUP_AND_RETURN
 	}
 
-	virtual Ref<Texture> get_run_icon() const {
+	virtual Ref<Texture2D> get_run_icon() const {
 		return run_icon;
 	}
 
diff --git a/platform/android/os_android.h b/platform/android/os_android.h
index c2f9a0992f..2979037adc 100644
--- a/platform/android/os_android.h
+++ b/platform/android/os_android.h
@@ -39,7 +39,7 @@
 #include "main/input_default.h"
 //#include "power_android.h"
 #include "servers/audio_server.h"
-#include "servers/visual/rasterizer.h"
+#include "servers/visual/rasterizer/rasterizer.h"
 
 class GodotJavaWrapper;
 class GodotIOJavaWrapper;