From 64411558eba6cc3e49eb2aa8993bcda5906ffff6 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Jan 2015 22:23:48 +0100 Subject: [PATCH] Rename gfx/shader/ to gfx/drivers_shader --- Makefile.common | 8 ++++---- gfx/d3d/d3d.cpp | 4 ++-- gfx/d3d/render_chain.h | 2 +- gfx/drivers/gl.c | 2 +- gfx/{shader => drivers_shader}/shader_gl_cg.c | 0 gfx/{shader => drivers_shader}/shader_glsl.c | 0 gfx/{shader => drivers_shader}/shader_glsl.h | 0 gfx/{shader => drivers_shader}/shader_hlsl.c | 0 gfx/{shader => drivers_shader}/shader_hlsl.h | 0 gfx/{shader => drivers_shader}/shader_null.c | 0 gfx/{shader => drivers_shader}/shader_parse.c | 0 gfx/{shader => drivers_shader}/shader_parse.h | 0 gfx/video_driver.h | 2 +- gfx/video_shader_driver.h | 2 +- griffin/griffin.c | 10 +++++----- menu/menu.h | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) rename gfx/{shader => drivers_shader}/shader_gl_cg.c (100%) rename gfx/{shader => drivers_shader}/shader_glsl.c (100%) rename gfx/{shader => drivers_shader}/shader_glsl.h (100%) rename gfx/{shader => drivers_shader}/shader_hlsl.c (100%) rename gfx/{shader => drivers_shader}/shader_hlsl.h (100%) rename gfx/{shader => drivers_shader}/shader_null.c (100%) rename gfx/{shader => drivers_shader}/shader_parse.c (100%) rename gfx/{shader => drivers_shader}/shader_parse.h (100%) diff --git a/Makefile.common b/Makefile.common index c1aa3eac29..4bea588dbb 100644 --- a/Makefile.common +++ b/Makefile.common @@ -131,9 +131,9 @@ OBJ += frontend/frontend.o \ libretro-sdk/file/config_file_userdata.o \ screenshot.o \ libretro-sdk/gfx/scaler/scaler.o \ - gfx/shader/shader_null.o \ + gfx/drivers_shader/shader_null.o \ gfx/video_shader_driver.o \ - gfx/shader/shader_parse.o \ + gfx/drivers_shader/shader_parse.o \ libretro-sdk/gfx/scaler/pixconv.o \ libretro-sdk/gfx/scaler/scaler_int.o \ libretro-sdk/gfx/scaler/scaler_filter.o \ @@ -447,7 +447,7 @@ ifeq ($(HAVE_OPENGL), 1) endif endif - OBJ += gfx/shader/shader_glsl.o + OBJ += gfx/drivers_shader/shader_glsl.o DEFINES += -DHAVE_GLSL endif @@ -504,7 +504,7 @@ endif ifeq ($(HAVE_CG), 1) DEFINES += -DHAVE_CG - OBJ += gfx/shader/shader_gl_cg.o + OBJ += gfx/drivers_shader/shader_gl_cg.o LIBS += $(CG_LIBS) endif diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index 22d4a4f6a5..16fb5b8e96 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -42,14 +42,14 @@ #endif #ifdef HAVE_HLSL -#include "../../gfx/shader/shader_hlsl.h" +#include "../drivers_shader/shader_hlsl.h" #endif #include "d3d_defines.h" #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) #ifdef HAVE_HLSL -#include "../shader/shader_hlsl.h" +#include "../drivers_shader/shader_hlsl.h" #endif #endif diff --git a/gfx/d3d/render_chain.h b/gfx/d3d/render_chain.h index e58bfb33c1..8cb6c3db6d 100644 --- a/gfx/d3d/render_chain.h +++ b/gfx/d3d/render_chain.h @@ -19,7 +19,7 @@ #include "d3d.h" #include "../video_state_tracker.h" -#include "../shader/shader_parse.h" +#include "../drivers_shader/shader_parse.h" struct Vertex { diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index b315666cb8..5a20a0993f 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -42,7 +42,7 @@ #include #ifdef HAVE_GLSL -#include "../shader/shader_glsl.h" +#include "../drivers_shader/shader_glsl.h" #endif #ifdef GL_DEBUG diff --git a/gfx/shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c similarity index 100% rename from gfx/shader/shader_gl_cg.c rename to gfx/drivers_shader/shader_gl_cg.c diff --git a/gfx/shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c similarity index 100% rename from gfx/shader/shader_glsl.c rename to gfx/drivers_shader/shader_glsl.c diff --git a/gfx/shader/shader_glsl.h b/gfx/drivers_shader/shader_glsl.h similarity index 100% rename from gfx/shader/shader_glsl.h rename to gfx/drivers_shader/shader_glsl.h diff --git a/gfx/shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c similarity index 100% rename from gfx/shader/shader_hlsl.c rename to gfx/drivers_shader/shader_hlsl.c diff --git a/gfx/shader/shader_hlsl.h b/gfx/drivers_shader/shader_hlsl.h similarity index 100% rename from gfx/shader/shader_hlsl.h rename to gfx/drivers_shader/shader_hlsl.h diff --git a/gfx/shader/shader_null.c b/gfx/drivers_shader/shader_null.c similarity index 100% rename from gfx/shader/shader_null.c rename to gfx/drivers_shader/shader_null.c diff --git a/gfx/shader/shader_parse.c b/gfx/drivers_shader/shader_parse.c similarity index 100% rename from gfx/shader/shader_parse.c rename to gfx/drivers_shader/shader_parse.c diff --git a/gfx/shader/shader_parse.h b/gfx/drivers_shader/shader_parse.h similarity index 100% rename from gfx/shader/shader_parse.h rename to gfx/drivers_shader/shader_parse.h diff --git a/gfx/video_driver.h b/gfx/video_driver.h index d03a1f3406..c7642443c5 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -26,7 +26,7 @@ #include "../input/input_driver.h" -#include "../gfx/shader/shader_parse.h" +#include "drivers_shader/shader_parse.h" #ifdef __cplusplus extern "C" { diff --git a/gfx/video_shader_driver.h b/gfx/video_shader_driver.h index e9bded1ec6..748e8742da 100644 --- a/gfx/video_shader_driver.h +++ b/gfx/video_shader_driver.h @@ -78,7 +78,7 @@ extern const shader_backend_t shader_null_backend; #define HAVE_SHADER_MANAGER #endif -#include "shader/shader_parse.h" +#include "drivers_shader/shader_parse.h" #define GL_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1) diff --git a/griffin/griffin.c b/griffin/griffin.c index 8b31318ac2..626e4d81a9 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -135,21 +135,21 @@ VIDEO SHADERS #ifdef HAVE_SHADERS #include "../gfx/video_shader_driver.c" -#include "../gfx/shader/shader_parse.c" -#include "../gfx/shader/shader_null.c" +#include "../gfx/drivers_shader/shader_parse.c" +#include "../gfx/drivers_shader/shader_null.c" #ifdef HAVE_CG #ifdef HAVE_OPENGL -#include "../gfx/shader/shader_gl_cg.c" +#include "../gfx/drivers_shader/shader_gl_cg.c" #endif #endif #ifdef HAVE_HLSL -#include "../gfx/shader/shader_hlsl.c" +#include "../gfx/drivers_shader/shader_hlsl.c" #endif #ifdef HAVE_GLSL -#include "../gfx/shader/shader_glsl.c" +#include "../gfx/drivers_shader/shader_glsl.c" #endif #endif diff --git a/menu/menu.h b/menu/menu.h index 8f2815a5c7..a5b797a7fc 100644 --- a/menu/menu.h +++ b/menu/menu.h @@ -28,7 +28,7 @@ #include "../../core_info.h" #include "../../playlist.h" #include "menu_input.h" -#include "../../gfx/video_shader_driver.h" +#include "../gfx/video_shader_driver.h" #ifdef HAVE_RGUI #define MENU_TEXTURE_FULLSCREEN false