[Bf-blender-cvs] [fcb3aeec240] temp-T98708-gpu-conservative-depth: Fix T98708: Crash on startup - OpenGL4.2 without conservative depth.

Jeroen Bakker noreply at git.blender.org
Wed Jun 15 09:09:47 CEST 2022


Commit: fcb3aeec240dd16abb1e14fded4de35984538d4b
Author: Jeroen Bakker
Date:   Wed Jun 15 09:09:43 2022 +0200
Branches: temp-T98708-gpu-conservative-depth
https://developer.blender.org/rBfcb3aeec240dd16abb1e14fded4de35984538d4b

Fix T98708: Crash on startup - OpenGL4.2 without 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.

===================================================================

M	source/blender/gpu/opengl/gl_shader.cc

===================================================================

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()) {



More information about the Bf-blender-cvs mailing list