ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GSdx-ogl: Switch shader numbers main18 and main19. 

Allows us to port feedback write (DoMerge function) to D3D11 without
adding dummy shaders for osd.
This commit is contained in:
lightningterror 2018-12-10 18:31:59 +01:00
parent 0704b73c2f
commit 80af99bb44
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/Renderers/Common/GSDevice.h
View File

@ -48,8 +48,8 @@ enum ShaderConvert
ShaderConvert_RGBA8_TO_FLOAT16, ShaderConvert_RGBA8_TO_FLOAT16,
ShaderConvert_RGB5A1_TO_FLOAT16, ShaderConvert_RGB5A1_TO_FLOAT16,
ShaderConvert_RGBA_TO_8I = 17, ShaderConvert_RGBA_TO_8I = 17,
ShaderConvert_OSD,
ShaderConvert_YUV, ShaderConvert_YUV,
ShaderConvert_OSD,
ShaderConvert_Count ShaderConvert_Count
}; };

8
plugins/GSdx/res/glsl/convert.glsl
View File

@ -278,8 +278,8 @@ void ps_main17()
} }
#endif #endif
#ifdef ps_main18 #ifdef ps_main19
void ps_main18() void ps_main19()
{ {
SV_Target0 = PSin.c * vec4(1.0, 1.0, 1.0, sample_c().r); SV_Target0 = PSin.c * vec4(1.0, 1.0, 1.0, sample_c().r);
} }
@ -387,8 +387,8 @@ void ps_main4()
} }
#endif #endif
#ifdef ps_main19 #ifdef ps_main18
void ps_main19() void ps_main18()
{ {
vec4 i = sample_c(); vec4 i = sample_c();
vec4 o; vec4 o;