zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 15:22:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added a check to allow shader storage buffers on GL 4.3 Intel drivers. It doesn't work if GLSL version is set to 4.0 and the feature activated via extension.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-11 20:14:18 +01:00
parent 9eae422dab
commit 9e70771da3
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gl/shaders/gl_shader.cpp
View file

@ -97,7 +97,11 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
} }
else else
{ {
// This differentiation is for Intel which do not seem to expose the full extension, even if marked as required.
if (gl.glslversion < 4.3f)
vp_comb = "#version 400 core\n#extension GL_ARB_shader_storage_buffer_object : require\n#define SHADER_STORAGE_LIGHTS\n"; vp_comb = "#version 400 core\n#extension GL_ARB_shader_storage_buffer_object : require\n#define SHADER_STORAGE_LIGHTS\n";
else
vp_comb = "#version 430 core\n#define SHADER_STORAGE_LIGHTS\n";
} }
if (gl.buffermethod == BM_DEFERRED) if (gl.buffermethod == BM_DEFERRED)

4
src/gl/system/gl_interface.cpp
View file

@ -233,8 +233,8 @@ void gl_LoadExtensions()
// Recent drivers, GL 4.4 don't have this problem, these can easily be recognized by also supporting the GL_ARB_buffer_storage extension. // Recent drivers, GL 4.4 don't have this problem, these can easily be recognized by also supporting the GL_ARB_buffer_storage extension.
if (CheckExtension("GL_ARB_shader_storage_buffer_object")) if (CheckExtension("GL_ARB_shader_storage_buffer_object"))
{ {
// Shader storage buffer objects are broken on current Intel drivers. // Intel's GLSL compiler is a bit broken with extensions, so unlock the feature only if not on Intel or having GL 4.3.
if (strstr(gl.vendorstring, "Intel") == NULL) if (strstr(gl.vendorstring, "Intel") == NULL || gl_version >= 4.3f)
{ {
gl.flags |= RFL_SHADER_STORAGE_BUFFER; gl.flags |= RFL_SHADER_STORAGE_BUFFER;
} }