From 80af99bb44cef75ab8dcf6afd2796c4f2063fc70 Mon Sep 17 00:00:00 2001
From: lightningterror <lightningterror@yahoo.com>
Date: Mon, 10 Dec 2018 18:31:59 +0100
Subject: [PATCH] GSdx-ogl: Switch shader numbers main18 and main19.

Allows us to port feedback write (DoMerge function) to D3D11 without
adding dummy shaders for osd.
---
 plugins/GSdx/Renderers/Common/GSDevice.h | 2 +-
 plugins/GSdx/res/glsl/convert.glsl       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/GSdx/Renderers/Common/GSDevice.h b/plugins/GSdx/Renderers/Common/GSDevice.h
index a62767debe..a09e46d9ee 100644
--- a/plugins/GSdx/Renderers/Common/GSDevice.h
+++ b/plugins/GSdx/Renderers/Common/GSDevice.h
@@ -48,8 +48,8 @@ enum ShaderConvert
 	ShaderConvert_RGBA8_TO_FLOAT16,
 	ShaderConvert_RGB5A1_TO_FLOAT16,
 	ShaderConvert_RGBA_TO_8I = 17,
-	ShaderConvert_OSD,
 	ShaderConvert_YUV,
+	ShaderConvert_OSD,
 	ShaderConvert_Count
 };
 
diff --git a/plugins/GSdx/res/glsl/convert.glsl b/plugins/GSdx/res/glsl/convert.glsl
index a261101611..ba210c53e8 100644
--- a/plugins/GSdx/res/glsl/convert.glsl
+++ b/plugins/GSdx/res/glsl/convert.glsl
@@ -278,8 +278,8 @@ void ps_main17()
 }
 #endif
 
-#ifdef ps_main18
-void ps_main18()
+#ifdef ps_main19
+void ps_main19()
 {
     SV_Target0 = PSin.c * vec4(1.0, 1.0, 1.0, sample_c().r);
 }
@@ -387,8 +387,8 @@ void ps_main4()
 }
 #endif
 
-#ifdef ps_main19
-void ps_main19()
+#ifdef ps_main18
+void ps_main18()
 {
     vec4 i = sample_c();
     vec4 o;