diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2022-06-15 10:09:43 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2022-06-15 10:09:43 +0300 |
| commit | fcb3aeec240dd16abb1e14fded4de35984538d4b (patch) | |
| tree | 7a4df0b50e4bf39ac1ca33784a9097f2f3e9d0e3 | |
| parent | 4acbb84efaf874717e5d29ad456880ce70ab929c (diff) | |
Fix T98708: Crash on startup - OpenGL4.2 without conservative depth.temp-T98708-gpu-conservative-depth
Intel iGPU (HD4000) supports OpenGL 4.4 but doesn't support conservative
depth. (GL_ARB_conservative_depth). This change will only check for the
availability of the extension.
| -rw-r--r-- | source/blender/gpu/opengl/gl_shader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc index 5a28b8b7318..83b00da0446 100644 --- a/source/blender/gpu/opengl/gl_shader.cc +++ b/source/blender/gpu/opengl/gl_shader.cc @@ -613,7 +613,7 @@ std::string GLShader::fragment_interface_declare(const ShaderCreateInfo &info) c if (info.early_fragment_test_) { ss << "layout(early_fragment_tests) in;\n"; } - if (GLEW_VERSION_4_2 || GLEW_ARB_conservative_depth) { + if (GLEW_ARB_conservative_depth) { ss << "layout(" << to_string(info.depth_write_) << ") out float gl_FragDepth;\n"; } ss << "\n/* Outputs. */\n"; @@ -836,7 +836,7 @@ static char *glsl_patch_default_get() STR_CONCAT(patch, slen, "#extension GL_ARB_texture_cube_map_array : enable\n"); STR_CONCAT(patch, slen, "#define GPU_ARB_texture_cube_map_array\n"); } - if (!GLEW_VERSION_4_2 && GLEW_ARB_conservative_depth) { + if (GLEW_ARB_conservative_depth) { STR_CONCAT(patch, slen, "#extension GL_ARB_conservative_depth : enable\n"); } if (GPU_shader_image_load_store_support()) { |