From 058900ac9f48a0592d63e47831d3b9e58925aeea Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 12 Jan 2015 23:42:50 +0100
Subject: [PATCH] Rename shader_parse.c to video_shader_parse.c

---
 Makefile.common                                             | 2 +-
 gfx/d3d/render_chain.h                                      | 2 +-
 gfx/drivers_shader/shader_hlsl.c                            | 2 +-
 gfx/video_driver.h                                          | 2 +-
 gfx/video_shader_driver.h                                   | 2 +-
 gfx/{drivers_shader/shader_parse.c => video_shader_parse.c} | 4 ++--
 gfx/{drivers_shader/shader_parse.h => video_shader_parse.h} | 6 +++---
 griffin/griffin.c                                           | 3 ++-
 8 files changed, 12 insertions(+), 11 deletions(-)
 rename gfx/{drivers_shader/shader_parse.c => video_shader_parse.c} (99%)
 rename gfx/{drivers_shader/shader_parse.h => video_shader_parse.h} (98%)

diff --git a/Makefile.common b/Makefile.common
index ba663bf277..7374567e80 100644
--- a/Makefile.common
+++ b/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 \
diff --git a/gfx/d3d/render_chain.h b/gfx/d3d/render_chain.h
index 8cb6c3db6d..3bfaeb34f4 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 "../drivers_shader/shader_parse.h"
+#include "../video_shader_parse.h"
 
 struct Vertex
 {
diff --git a/gfx/drivers_shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c
index 2591b29e3c..f6b0ba1e91 100644
--- a/gfx/drivers_shader/shader_hlsl.c
+++ b/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 =
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index c7642443c5..09b0aa13a0 100644
--- a/gfx/video_driver.h
+++ b/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" {
diff --git a/gfx/video_shader_driver.h b/gfx/video_shader_driver.h
index 748e8742da..9df172a76a 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 "drivers_shader/shader_parse.h"
+#include "video_shader_parse.h"
 
 #define GL_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1)
 
diff --git a/gfx/drivers_shader/shader_parse.c b/gfx/video_shader_parse.c
similarity index 99%
rename from gfx/drivers_shader/shader_parse.c
rename to gfx/video_shader_parse.c
index 27ed5be10b..4944ab8b39 100644
--- a/gfx/drivers_shader/shader_parse.c
+++ b/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:
diff --git a/gfx/drivers_shader/shader_parse.h b/gfx/video_shader_parse.h
similarity index 98%
rename from gfx/drivers_shader/shader_parse.h
rename to gfx/video_shader_parse.h
index 748f49dcbf..d220dd4d03 100644
--- a/gfx/drivers_shader/shader_parse.h
+++ b/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
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 86befa8e27..146d72fe9b 100644
--- a/griffin/griffin.c
+++ b/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