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

Merge pull request #3180 from phire/fix-gles 

Make sure FORCE_EARLY_Z is defined for GLES
This commit is contained in:
Scott Mansell 2015-10-18 14:58:22 +13:00
parent 15131575c1 9ee610830c
commit 2be909849b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
View File

@ -554,19 +554,20 @@ void ProgramShaderCache::CreateHeader()
break; break;
} }
const char* earlyz_string = ""; std::string earlyz_string = "";
if (!is_glsles && g_ActiveConfig.backend_info.bSupportsEarlyZ) if (g_ActiveConfig.backend_info.bSupportsEarlyZ)
{ {
if (g_ogl_config.bSupportsEarlyFragmentTests) if (g_ogl_config.bSupportsEarlyFragmentTests)
{ {
earlyz_string = "#extension GL_ARB_shader_image_load_store : enable\n" earlyz_string = "#define FORCE_EARLY_Z layout(early_fragment_tests) in\n";
"#define FORCE_EARLY_Z layout(early_fragment_tests) in\n"; if (!is_glsles) // GLES supports this by default
earlyz_string += "#extension GL_ARB_shader_image_load_store : enable\n";
} }
else if(g_ogl_config.bSupportsConservativeDepth) else if(g_ogl_config.bSupportsConservativeDepth)
{ {
// See PixelShaderGen for details about this fallback. // See PixelShaderGen for details about this fallback.
earlyz_string = "#extension GL_ARB_conservative_depth : enable\n" earlyz_string = "#define FORCE_EARLY_Z layout(depth_unchanged) out float gl_FragDepth\n";
"#define FORCE_EARLY_Z layout(depth_unchanged) out float gl_FragDepth\n"; earlyz_string += "#extension GL_ARB_conservative_depth : enable\n";
} }
} }
@ -610,7 +611,7 @@ void ProgramShaderCache::CreateHeader()
, GetGLSLVersionString().c_str() , GetGLSLVersionString().c_str()
, v < GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : "" , v < GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
, earlyz_string , earlyz_string.c_str()
, (g_ActiveConfig.backend_info.bSupportsBindingLayout && v < GLSLES_310) ? "#extension GL_ARB_shading_language_420pack : enable" : "" , (g_ActiveConfig.backend_info.bSupportsBindingLayout && v < GLSLES_310) ? "#extension GL_ARB_shading_language_420pack : enable" : ""
, (g_ogl_config.bSupportsMSAA && v < GLSL_150) ? "#extension GL_ARB_texture_multisample : enable" : "" , (g_ogl_config.bSupportsMSAA && v < GLSL_150) ? "#extension GL_ARB_texture_multisample : enable" : ""
, g_ActiveConfig.backend_info.bSupportsBindingLayout ? "#define SAMPLER_BINDING(x) layout(binding = x)" : "#define SAMPLER_BINDING(x)" , g_ActiveConfig.backend_info.bSupportsBindingLayout ? "#define SAMPLER_BINDING(x) layout(binding = x)" : "#define SAMPLER_BINDING(x)"