qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-11 11:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Skip void param for spir-v

Browse source 
Functions declared with `(void)` don't actually have any parameters, so
ensure no parameters are emitted for such functions.
This commit is contained in:
Bill Currie 2024-11-21 17:23:07 +09:00
parent 744c3ff1d6
commit c3bbd85857
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/qfcc/source/target_spirv.c
View file

@ -404,6 +404,12 @@ spirv_TypeFunction (symbol_t *fsym, spirvctx_t *ctx)
{
int num_params = 0;
for (auto p = fsym->params; p; p = p->next) {
if (is_void (p->type)) {
if (num_params || p->next) {
internal_error (0, "void param with other params");
}
break;
}
num_params++;
}
auto type = fsym->type;
@ -412,10 +418,13 @@ spirv_TypeFunction (symbol_t *fsym, spirvctx_t *ctx)
}
unsigned ret_type = type_id (fsym->type->func.ret_type, ctx);
unsigned param_types[num_params];
unsigned param_types[num_params + 1];
num_params = 0;
for (auto p = fsym->params; p; p = p->next) {
auto ptype = p->type;
if (is_void (p->type)) {
break;
}
if (p->qual != pq_const) {
ptype = tagged_reference_type (SpvStorageClassFunction, ptype);
}
@ -693,6 +702,9 @@ spirv_function (function_t *func, spirvctx_t *ctx)
for (auto p = func->sym->params; p; p = p->next) {
auto ptype = p->type;
if (is_void (ptype)) {
break;
}
if (p->qual != pq_const) {
ptype = tagged_reference_type (SpvStorageClassFunction, ptype);
}
@ -1640,7 +1652,8 @@ spirv_write (struct pr_info_s *pr, const char *filename)
for (auto func = pr->func_head; func; func = func->next)
{
auto func_id = spirv_function (func, &ctx);
if (strcmp ("main", func->o_name) == 0) {
if (strncmp ("main", func->o_name, 4) == 0
&& (!func->o_name[4] || func->o_name[4] == '|')) {
auto model = SpvExecutionModelVertex;//FIXME
spirv_EntryPoint (func_id, func->o_name, model, &ctx);
}