piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add initial support for GLSL ES 3.10.

Browse Source 
GLSL ES 3.10 adds implicit support for the binding layout qualifier that we use.
Changes our GLSL version enums to bit values so we can check for both ES versions easily.
This commit is contained in:
Ryan Houdek
2014-03-30 13:58:05 -05:00
parent bad109402e
commit 3251d78f89
6 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -459,7 +459,10 @@ Renderer::Renderer()
g_Config.backend_info.bSupportsPrimitiveRestart = !DriverDetails::HasBug(DriverDetails::BUG_PRIMITIVERESTART) &&
((GLExtensions::Version() >= 310) || GLExtensions::Supports("GL_NV_primitive_restart"));
g_Config.backend_info.bSupportsEarlyZ = GLExtensions::Supports("GL_ARB_shader_image_load_store");
g_Config.backend_info.bSupportShadingLanguage420pack = GLExtensions::Supports("GL_ARB_shading_language_420pack");
// Desktop OpenGL supports the binding layout if it supports 420pack
// OpenGL ES 3.1 supports it implicitly without an extension
g_Config.backend_info.bSupportsBindingLayout = GLExtensions::Supports("GL_ARB_shading_language_420pack");
g_ogl_config.bSupportsGLSLCache = GLExtensions::Supports("GL_ARB_get_program_binary");
g_ogl_config.bSupportsGLPinnedMemory = GLExtensions::Supports("GL_AMD_pinned_memory");
@ -472,7 +475,17 @@ Renderer::Renderer()
g_ogl_config.bSupportViewportFloat = GLExtensions::Supports("GL_ARB_viewport_array");
if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3)
g_ogl_config.eSupportedGLSLVersion = GLSLES3;
{
if (strstr(g_ogl_config.glsl_version, "3.00"))
{
g_ogl_config.eSupportedGLSLVersion = GLSLES_300;
}
else
{
g_ogl_config.eSupportedGLSLVersion = GLSLES_310;
g_Config.backend_info.bSupportsBindingLayout = true;
}
}
else
{
if (strstr(g_ogl_config.glsl_version, "1.00") || strstr(g_ogl_config.glsl_version, "1.10") || strstr(g_ogl_config.glsl_version, "1.20"))