Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpu: Add shader name to error message

Browse Source 
When a shader cant be compiled, we produce a long error dump, but
nowhere did we mention the actual shader.

Fix that.
This commit is contained in:
Benjamin Otte
2024-07-25 18:42:30 +02:00
parent 103296d948
commit de1dfb99bc
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gsk/gpu/gskgldevice.c
View File

@@ -302,8 +302,9 @@ prepend_line_numbers (char *code)
}
static gboolean
gsk_gl_device_check_shader_error (int shader_id,
GError **error)
gsk_gl_device_check_shader_error (const char *name,
int shader_id,
GError **error)
{
GLint status;
GLint log_len;
@@ -329,13 +330,14 @@ gsk_gl_device_check_shader_error (int shader_id,
g_set_error (error,
GDK_GL_ERROR,
GDK_GL_ERROR_COMPILATION_FAILED,
"Compilation failure in shader.\n"
"Compilation failure in shader %s.\n"
"Source Code:\n"
"%s\n"
"\n"
"Error Message:\n"
"%s\n"
"\n",
name,
code,
log);
@@ -454,7 +456,7 @@ gsk_gl_device_load_shader (GskGLDevice *self,
print_shader_info (shader_type == GL_FRAGMENT_SHADER ? "fragment" : "vertex", shader_id, program_name);
if (!gsk_gl_device_check_shader_error (shader_id, error))
if (!gsk_gl_device_check_shader_error (program_name, shader_id, error))
{
glDeleteShader (shader_id);
return 0;