diff options
| author | Tilka <tilkax@gmail.com> | 2023-10-28 02:12:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-28 02:12:40 +0100 |
| commit | 7c243a110a1b210238a824f56d3a33fed4aee9c6 (patch) | |
| tree | b0671b61dc3545ed77b1b11df93e5e50113a651c /Source/Core/VideoBackends/OGL/OGLConfig.cpp | |
| parent | ef447bb40ba1bea3c8b5ff084d83bd49f5a08e8f (diff) | |
| parent | 4f2a79058a35a51e549c0ad5416cd5709fc35df4 (diff) | |
Merge pull request #12253 from TellowKrinkle/AsahiGL
Fix shader compiles on Asahi Linux
Diffstat (limited to 'Source/Core/VideoBackends/OGL/OGLConfig.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/OGLConfig.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/OGL/OGLConfig.cpp b/Source/Core/VideoBackends/OGL/OGLConfig.cpp index 2695402b63..b51c43aa89 100644 --- a/Source/Core/VideoBackends/OGL/OGLConfig.cpp +++ b/Source/Core/VideoBackends/OGL/OGLConfig.cpp @@ -287,10 +287,6 @@ bool PopulateConfig(GLContext* m_main_gl_context) g_Config.backend_info.bSupportsPrimitiveRestart = !DriverDetails::HasBug(DriverDetails::BUG_PRIMITIVE_RESTART) && ((GLExtensions::Version() >= 310) || GLExtensions::Supports("GL_NV_primitive_restart")); - g_Config.backend_info.bSupportsFragmentStoresAndAtomics = - GLExtensions::Supports("GL_ARB_shader_storage_buffer_object"); - g_Config.backend_info.bSupportsVSLinePointExpand = - GLExtensions::Supports("GL_ARB_shader_storage_buffer_object"); g_Config.backend_info.bSupportsGSInstancing = GLExtensions::Supports("GL_ARB_gpu_shader5"); g_Config.backend_info.bSupportsSSAA = GLExtensions::Supports("GL_ARB_gpu_shader5") && GLExtensions::Supports("GL_ARB_sample_shading"); @@ -351,6 +347,21 @@ bool PopulateConfig(GLContext* m_main_gl_context) g_Config.backend_info.bSupportsTextureQueryLevels = GLExtensions::Supports("GL_ARB_texture_query_levels") || GLExtensions::Version() >= 430; + if (GLExtensions::Supports("GL_ARB_shader_storage_buffer_object")) + { + GLint fs = 0; + GLint vs = 0; + glGetIntegerv(GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS, &fs); + glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &vs); + g_Config.backend_info.bSupportsFragmentStoresAndAtomics = fs >= 1; + g_Config.backend_info.bSupportsVSLinePointExpand = vs >= 1; + } + else + { + g_Config.backend_info.bSupportsFragmentStoresAndAtomics = false; + g_Config.backend_info.bSupportsVSLinePointExpand = false; + } + if (GLExtensions::Supports("GL_EXT_shader_framebuffer_fetch")) { g_ogl_config.SupportedFramebufferFetch = EsFbFetchType::FbFetchExt; |