AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler/types: Use glsl_get_type_name() to access the type name

Browse Source 
This will allow us later to store builtin names in a different way.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25191>
This commit is contained in:
Caio Oliveira
2023-09-12 12:11:18 -07:00
committed by Marge Bot
parent d1e9e7699e
commit bf01000a50
21 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/glsl/link_interface_blocks.cpp
+8 -8
View File
@@ -261,7 +261,7 @@ public:
} else {
const struct hash_entry *entry =
_mesa_hash_table_search(ht,
var->get_interface_type()->without_array()->name);
glsl_get_type_name(var->get_interface_type()->without_array()));
return entry ? (ir_variable *) entry->data : NULL;
}
}
@@ -283,7 +283,7 @@ public:
_mesa_hash_table_insert(ht, ralloc_strdup(mem_ctx, location_str), var);
} else {
_mesa_hash_table_insert(ht,
var->get_interface_type()->without_array()->name, var);
glsl_get_type_name(var->get_interface_type()->without_array()), var);
}
}
@@ -359,7 +359,7 @@ validate_intrastage_interface_blocks(struct gl_shader_program *prog,
} else if (!intrastage_match(prev_def, var, prog,
true /* match_precision */)) {
linker_error(prog, "definitions of interface block `%s' do not"
" match\n", iface_type->name);
" match\n", glsl_get_type_name(iface_type));
return;
}
}
@@ -461,7 +461,7 @@ validate_interstage_inout_blocks(struct gl_shader_program *prog,
var->data.used && !producer_iface) {
linker_error(prog, "missing output builtin block %s redeclaration "
"in separable shader program",
var->get_interface_type()->name);
glsl_get_type_name(var->get_interface_type()));
return;
}
@@ -482,7 +482,7 @@ validate_interstage_inout_blocks(struct gl_shader_program *prog,
var->data.used && !producer_iface) {
linker_error(prog, "missing input builtin block %s redeclaration "
"in separable shader program",
var->get_interface_type()->name);
glsl_get_type_name(var->get_interface_type()));
return;
}
@@ -501,14 +501,14 @@ validate_interstage_inout_blocks(struct gl_shader_program *prog,
if (producer_def == NULL &&
!is_builtin_gl_in_block(var, consumer->Stage) && var->data.used) {
linker_error(prog, "Input block `%s' is not an output of "
"the previous stage\n", var->get_interface_type()->name);
"the previous stage\n", glsl_get_type_name(var->get_interface_type()));
return;
}
if (producer_def &&
!interstage_match(prog, producer_def, var, extra_array_level)) {
linker_error(prog, "definitions of interface block `%s' do not "
"match\n", var->get_interface_type()->name);
"match\n", glsl_get_type_name(var->get_interface_type()));
return;
}
}
@@ -543,7 +543,7 @@ validate_interstage_uniform_blocks(struct gl_shader_program *prog,
*/
if (!intrastage_match(old_def, var, prog, false /* precision */)) {
linker_error(prog, "definitions of uniform block `%s' do not "
"match\n", var->get_interface_type()->name);
"match\n", glsl_get_type_name(var->get_interface_type()));
return;
}
}