archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

GL: Fix gl error during debug name setup for shader storage buffers

Browse Source
This commit is contained in:
Clément Foucault
2022-05-18 21:44:30 +02:00
parent 4fa743af85
commit ca780f4406
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/gpu/opengl/gl_debug.cc
View File

@@ -331,11 +331,21 @@ void object_label(GLenum type, GLuint object, const char *name)
char label[64];
SNPRINTF(label, "%s%s%s", to_str_prefix(type), name, to_str_suffix(type));
/* Small convenience for caller. */
if (ELEM(type, GL_FRAGMENT_SHADER, GL_GEOMETRY_SHADER, GL_VERTEX_SHADER, GL_COMPUTE_SHADER)) {
type = GL_SHADER;
}
if (ELEM(type, GL_UNIFORM_BUFFER)) {
type = GL_BUFFER;
switch (type) {
case GL_FRAGMENT_SHADER:
case GL_GEOMETRY_SHADER:
case GL_VERTEX_SHADER:
case GL_COMPUTE_SHADER:
type = GL_SHADER;
break;
case GL_UNIFORM_BUFFER:
case GL_SHADER_STORAGE_BUFFER:
case GL_ARRAY_BUFFER:
case GL_ELEMENT_ARRAY_BUFFER:
type = GL_BUFFER;
break;
default:
break;
}
glObjectLabel(type, object, -1, label);
}