diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2015-11-23 22:15:47 +0100 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2015-11-23 22:15:47 +0100 |
| commit | 1bbec988fa70744260ffb44f9fe468ffda4323b9 (patch) | |
| tree | 4bff6a06276cbf873792b73104f33722f4fa964f /Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | |
| parent | ffb9722f2d8d5283d79efa327adb880bbd1571b7 (diff) | |
| parent | d27dcdba4886936802b68335e1480f62252b0dc6 (diff) | |
Merge pull request #3284 from Sonicadvance1/fix_ssbo_declaration
We shouldn't be trying to enable the SSBO extension in ES.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 56eb0e1e60..84c2ccf4d8 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -597,7 +597,7 @@ void ProgramShaderCache::CreateHeader() , (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_ActiveConfig.backend_info.bSupportsBindingLayout ? "#define SAMPLER_BINDING(x) layout(binding = x)" : "#define SAMPLER_BINDING(x)" - , g_ActiveConfig.backend_info.bSupportsBBox ? "#extension GL_ARB_shader_storage_buffer_object : enable" : "" + , !is_glsles && g_ActiveConfig.backend_info.bSupportsBBox ? "#extension GL_ARB_shader_storage_buffer_object : enable" : "" , v < GLSL_400 && g_ActiveConfig.backend_info.bSupportsGSInstancing ? "#extension GL_ARB_gpu_shader5 : enable" : "" , v < GLSL_400 && g_ActiveConfig.backend_info.bSupportsSSAA ? "#extension GL_ARB_sample_shading : enable" : "" , SupportedESPointSize.c_str() |