Rename gfx/shader/ to gfx/drivers_shader

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
 

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

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
 {

gfx/drivers/gl.c

@@ -42,7 +42,7 @@
 #include <compat/strl.h>
 
 #ifdef HAVE_GLSL
-#include "../shader/shader_glsl.h"
+#include "../drivers_shader/shader_glsl.h"
 #endif
 
 #ifdef GL_DEBUG

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" {

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)
 

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

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