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] Handle dynamic array indices for spir-v

Browse source 
Now bsp_turb.frag (with hacks for builtin functions) compiles and even
passes validation, but is badly broken.
This commit is contained in:
Bill Currie 2024-11-21 17:27:19 +09:00
parent fbcdf227c5
commit 11f8992710
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1216,7 +1216,6 @@ spirv_access_chain (const expr_t *e, spirvctx_t *ctx,
list_prepend (&list, e); list_prepend (&list, e);
} }
} }
int num_obj = list_count (&list);
// e is now the base object of the field/array expression chain // e is now the base object of the field/array expression chain
auto base_type = get_type (e); auto base_type = get_type (e);
unsigned base_id = spirv_emit_expr (e, ctx); unsigned base_id = spirv_emit_expr (e, ctx);
@ -1231,15 +1230,13 @@ spirv_access_chain (const expr_t *e, spirvctx_t *ctx,
literal_ind = false; literal_ind = false;
} }
int acc_type_id = type_id (*acc_type, ctx); int num_obj = list_count (&list);
int id = spirv_id (ctx); const expr_t *ind_expr[num_obj];
auto insn = spirv_new_insn (op, 4 + num_obj, ctx->code_space); unsigned ind_id[num_obj];
INSN (insn, 1) = acc_type_id; list_scatter (&list, ind_expr);
INSN (insn, 2) = id; for (int i = 0; i < num_obj; i++) {
INSN (insn, 3) = base_id; auto obj = ind_expr[i];
auto field_ind = &INSN (insn, 4); bool direct_ind = false;
for (auto l = list.head; l; l = l->next) {
auto obj = l->expr;
unsigned index; unsigned index;
if (obj->type == ex_field) { if (obj->type == ex_field) {
if (obj->field.member->type != ex_symbol) { if (obj->field.member->type != ex_symbol) {
@ -1248,17 +1245,37 @@ spirv_access_chain (const expr_t *e, spirvctx_t *ctx,
auto sym = obj->field.member->symbol; auto sym = obj->field.member->symbol;
index = sym->id; index = sym->id;
} else if (obj->type == ex_array) { } else if (obj->type == ex_array) {
index = expr_integral (obj->array.index); auto ind = obj->array.index;
if (is_integral_val (ind)) {
index = expr_integral (ind);
} else {
if (is_reference (get_type (ind))) {
ind = pointer_deref (ind);
}
index = spirv_emit_expr (ind, ctx);
direct_ind = true;
}
} else { } else {
internal_error (obj, "what the what?!?"); internal_error (obj, "what the what?!?");
} }
if (literal_ind) { if (literal_ind || direct_ind) {
*field_ind++ = index; ind_id[i] = index;
} else { } else {
auto ind = new_uint_expr (index); auto ind = new_uint_expr (index);
*field_ind++ = spirv_emit_expr (ind, ctx); ind_id[i] = spirv_emit_expr (ind, ctx);
} }
} }
int acc_type_id = type_id (*acc_type, ctx);
int id = spirv_id (ctx);
auto insn = spirv_new_insn (op, 4 + num_obj, ctx->code_space);
INSN (insn, 1) = acc_type_id;
INSN (insn, 2) = id;
INSN (insn, 3) = base_id;
auto field_ind = &INSN (insn, 4);
for (int i = 0; i < num_obj; i++) {
field_ind[i] = ind_id[i];
}
return id; return id;
} }