Merge branch 'blender-v3.1-release'

source/blender/gpu/GPU_debug.h

@@ -31,6 +31,8 @@
 extern "C" {
 #endif
 
+#define GPU_DEBUG_SHADER_COMPILATION_GROUP "Shader Compilation"
+
 void GPU_debug_group_begin(const char *name);
 void GPU_debug_group_end(void);
 /**

source/blender/gpu/intern/gpu_shader.cc

@@ -26,6 +26,7 @@
 #include "BLI_string_utils.h"
 
 #include "GPU_capabilities.h"
+#include "GPU_debug.h"
 #include "GPU_matrix.h"
 #include "GPU_platform.h"
 
@@ -273,6 +274,8 @@ GPUShader *GPU_shader_create_from_info(const GPUShaderCreateInfo *_info)
 
   const_cast<ShaderCreateInfo &>(info).finalize();
 
+  GPU_debug_group_begin(GPU_DEBUG_SHADER_COMPILATION_GROUP);
+
   /* At least a vertex shader and a fragment shader are required, or only a compute shader. */
   if (info.compute_source_.is_empty()) {
     if (info.vertex_source_.is_empty()) {
@@ -393,9 +396,11 @@ GPUShader *GPU_shader_create_from_info(const GPUShaderCreateInfo *_info)
 
   if (!shader->finalize(&info)) {
     delete shader;
+    GPU_debug_group_end();
     return nullptr;
   }
 
+  GPU_debug_group_end();
   return wrap(shader);
 }
 

source/blender/gpu/opengl/gl_debug.cc

@@ -108,6 +108,11 @@ static void APIENTRY debug_callback(GLenum UNUSED(source),
     GPU_debug_get_groups_names(sizeof(debug_groups), debug_groups);
     CLG_Severity clog_severity;
 
+    if (GPU_debug_group_match(GPU_DEBUG_SHADER_COMPILATION_GROUP)) {
+      /** Do not duplicate shader compilation error/warnings. */
+      return;
+    }
+
     switch (type) {
       case GL_DEBUG_TYPE_ERROR:
       case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR: