fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vtn: use named parameters in bindgen

Browse source 
If the input spir-v isn't stripped, preserving the names makes the generated
header more readable. This makes semantic autocomplete (IDEs) work properly with
vtn_bindgen prototypes.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32208>
This commit is contained in:
Alyssa Rosenzweig 2024-11-17 14:18:09 -04:00 • committed by Marge Bot
parent f25b7103fe
commit 733ec7c675
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/compiler/spirv/spirv_to_nir.c
View file

@ -7168,6 +7168,16 @@ spirv_to_nir(const uint32_t *words, size_t word_count,
return shader;
}
static void
print_func_param(FILE *fp, nir_function *func, unsigned p)
{
if (func->params[p].name) {
fputs(func->params[p].name, fp);
} else {
fprintf(fp, "arg%u\n", p);
}
}
static bool
func_to_nir_builder(FILE *fp, struct vtn_function *func)
{
@ -7190,9 +7200,9 @@ func_to_nir_builder(FILE *fp, struct vtn_function *func)
fprintf(fp, "static inline %s\n", returns ? "nir_def *": "void");
fprintf(fp, "%s(nir_builder *b", nir_func->name);
/* TODO: Can we recover parameter names? */
for (unsigned i = first_param; i < nir_func->num_params; ++i) {
fprintf(fp, ", nir_def *arg%u", i);
fprintf(fp, ", nir_def *");
print_func_param(fp, nir_func, i);
}
fprintf(fp, ")\n{\n");
@ -7202,12 +7212,18 @@ func_to_nir_builder(FILE *fp, struct vtn_function *func)
*/
for (unsigned i = first_param; i < nir_func->num_params; ++i) {
nir_parameter *param = &nir_func->params[i];
fprintf(fp, " assert(arg%u->bit_size == %u);\n", i, param->bit_size);
fprintf(fp, " assert(arg%u->num_components == %u);\n", i,
param->num_components);
fprintf(fp, "\n");
fprintf(fp, " assert(");
print_func_param(fp, nir_func, i);
fprintf(fp, "->bit_size == %u);\n", param->bit_size);
fprintf(fp, " assert(");
print_func_param(fp, nir_func, i);
fprintf(fp, "->num_components == %u);\n", param->num_components);
}
fprintf(fp, "\n");
/* Find the function to call. If not found, create a prototype */
fprintf(fp, " nir_function *func = nir_shader_get_function_for_name(b->shader, \"%s\");\n",
nir_func->name);
@ -7259,8 +7275,10 @@ func_to_nir_builder(FILE *fp, struct vtn_function *func)
if (returns)
fprintf(fp, ", &deref->def");
for (unsigned i = first_param; i < nir_func->num_params; ++i)
fprintf(fp, ", arg%u", i);
for (unsigned i = first_param; i < nir_func->num_params; ++i) {
fprintf(fp, ", ");
print_func_param(fp, nir_func, i);
}
fprintf(fp, ");\n");