Combine video_driver.c and video_shader_driver.c

Supernature2k · May 18, 2017 · 59b3344 · 59b3344
1 parent 4e7b376
commit 59b3344
Show file tree

Hide file tree

Showing 28 changed files with 619 additions and 692 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -223,7 +223,6 @@ OBJ += frontend/frontend.o \
        tasks/task_powerstate.o \
        $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler.o \
        gfx/drivers_shader/shader_null.o \
-       gfx/video_shader_driver.o \
        gfx/video_shader_parse.o \
        $(LIBRETRO_COMM_DIR)/gfx/scaler/pixconv.o \
        $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler_int.o \

diff --git a/gfx/drivers/d3d.h b/gfx/drivers/d3d.h
@@ -46,10 +46,6 @@
 
 #include "../../driver.h"
 
-#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
-#include "../video_shader_driver.h"
-#endif
-
 #include "../font_driver.h"
 #include "../video_driver.h"
 #include "../common/d3d_common.h"

diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
@@ -75,8 +75,6 @@
 #include "../common/win32_common.h"
 #endif
 
-#include "../video_shader_driver.h"
-
 #ifndef GL_SYNC_GPU_COMMANDS_COMPLETE
 #define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
 #endif

diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
@@ -22,7 +22,6 @@
 
 #include "../common/gl_common.h"
 #include "../font_driver.h"
-#include "../video_shader_driver.h"
 #include "../video_driver.h"
 
 /* TODO: Move viewport side effects to the caller: it's a source of bugs. */

diff --git a/gfx/drivers_renderchain/gl_legacy_renderchain.c b/gfx/drivers_renderchain/gl_legacy_renderchain.c
@@ -50,7 +50,7 @@
 #include "../common/win32_common.h"
 #endif
 
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 
 #define set_texture_coords(coords, xamt, yamt) \
    coords[2] = xamt; \

diff --git a/gfx/drivers_renderchain/xdk_renderchain.cpp b/gfx/drivers_renderchain/xdk_renderchain.cpp
@@ -21,7 +21,7 @@
 #include "../drivers/d3d.h"
 #include "../common/d3d_common.h"
 
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 
 #include "../../configuration.h"
 #include "../../verbosity.h"

diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
@@ -46,7 +46,7 @@
 
 #include "../include/Cg/cg.h"
 
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 #include "../video_shader_parse.h"
 #include "../../core.h"
 #include "../../managers/state_manager.h"

diff --git a/gfx/drivers_shader/shader_glsl.h b/gfx/drivers_shader/shader_glsl.h
@@ -19,7 +19,7 @@
 #define __RARCH_GLSL_H
 
 #include <boolean.h>
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 
 void gl_glsl_set_get_proc_address(gfx_ctx_proc_t (*proc)(const char*));
 

diff --git a/gfx/drivers_shader/shader_hlsl.h b/gfx/drivers_shader/shader_hlsl.h
@@ -17,9 +17,10 @@
 #ifndef __RARCH_HLSL_H
 #define __RARCH_HLSL_H
 
-#include "../video_shader_driver.h"
 #include <stdint.h>
 
+#include "../video_driver.h"
+
 void hlsl_set_proj_matrix(void *data, XMMATRIX rotation_value);
 
 #define RARCH_HLSL_MAX_SHADERS 16

diff --git a/gfx/drivers_shader/shader_null.c b/gfx/drivers_shader/shader_null.c
@@ -27,7 +27,7 @@
 #include "../../config.h"
 #endif
 
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 
 typedef struct null_shader_data
 {

diff --git a/gfx/drivers_shader/shader_vulkan.cpp b/gfx/drivers_shader/shader_vulkan.cpp
@@ -30,7 +30,7 @@
 
 #include "slang_reflection.hpp"
 
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 #include "../../verbosity.h"
 #include "../../msg_hash.h"
 

diff --git a/gfx/drivers_shader/slang_preprocess.h b/gfx/drivers_shader/slang_preprocess.h
@@ -18,7 +18,7 @@
 
 #include <boolean.h>
 #include <retro_common_api.h>
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 
 RETRO_BEGIN_DECLS