From c5b9352c347f6b08d7ce192741ee83e465959a64 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 24 Nov 2018 01:26:05 +0100
Subject: [PATCH] Revert "Rename some files"

This reverts commit 03a8bc9875ef4e0e942ab6d8d0d9402c4e1830fe.
---
 gfx/drivers/gl_shaders/cg/shaders_common.h    |  6 --
 .../frag => }/core_alpha_blend.glsl.frag.h    |  0
 .../vert => }/core_alpha_blend.glsl.vert.h    |  0
 .../{glsl/frag => }/core_opaque.glsl.frag.h   |  0
 .../{glsl/vert => }/core_opaque.glsl.vert.h   |  0
 .../frag => }/core_pipeline_bokeh.glsl.frag.h |  0
 .../frag => }/core_pipeline_snow.glsl.frag.h  |  0
 .../core_pipeline_snow_simple.glsl.frag.h     |  0
 .../core_pipeline_snowflake.glsl.frag.h       |  0
 .../core_pipeline_xmb_ribbon.glsl.frag.h      |  0
 ...ore_pipeline_xmb_ribbon_simple.glsl.frag.h |  0
 .../gl_shaders/glsl/frag/shaders_common.h     |  6 --
 .../gl_shaders/glsl/vert/shaders_common.h     |  6 --
 .../{glsl/frag => }/legacy_opaque.glsl.frag.h |  0
 .../{glsl/vert => }/legacy_opaque.glsl.vert.h |  0
 .../legacy_pipeline_snow.glsl.vert.h          |  0
 .../legacy_pipeline_xmb_ribbon.glsl.vert.h    |  0
 ...acy_pipeline_xmb_ribbon_simple.glsl.vert.h |  0
 .../frag => }/modern_alpha_blend.glsl.frag.h  |  0
 .../vert => }/modern_alpha_blend.glsl.vert.h  |  0
 .../{glsl/frag => }/modern_opaque.glsl.frag.h |  0
 .../{glsl/vert => }/modern_opaque.glsl.vert.h |  0
 .../modern_pipeline_xmb_ribbon.glsl.vert.h    |  0
 ...ern_pipeline_xmb_ribbon_simple.glsl.vert.h |  0
 gfx/drivers/gl_shaders/{cg => }/opaque.cg.h   |  0
 .../frag => }/pipeline_bokeh.glsl.frag.h      |  0
 .../gl_shaders/{cg => }/pipeline_nuklear.cg.h |  0
 .../frag => }/pipeline_nuklear.glsl.frag.h    |  0
 .../vert => }/pipeline_nuklear.glsl.vert.h    |  0
 .../gl_shaders/{cg => }/pipeline_snow.cg.h    |  0
 .../{glsl/frag => }/pipeline_snow.glsl.frag.h |  0
 .../{glsl/vert => }/pipeline_snow.glsl.vert.h |  0
 .../vert => }/pipeline_snow_core.glsl.vert.h  |  0
 .../pipeline_snow_simple.glsl.frag.h          |  0
 .../frag => }/pipeline_snowflake.glsl.frag.h  |  0
 .../frag => }/pipeline_xmb_ribbon.glsl.frag.h |  0
 .../{cg => }/pipeline_xmb_ribbon_simple.cg.h  |  0
 .../pipeline_xmb_ribbon_simple.glsl.frag.h    |  0
 .../{glsl/glsl_common.h => shaders_common.h}  |  2 +
 gfx/drivers_shader/shader_gl_cg.c             |  6 +-
 gfx/drivers_shader/shader_glsl.c              | 60 +++++++++----------
 41 files changed, 34 insertions(+), 52 deletions(-)
 delete mode 100644 gfx/drivers/gl_shaders/cg/shaders_common.h
 rename gfx/drivers/gl_shaders/{glsl/frag => }/core_alpha_blend.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/core_alpha_blend.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/core_opaque.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/core_opaque.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/core_pipeline_bokeh.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/core_pipeline_snow.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/core_pipeline_snow_simple.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/core_pipeline_snowflake.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/core_pipeline_xmb_ribbon.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/core_pipeline_xmb_ribbon_simple.glsl.frag.h (100%)
 delete mode 100644 gfx/drivers/gl_shaders/glsl/frag/shaders_common.h
 delete mode 100644 gfx/drivers/gl_shaders/glsl/vert/shaders_common.h
 rename gfx/drivers/gl_shaders/{glsl/frag => }/legacy_opaque.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/legacy_opaque.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/legacy_pipeline_snow.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/legacy_pipeline_xmb_ribbon.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/modern_alpha_blend.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/modern_alpha_blend.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/modern_opaque.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/modern_opaque.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/modern_pipeline_xmb_ribbon.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/modern_pipeline_xmb_ribbon_simple.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{cg => }/opaque.cg.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/pipeline_bokeh.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{cg => }/pipeline_nuklear.cg.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/pipeline_nuklear.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/pipeline_nuklear.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{cg => }/pipeline_snow.cg.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/pipeline_snow.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/pipeline_snow.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/vert => }/pipeline_snow_core.glsl.vert.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/pipeline_snow_simple.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/pipeline_snowflake.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/pipeline_xmb_ribbon.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{cg => }/pipeline_xmb_ribbon_simple.cg.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/frag => }/pipeline_xmb_ribbon_simple.glsl.frag.h (100%)
 rename gfx/drivers/gl_shaders/{glsl/glsl_common.h => shaders_common.h} (92%)

diff --git a/gfx/drivers/gl_shaders/cg/shaders_common.h b/gfx/drivers/gl_shaders/cg/shaders_common.h
deleted file mode 100644
index e9494fe841..0000000000
--- a/gfx/drivers/gl_shaders/cg/shaders_common.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SHADERS_COMMON
-#define _SHADERS_COMMON
-
-#define CG(src)         "" #src
-
-#endif
diff --git a/gfx/drivers/gl_shaders/glsl/frag/core_alpha_blend.glsl.frag.h b/gfx/drivers/gl_shaders/core_alpha_blend.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/core_alpha_blend.glsl.frag.h
rename to gfx/drivers/gl_shaders/core_alpha_blend.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/core_alpha_blend.glsl.vert.h b/gfx/drivers/gl_shaders/core_alpha_blend.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/core_alpha_blend.glsl.vert.h
rename to gfx/drivers/gl_shaders/core_alpha_blend.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/core_opaque.glsl.frag.h b/gfx/drivers/gl_shaders/core_opaque.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/core_opaque.glsl.frag.h
rename to gfx/drivers/gl_shaders/core_opaque.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/core_opaque.glsl.vert.h b/gfx/drivers/gl_shaders/core_opaque.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/core_opaque.glsl.vert.h
rename to gfx/drivers/gl_shaders/core_opaque.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/core_pipeline_bokeh.glsl.frag.h b/gfx/drivers/gl_shaders/core_pipeline_bokeh.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/core_pipeline_bokeh.glsl.frag.h
rename to gfx/drivers/gl_shaders/core_pipeline_bokeh.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/core_pipeline_snow.glsl.frag.h b/gfx/drivers/gl_shaders/core_pipeline_snow.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/core_pipeline_snow.glsl.frag.h
rename to gfx/drivers/gl_shaders/core_pipeline_snow.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/core_pipeline_snow_simple.glsl.frag.h b/gfx/drivers/gl_shaders/core_pipeline_snow_simple.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/core_pipeline_snow_simple.glsl.frag.h
rename to gfx/drivers/gl_shaders/core_pipeline_snow_simple.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/core_pipeline_snowflake.glsl.frag.h b/gfx/drivers/gl_shaders/core_pipeline_snowflake.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/core_pipeline_snowflake.glsl.frag.h
rename to gfx/drivers/gl_shaders/core_pipeline_snowflake.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/core_pipeline_xmb_ribbon.glsl.frag.h b/gfx/drivers/gl_shaders/core_pipeline_xmb_ribbon.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/core_pipeline_xmb_ribbon.glsl.frag.h
rename to gfx/drivers/gl_shaders/core_pipeline_xmb_ribbon.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/core_pipeline_xmb_ribbon_simple.glsl.frag.h b/gfx/drivers/gl_shaders/core_pipeline_xmb_ribbon_simple.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/core_pipeline_xmb_ribbon_simple.glsl.frag.h
rename to gfx/drivers/gl_shaders/core_pipeline_xmb_ribbon_simple.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/shaders_common.h b/gfx/drivers/gl_shaders/glsl/frag/shaders_common.h
deleted file mode 100644
index 655861381c..0000000000
--- a/gfx/drivers/gl_shaders/glsl/frag/shaders_common.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SHADERS_COMMON
-#define _SHADERS_COMMON
-
-#include "../glsl_common.h"
-
-#endif
diff --git a/gfx/drivers/gl_shaders/glsl/vert/shaders_common.h b/gfx/drivers/gl_shaders/glsl/vert/shaders_common.h
deleted file mode 100644
index 655861381c..0000000000
--- a/gfx/drivers/gl_shaders/glsl/vert/shaders_common.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SHADERS_COMMON
-#define _SHADERS_COMMON
-
-#include "../glsl_common.h"
-
-#endif
diff --git a/gfx/drivers/gl_shaders/glsl/frag/legacy_opaque.glsl.frag.h b/gfx/drivers/gl_shaders/legacy_opaque.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/legacy_opaque.glsl.frag.h
rename to gfx/drivers/gl_shaders/legacy_opaque.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/legacy_opaque.glsl.vert.h b/gfx/drivers/gl_shaders/legacy_opaque.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/legacy_opaque.glsl.vert.h
rename to gfx/drivers/gl_shaders/legacy_opaque.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/legacy_pipeline_snow.glsl.vert.h b/gfx/drivers/gl_shaders/legacy_pipeline_snow.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/legacy_pipeline_snow.glsl.vert.h
rename to gfx/drivers/gl_shaders/legacy_pipeline_snow.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/legacy_pipeline_xmb_ribbon.glsl.vert.h b/gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/legacy_pipeline_xmb_ribbon.glsl.vert.h
rename to gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h b/gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h
rename to gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/modern_alpha_blend.glsl.frag.h b/gfx/drivers/gl_shaders/modern_alpha_blend.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/modern_alpha_blend.glsl.frag.h
rename to gfx/drivers/gl_shaders/modern_alpha_blend.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/modern_alpha_blend.glsl.vert.h b/gfx/drivers/gl_shaders/modern_alpha_blend.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/modern_alpha_blend.glsl.vert.h
rename to gfx/drivers/gl_shaders/modern_alpha_blend.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/modern_opaque.glsl.frag.h b/gfx/drivers/gl_shaders/modern_opaque.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/modern_opaque.glsl.frag.h
rename to gfx/drivers/gl_shaders/modern_opaque.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/modern_opaque.glsl.vert.h b/gfx/drivers/gl_shaders/modern_opaque.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/modern_opaque.glsl.vert.h
rename to gfx/drivers/gl_shaders/modern_opaque.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/modern_pipeline_xmb_ribbon.glsl.vert.h b/gfx/drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/modern_pipeline_xmb_ribbon.glsl.vert.h
rename to gfx/drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/modern_pipeline_xmb_ribbon_simple.glsl.vert.h b/gfx/drivers/gl_shaders/modern_pipeline_xmb_ribbon_simple.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/modern_pipeline_xmb_ribbon_simple.glsl.vert.h
rename to gfx/drivers/gl_shaders/modern_pipeline_xmb_ribbon_simple.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/cg/opaque.cg.h b/gfx/drivers/gl_shaders/opaque.cg.h
similarity index 100%
rename from gfx/drivers/gl_shaders/cg/opaque.cg.h
rename to gfx/drivers/gl_shaders/opaque.cg.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/pipeline_bokeh.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_bokeh.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/pipeline_bokeh.glsl.frag.h
rename to gfx/drivers/gl_shaders/pipeline_bokeh.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/cg/pipeline_nuklear.cg.h b/gfx/drivers/gl_shaders/pipeline_nuklear.cg.h
similarity index 100%
rename from gfx/drivers/gl_shaders/cg/pipeline_nuklear.cg.h
rename to gfx/drivers/gl_shaders/pipeline_nuklear.cg.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/pipeline_nuklear.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/pipeline_nuklear.glsl.frag.h
rename to gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/pipeline_nuklear.glsl.vert.h b/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/pipeline_nuklear.glsl.vert.h
rename to gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/cg/pipeline_snow.cg.h b/gfx/drivers/gl_shaders/pipeline_snow.cg.h
similarity index 100%
rename from gfx/drivers/gl_shaders/cg/pipeline_snow.cg.h
rename to gfx/drivers/gl_shaders/pipeline_snow.cg.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/pipeline_snow.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_snow.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/pipeline_snow.glsl.frag.h
rename to gfx/drivers/gl_shaders/pipeline_snow.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/pipeline_snow.glsl.vert.h b/gfx/drivers/gl_shaders/pipeline_snow.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/pipeline_snow.glsl.vert.h
rename to gfx/drivers/gl_shaders/pipeline_snow.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/vert/pipeline_snow_core.glsl.vert.h b/gfx/drivers/gl_shaders/pipeline_snow_core.glsl.vert.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/vert/pipeline_snow_core.glsl.vert.h
rename to gfx/drivers/gl_shaders/pipeline_snow_core.glsl.vert.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/pipeline_snow_simple.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_snow_simple.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/pipeline_snow_simple.glsl.frag.h
rename to gfx/drivers/gl_shaders/pipeline_snow_simple.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/pipeline_snowflake.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_snowflake.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/pipeline_snowflake.glsl.frag.h
rename to gfx/drivers/gl_shaders/pipeline_snowflake.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/pipeline_xmb_ribbon.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_xmb_ribbon.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/pipeline_xmb_ribbon.glsl.frag.h
rename to gfx/drivers/gl_shaders/pipeline_xmb_ribbon.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/cg/pipeline_xmb_ribbon_simple.cg.h b/gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h
similarity index 100%
rename from gfx/drivers/gl_shaders/cg/pipeline_xmb_ribbon_simple.cg.h
rename to gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h
diff --git a/gfx/drivers/gl_shaders/glsl/frag/pipeline_xmb_ribbon_simple.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h
similarity index 100%
rename from gfx/drivers/gl_shaders/glsl/frag/pipeline_xmb_ribbon_simple.glsl.frag.h
rename to gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h
diff --git a/gfx/drivers/gl_shaders/glsl/glsl_common.h b/gfx/drivers/gl_shaders/shaders_common.h
similarity index 92%
rename from gfx/drivers/gl_shaders/glsl/glsl_common.h
rename to gfx/drivers/gl_shaders/shaders_common.h
index 0c9640a08b..8a97a09ba6 100644
--- a/gfx/drivers/gl_shaders/glsl/glsl_common.h
+++ b/gfx/drivers/gl_shaders/shaders_common.h
@@ -14,9 +14,11 @@
    "#endif\n" 
 
 #if defined(HAVE_OPENGLES)
+#define CG(src)       "" #src
 #define GLSL(src)     GLSL_DERIV_PREAMBLE() GLSL_PREAMBLE() #src
 #define GLSL_330(src) "#version 330 es\n" GLSL_PREAMBLE() #src
 #else
+#define CG(src)         "" #src
 #define GLSL(src)       "" GLSL_PREAMBLE() #src
 #define GLSL_300(src)   "#version 300 es\n" GLSL_PREAMBLE() #src
 #define GLSL_330(src)   "#version 330 core\n" GLSL_PREAMBLE() #src
diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 73619ee64f..4e89540b63 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -39,8 +39,8 @@
 #endif
 
 #ifdef HAVE_SHADERPIPELINE
-#include "../drivers/gl_shaders/cg/pipeline_xmb_ribbon_simple.cg.h"
-#include "../drivers/gl_shaders/cg/pipeline_snow.cg.h"
+#include "../drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h"
+#include "../drivers/gl_shaders/pipeline_snow.cg.h"
 #endif
 
 #include "../include/Cg/cg.h"
@@ -132,7 +132,7 @@ struct uniform_cg
    }
 
 
-#include "../drivers/gl_shaders/cg/opaque.cg.h"
+#include "../drivers/gl_shaders/opaque.cg.h"
 
 static void gl_cg_set_uniform_parameter(
       void *data,
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 8193b997f0..f9bed812e8 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -105,39 +105,37 @@ static const char *glsl_prefixes[] = {
    "ruby",
 };
 
-#include "../drivers/gl_shaders/glsl/vert/modern_opaque.glsl.vert.h"
-#include "../drivers/gl_shaders/glsl/vert/core_opaque.glsl.vert.h"
-#include "../drivers/gl_shaders/glsl/vert/legacy_opaque.glsl.vert.h"
-#include "../drivers/gl_shaders/glsl/vert/modern_alpha_blend.glsl.vert.h"
-#include "../drivers/gl_shaders/glsl/vert/core_alpha_blend.glsl.vert.h"
-
-#include "../drivers/gl_shaders/glsl/frag/modern_opaque.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/core_opaque.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/legacy_opaque.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/modern_alpha_blend.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/core_alpha_blend.glsl.frag.h"
+#include "../drivers/gl_shaders/modern_opaque.glsl.vert.h"
+#include "../drivers/gl_shaders/modern_opaque.glsl.frag.h"
+#include "../drivers/gl_shaders/core_opaque.glsl.vert.h"
+#include "../drivers/gl_shaders/core_opaque.glsl.frag.h"
+#include "../drivers/gl_shaders/legacy_opaque.glsl.vert.h"
+#include "../drivers/gl_shaders/legacy_opaque.glsl.frag.h"
+#include "../drivers/gl_shaders/modern_alpha_blend.glsl.vert.h"
+#include "../drivers/gl_shaders/modern_alpha_blend.glsl.frag.h"
+#include "../drivers/gl_shaders/core_alpha_blend.glsl.vert.h"
+#include "../drivers/gl_shaders/core_alpha_blend.glsl.frag.h"
 
 #ifdef HAVE_SHADERPIPELINE
-#include "../drivers/gl_shaders/glsl/vert/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h"
-#include "../drivers/gl_shaders/glsl/vert/modern_pipeline_xmb_ribbon_simple.glsl.vert.h"
-#include "../drivers/gl_shaders/glsl/vert/pipeline_snow.glsl.vert.h"
-#include "../drivers/gl_shaders/glsl/vert/pipeline_snow_core.glsl.vert.h"
-#include "../drivers/gl_shaders/glsl/vert/legacy_pipeline_snow.glsl.vert.h"
-#include "../drivers/gl_shaders/glsl/vert/legacy_pipeline_xmb_ribbon.glsl.vert.h"
-#include "../drivers/gl_shaders/glsl/vert/modern_pipeline_xmb_ribbon.glsl.vert.h"
-
-#include "../drivers/gl_shaders/glsl/frag/core_pipeline_snow.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/core_pipeline_snow_simple.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/core_pipeline_xmb_ribbon.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/core_pipeline_xmb_ribbon_simple.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/core_pipeline_bokeh.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/core_pipeline_snowflake.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/pipeline_xmb_ribbon_simple.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/pipeline_snow.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/pipeline_snow_simple.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/pipeline_xmb_ribbon.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/pipeline_bokeh.glsl.frag.h"
-#include "../drivers/gl_shaders/glsl/frag/pipeline_snowflake.glsl.frag.h"
+#include "../drivers/gl_shaders/core_pipeline_snow.glsl.frag.h"
+#include "../drivers/gl_shaders/core_pipeline_snow_simple.glsl.frag.h"
+#include "../drivers/gl_shaders/core_pipeline_xmb_ribbon.glsl.frag.h"
+#include "../drivers/gl_shaders/core_pipeline_xmb_ribbon_simple.glsl.frag.h"
+#include "../drivers/gl_shaders/core_pipeline_bokeh.glsl.frag.h"
+#include "../drivers/gl_shaders/core_pipeline_snowflake.glsl.frag.h"
+#include "../drivers/gl_shaders/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h"
+#include "../drivers/gl_shaders/modern_pipeline_xmb_ribbon_simple.glsl.vert.h"
+#include "../drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h"
+#include "../drivers/gl_shaders/pipeline_snow.glsl.frag.h"
+#include "../drivers/gl_shaders/pipeline_snow.glsl.vert.h"
+#include "../drivers/gl_shaders/pipeline_snow_core.glsl.vert.h"
+#include "../drivers/gl_shaders/pipeline_snow_simple.glsl.frag.h"
+#include "../drivers/gl_shaders/legacy_pipeline_snow.glsl.vert.h"
+#include "../drivers/gl_shaders/legacy_pipeline_xmb_ribbon.glsl.vert.h"
+#include "../drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h"
+#include "../drivers/gl_shaders/pipeline_xmb_ribbon.glsl.frag.h"
+#include "../drivers/gl_shaders/pipeline_bokeh.glsl.frag.h"
+#include "../drivers/gl_shaders/pipeline_snowflake.glsl.frag.h"
 #endif
 
 typedef struct glsl_shader_data