(D3D) Change dir to gfx/d3d

Makefile.common

@@ -471,9 +471,9 @@ ifeq ($(HAVE_CG), 1)
 endif
 
 ifeq ($(HAVE_D3D9), 1)
-   OBJ += gfx/d3d9/d3d.o \
-			 gfx/d3d9/render_chain.o \
-			 gfx/d3d9/d3d_wrapper.o \
+   OBJ += gfx/d3d/d3d.o \
+			 gfx/d3d/render_chain.o \
+			 gfx/d3d/d3d_wrapper.o \
 			 gfx/fonts/d3d_font.o \
 			 gfx/fonts/d3d_w32_font.o \
 			 gfx/context/d3d_ctx.o

Makefile.emscripten

@@ -74,7 +74,7 @@ clean:
 	rm -f conf/*.o
 	rm -f gfx/scaler/*.o
 	rm -f gfx/*.o
-	rm -f gfx/d3d9/*.o
+	rm -f gfx/d3d/*.o
 	rm -f gfx/context/*.o
 	rm -f gfx/math/*.o
 	rm -f gfx/fonts/*.o

frontend/menu/disp/rmenu_xui.cpp

@@ -29,7 +29,7 @@
 #include "../../../message_queue.h"
 #include "../../../general.h"
 
-#include "../../gfx/d3d9/d3d.hpp"
+#include "../../gfx/d3d/d3d.hpp"
 
 #include "shared.h"
 

gfx/context/d3d_ctx.cpp

@@ -15,7 +15,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../d3d9/d3d.hpp"
+#include "../d3d/d3d.hpp"
 #include "win32_common.h"
 
 #include "../gfx_common.h"
@@ -446,7 +446,7 @@ static void gfx_ctx_d3d_swap_interval(void *data, unsigned interval)
 #endif
 }
 
-const gfx_ctx_driver_t gfx_ctx_d3d9 = {
+const gfx_ctx_driver_t gfx_ctx_d3d = {
    gfx_ctx_d3d_init,
    gfx_ctx_d3d_destroy,
    gfx_ctx_d3d_bind_api,

gfx/fonts/d3d_w32_font.cpp

@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../d3d9/d3d.hpp"
+#include "../d3d/d3d.hpp"
 #include "d3d_font.h"
 #include "../gfx_common.h"
 #include "../../general.h"

gfx/fonts/xdk360_fonts.cpp

@@ -16,7 +16,7 @@
 
 #include <xtl.h>
 #include "d3d_font.h"
-#include "../d3d9/d3d.hpp"
+#include "../d3d/d3d.hpp"
 #include "../gfx_common.h"
 #include "../../general.h"
 #include "../../xdk/xdk_resources.h"

gfx/gfx_context.c

@@ -27,7 +27,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
    &gfx_ctx_ps3,
 #endif
 #if defined(HAVE_WIN32_D3D9) || defined(_XBOX)
-   &gfx_ctx_d3d9,
+   &gfx_ctx_d3d,
 #endif
 #if defined(HAVE_VIDEOCORE)
    &gfx_ctx_videocore,

gfx/gfx_context.h

@@ -130,7 +130,7 @@ extern const gfx_ctx_driver_t gfx_ctx_sdl_gl;
 extern const gfx_ctx_driver_t gfx_ctx_x_egl;
 extern const gfx_ctx_driver_t gfx_ctx_wayland;
 extern const gfx_ctx_driver_t gfx_ctx_glx;
-extern const gfx_ctx_driver_t gfx_ctx_d3d9;
+extern const gfx_ctx_driver_t gfx_ctx_d3d;
 extern const gfx_ctx_driver_t gfx_ctx_drm_egl;
 extern const gfx_ctx_driver_t gfx_ctx_mali_fbdev;
 extern const gfx_ctx_driver_t gfx_ctx_vivante_fbdev;

gfx/image/image.h

@@ -22,7 +22,7 @@
 #ifdef _WIN32
 #include "../context/win32_common.h"
 #ifdef _XBOX1
-#include "../d3d9/d3d_defines.h"
+#include "../d3d/d3d_defines.h"
 #endif
 #endif
 

gfx/image/image_xdk1.c

@@ -15,7 +15,7 @@
  */
 
 #include "image.h"
-#include "../d3d9/d3d_wrapper.h"
+#include "../d3d/d3d_wrapper.h"
 
 bool texture_image_load(struct texture_image *out_img, const char *path)
 {

gfx/shader_hlsl.c

@@ -16,7 +16,7 @@
 
 #include "shader_hlsl.h"
 #include "shader_parse.h"
-#include "d3d9/d3d.hpp"
+#include "d3d/d3d.hpp"
 
 static const char *stock_hlsl_program =
       "void main_vertex\n"

griffin/griffin.c

@@ -229,10 +229,10 @@ VIDEO DRIVER
 #endif
 
 #if defined(_XBOX) || defined(HAVE_WIN32_D3D9)
-#include "../gfx/d3d9/d3d_wrapper.cpp"
-#include "../gfx/d3d9/d3d.cpp"
+#include "../gfx/d3d/d3d_wrapper.cpp"
+#include "../gfx/d3d/d3d.cpp"
 #ifndef _XBOX
-#include "../gfx/d3d9/render_chain.cpp"
+#include "../gfx/d3d/render_chain.cpp"
 #endif
 #endif