Rename shader_parse.c to video_shader_parse.c

Makefile.common

@@ -133,7 +133,7 @@ OBJ += frontend/frontend.o \
 		libretro-sdk/gfx/scaler/scaler.o \
 		gfx/drivers_shader/shader_null.o \
 		gfx/video_shader_driver.o \
-		gfx/drivers_shader/shader_parse.o \
+		gfx/video_shader_parse.o \
 		libretro-sdk/gfx/scaler/pixconv.o \
 		libretro-sdk/gfx/scaler/scaler_int.o \
 		libretro-sdk/gfx/scaler/scaler_filter.o \

gfx/d3d/render_chain.h

@@ -19,7 +19,7 @@
 
 #include "d3d.h"
 #include "../video_state_tracker.h"
-#include "../drivers_shader/shader_parse.h"
+#include "../video_shader_parse.h"
 
 struct Vertex
 {

gfx/drivers_shader/shader_hlsl.c

@@ -15,7 +15,7 @@
  */
 
 #include "shader_hlsl.h"
-#include "shader_parse.h"
+#include "../video_shader_parse.h"
 #include "../d3d/d3d.h"
 
 static const char *stock_hlsl_program =

gfx/video_driver.h

@@ -26,7 +26,7 @@
 
 #include "../input/input_driver.h"
 
-#include "drivers_shader/shader_parse.h"
+#include "video_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 "drivers_shader/shader_parse.h"
+#include "video_shader_parse.h"
 
 #define GL_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1)
 

gfx/video_shader_parse.c

@@ -16,12 +16,12 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "shader_parse.h"
+#include "video_shader_parse.h"
 #include <compat/posix_string.h>
 #include <compat/msvc.h>
 #include <compat/strl.h>
 #include <file/file_path.h>
-#include "../../general.h"
+#include "../general.h"
 
 /**
  * wrap_mode_to_str:

gfx/video_shader_parse.h

@@ -14,12 +14,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SHADER_PARSE_H
-#define SHADER_PARSE_H
+#ifndef __VIDEO_SHADER_PARSE_H
+#define __VIDEO_SHADER_PARSE_H
 
 #include <boolean.h>
 #include <file/config_file.h>
-#include "../video_state_tracker.h"
+#include "video_state_tracker.h"
 #include <retro_miscellaneous.h>
 
 #ifdef __cplusplus

griffin/griffin.c

@@ -135,7 +135,8 @@ VIDEO SHADERS
 
 #ifdef HAVE_SHADERS
 #include "../gfx/video_shader_driver.c"
-#include "../gfx/drivers_shader/shader_parse.c"
+#include "../gfx/video_shader_parse.c"
+
 #include "../gfx/drivers_shader/shader_null.c"
 
 #ifdef HAVE_CG