Remove DX9 leftovers

supertuxkart · Dec 16, 2023 · 4525411 · 4525411
1 parent c11a723
commit 4525411
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 463 deletions.
diff --git a/lib/graphics_engine/CMakeLists.txt b/lib/graphics_engine/CMakeLists.txt
@@ -67,7 +67,6 @@ set(GE_SOURCES
     src/ge_compressor_bptc_bc7.cpp
     src/ge_compressor_s3tc_bc3.cpp
     src/ge_culling_tool.cpp
-    src/ge_dx9_texture.cpp
     src/ge_main.cpp
     src/ge_texture.cpp
     src/ge_vma.cpp

diff --git a/lib/graphics_engine/src/ge_dx9_texture.cpp b/lib/graphics_engine/src/ge_dx9_texture.cpp
diff --git a/lib/graphics_engine/src/ge_dx9_texture.hpp b/lib/graphics_engine/src/ge_dx9_texture.hpp
diff --git a/lib/graphics_engine/src/ge_texture.cpp b/lib/graphics_engine/src/ge_texture.cpp
@@ -1,5 +1,4 @@
 #include "ge_main.hpp"
-#include "ge_dx9_texture.hpp"
 #include "ge_gl_texture.hpp"
 #include "ge_vulkan_texture.hpp"
 #include "ge_texture.hpp"
@@ -97,10 +96,6 @@ irr::video::ITexture* createTexture(const std::string& path,
     case video::EDT_OPENGL:
     case video::EDT_OGLES2:
         return new GEGLTexture(path, image_mani);
-#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-    case video::EDT_DIRECT3D9:
-        return new GEDX9Texture(path, image_mani);
-#endif
     case video::EDT_VULKAN:
         return new GEVulkanTexture(path, image_mani);
     default:
@@ -117,10 +112,6 @@ irr::video::ITexture* createTexture(video::IImage* img,
     case video::EDT_OPENGL:
     case video::EDT_OGLES2:
         return new GEGLTexture(img, name);
-#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-    case video::EDT_DIRECT3D9:
-        return new GEDX9Texture(img, name);
-#endif
     case video::EDT_VULKAN:
         return new GEVulkanTexture(img, name);
     default:
@@ -137,10 +128,6 @@ irr::video::ITexture* createFontTexture(const std::string& name,
     case video::EDT_OPENGL:
     case video::EDT_OGLES2:
         return new GEGLTexture(name, size, single_channel);
-#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
-    case video::EDT_DIRECT3D9:
-        return new GEDX9Texture(name, size);
-#endif
     case video::EDT_VULKAN:
         return new GEVulkanTexture(name, size, single_channel);
     default:

diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
@@ -26,7 +26,6 @@ else()
     add_definitions(-DNO_IRR_COMPILE_WITH_X11_)
     add_definitions(-DNO_IRR_COMPILE_WITH_WAYLAND_DEVICE_)
     add_definitions(-DNO_IRR_COMPILE_WITH_SDL_DEVICE_)
-    add_definitions(-DNO_IRR_COMPILE_WITH_DIRECT3D_9_)
     add_definitions(-DNO_IRR_COMPILE_WITH_VULKAN_)
 endif()
 

diff --git a/lib/irrlicht/include/EDriverTypes.h b/lib/irrlicht/include/EDriverTypes.h
@@ -37,16 +37,6 @@ namespace video
 		contribution. */
 		EDT_BURNINGSVIDEO,
 
-		//! Direct3D8 device, only available on Win32 platforms.
-		/** Performs hardware accelerated rendering of 3D and 2D
-		primitives. */
-		EDT_DIRECT3D8,
-
-		//! Direct3D 9 device, only available on Win32 platforms.
-		/** Performs hardware accelerated rendering of 3D and 2D
-		primitives. */
-		EDT_DIRECT3D9,
-
 		//! OpenGL device, available on most platforms.
 		/** Performs hardware accelerated rendering of 3D and 2D
 		primitives. */

diff --git a/lib/irrlicht/include/IVideoModeList.h b/lib/irrlicht/include/IVideoModeList.h
@@ -17,7 +17,7 @@ namespace video
 	/** You can get a list via IrrlichtDevice::getVideoModeList(). If you are confused
 	now, because you think you have to create an Irrlicht Device with a video
 	mode before being able to get the video mode list, let me tell you that
-	there is no need to start up an Irrlicht Device with EDT_DIRECT3D8, EDT_OPENGL or
+	there is no need to start up an Irrlicht Device with EDT_OPENGL or
 	EDT_SOFTWARE: For this (and for lots of other reasons) the null device,
 	EDT_NULL exists.*/
 	class IVideoModeList : public virtual IReferenceCounted