From d610a6aac41841dcfb4f0bf22f7631ecaecdcef7 Mon Sep 17 00:00:00 2001
From: Gregory Hainaut <gregory.hainaut@gmail.com>
Date: Sun, 24 Apr 2016 11:07:46 +0200
Subject: [PATCH] gsdx glsl: ofc forget to do the shader in bin

---
 bin/shaders/GSdx.fx                      | 13 -------------
 plugins/GSdx/res/glsl/common_header.glsl |  6 ++++++
 plugins/GSdx/res/glsl_source.h           |  6 ++++++
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/bin/shaders/GSdx.fx b/bin/shaders/GSdx.fx
index 83a9a21f5..e17f278ca 100644
--- a/bin/shaders/GSdx.fx
+++ b/bin/shaders/GSdx.fx
@@ -45,14 +45,6 @@
 #define saturate(x) clamp(x, 0.0, 1.0)
 #define SamplerState sampler2D
 
-struct vertex_basic
-{
-    vec4 p;
-    vec2 t;
-};
-
-layout(binding = 0) uniform sampler2D TextureSampler;
-
 in SHADER
 {
     vec4 p;
@@ -61,11 +53,6 @@ in SHADER
 
 layout(location = 0) out vec4 SV_Target0;
 
-layout(std140, binding = 14) uniform cb10
-{
-    vec2 _xyFrame;
-    vec4 _rcpFrame;
-};
 
 #else
 
diff --git a/plugins/GSdx/res/glsl/common_header.glsl b/plugins/GSdx/res/glsl/common_header.glsl
index eb890472b..1ffe13127 100644
--- a/plugins/GSdx/res/glsl/common_header.glsl
+++ b/plugins/GSdx/res/glsl/common_header.glsl
@@ -52,6 +52,12 @@ layout(std140, binding = 11) uniform cb11
     float hH;
 };
 
+layout(std140, binding = 14) uniform cb14
+{
+    vec2 _xyFrame;
+    vec4 _rcpFrame;
+};
+
 layout(std140, binding = 15) uniform cb15
 {
     ivec4 ScalingFactor;
diff --git a/plugins/GSdx/res/glsl_source.h b/plugins/GSdx/res/glsl_source.h
index 908fa4e60..47d8426a9 100644
--- a/plugins/GSdx/res/glsl_source.h
+++ b/plugins/GSdx/res/glsl_source.h
@@ -77,6 +77,12 @@ static const char* const common_header_glsl =
 	"    float hH;\n"
 	"};\n"
 	"\n"
+	"layout(std140, binding = 14) uniform cb14\n"
+	"{\n"
+	"    vec2 _xyFrame;\n"
+	"    vec4 _rcpFrame;\n"
+	"};\n"
+	"\n"
 	"layout(std140, binding = 15) uniform cb15\n"
 	"{\n"
 	"    ivec4 ScalingFactor;\n"