diff options
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp index 5cc9ec36cd..f27f56d701 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp @@ -524,10 +524,10 @@ void ProgramShaderCache::CreateHeader ( void ) "%s\n" // early-z "\n"// A few required defines and ones that will make our lives a lot easier - "#define ATTRIN %s\n" - "#define ATTROUT %s\n" - "#define VARYIN %s\n" - "#define VARYOUT %s\n" + "#define ATTRIN in\n" + "#define ATTROUT out\n" + "#define VARYIN %s in\n" + "#define VARYOUT %s out\n" // Silly differences "#define float2 vec2\n" @@ -538,35 +538,18 @@ void ProgramShaderCache::CreateHeader ( void ) "#define frac fract\n" "#define lerp mix\n" - // glsl 120 hack - "%s\n" - "%s\n" - "%s\n" - "%s\n" - "%s\n" - "#define COLOROUT(name) %s\n" - // texture2d hack "%s\n" "%s\n" "%s\n" - , v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : v==GLSL_140 ? "140" : "150" + , v==GLSLES3 ? "300 es" : v==GLSL_130 ? "130" : v==GLSL_140 ? "140" : "150" , v==GLSLES3 ? "precision highp float;" : "" , g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : "" , g_ActiveConfig.backend_info.bSupportsEarlyZ ? "#extension GL_ARB_shader_image_load_store : enable" : "" - , v==GLSL_120 ? "attribute" : "in" - , v==GLSL_120 ? "attribute" : "out" - , v==GLSL_120 ? "varying" : DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "in" : "centroid in" - , v==GLSL_120 ? "varying" : DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "out" : "centroid out" - - , v==GLSL_120 ? "#define texture texture2D" : "" - , v==GLSL_120 ? "#define round(x) floor((x)+0.5f)" : "" - , v==GLSL_120 ? "#define out " : "" - , v==GLSL_120 ? "#define ocol0 gl_FragColor" : "" - , v==GLSL_120 ? "#define ocol1 gl_FragColor" : "" //TODO: implement dual source blend - , v==GLSL_120 ? "" : "out vec4 name;" + , DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "" : "centroid" + , DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "" : "centroid" , v==GLSLES3 ? "" : v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture" , v==GLSLES3 ? "#define texture2DRect(samp, uv) texelFetch(samp, ivec2(floor(uv)), 0)" : "" |