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

[qfcc] Fix a few segfaults compiling glsl

Browse source
This commit is contained in:
Bill Currie 2025-01-15 18:21:00 +09:00
parent 376f8f2c09
commit 351136a636
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/qfcc/source/expr_call.c
View file

@ -430,6 +430,7 @@ build_function_call (const expr_t *fexpr, const type_t *ftype,
"inlined not implemented"); "inlined not implemented");
} else { } else {
auto call = new_block_expr (nullptr); auto call = new_block_expr (nullptr);
call->block.scope = current_symtab;
call->block.is_call = 1; call->block.is_call = 1;
int num_args = 0; int num_args = 0;
const expr_t *arg_exprs[arg_count + 1][2]; const expr_t *arg_exprs[arg_count + 1][2];

8
tools/qfcc/source/function.c
View file

@ -756,8 +756,8 @@ create_generic_sym (genfunc_t *g, const expr_t *fexpr, calltype_t *calltype,
rua_ctx_t *ctx) rua_ctx_t *ctx)
{ {
int num_params = calltype->num_params; int num_params = calltype->num_params;
const type_t *param_types[num_params]; const type_t *param_types[num_params] = {};
param_qual_t param_quals[num_params]; param_qual_t param_quals[num_params] = {};
const type_t *return_type; const type_t *return_type;
for (int i = 0; i < num_params; i++) { for (int i = 0; i < num_params; i++) {
auto p = &g->params[i]; auto p = &g->params[i];
@ -1065,6 +1065,7 @@ find_function (const expr_t *fexpr, const expr_t *params, rua_ctx_t *ctx)
// time // time
sym->metafunc->func = new_function (sym->name, gen->name); sym->metafunc->func = new_function (sym->name, gen->name);
sym->metafunc->func->type = sym->type; sym->metafunc->func->type = sym->type;
sym->metafunc->func->sym = sym;
build_generic_scope (sym, current_symtab, gen, ref_types); build_generic_scope (sym, current_symtab, gen, ref_types);
} }
return new_symbol_expr (sym); return new_symbol_expr (sym);
@ -1323,6 +1324,8 @@ build_code_function (specifier_t spec, const expr_t *state_expr,
genfunc->can_inline = can_inline (statements, fsym); genfunc->can_inline = can_inline (statements, fsym);
return; return;
} }
function_t *func = fsym->metafunc->func;
current_func = func;
if (ctx) { if (ctx) {
statements = (expr_t *) expr_process (statements, ctx); statements = (expr_t *) expr_process (statements, ctx);
} }
@ -1333,7 +1336,6 @@ build_code_function (specifier_t spec, const expr_t *state_expr,
if (state_expr) { if (state_expr) {
prepend_expr (statements, state_expr); prepend_expr (statements, state_expr);
} }
function_t *func = fsym->metafunc->func;
current_target.build_code (func, statements); current_target.build_code (func, statements);
} }

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

@ -1210,6 +1210,10 @@ spirv_symbol (const expr_t *e, spirvctx_t *ctx)
} }
} else if (sym->sy_type == sy_func) { } else if (sym->sy_type == sy_func) {
auto func = sym->metafunc->func; auto func = sym->metafunc->func;
if (!func) {
error (e, "%s called but not defined", sym->name);
return 0;
}
sym->id = spirv_function_ref (func, ctx); sym->id = spirv_function_ref (func, ctx);
} else if (sym->sy_type == sy_var) { } else if (sym->sy_type == sy_var) {
sym->id = spirv_variable (sym, ctx); sym->id = spirv_variable (sym, ctx);