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

[qfcc] Hook spir-v operand kinds into intrinsic scopes

Browse source 
The operand kinds form namespaces for their enumerants (only BitEnum and
ValueEnum operand kinds are supported for this). Now `Lod` and `Bias`
use `ImageOperands.Lod` and `ImageOperands.Bias`, which is probably a
big improvement in the long run.

Finally, all of QF's shaders *compile*, though the spir-v is generally
incorrect (capabilities etc), and the code gen may still be full of
bugs.
This commit is contained in:
Bill Currie 2025-01-18 13:15:05 +09:00
parent a4acfc30d7
commit a5272d2e05
6 changed files with 99 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/qfcc/include/spirv_grammar.h
View file

@ -30,6 +30,8 @@
#ifndef __spirv_grammar_h
#define __spirv_grammar_h
typedef struct symtab_s symtab_t;
typedef struct spirv_operand_s {
const char *kind;
char quantifier; // ?
@ -58,6 +60,8 @@ typedef struct spirv_kind_s {
spirv_enumerant_t *enumerants;
const char **bases;
};
symtab_t *symtab;
} spirv_kind_t;
typedef struct spirv_instruction_s {
@ -95,4 +99,6 @@ const plitem_t *spirv_operand_kind (const char *set, const char *kind);
uint32_t spirv_instruction_opcode (const char *set, const expr_t *opcode);
bool spirv_setup_intrinsic_symtab (symtab_t *symtab);
#endif//__spirv_grammar_h

2
tools/qfcc/include/target.h
View file

@ -50,6 +50,8 @@ typedef struct {
const expr_t *(*proc_caselabel) (const expr_t *expr, rua_ctx_t *ctx);
const expr_t *(*proc_address) (const expr_t *expr, rua_ctx_t *ctx);
bool (*setup_intrinsic_symtab) (symtab_t *symtab);
unsigned label_id;
} target_t;

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

@ -256,6 +256,11 @@ build_intrinsic_call (const expr_t *expr, symbol_t *fsym, const type_t *ftype,
}
build_call_scope (fsym, arguments);
if (current_target.setup_intrinsic_symtab) {
auto metafunc = fsym->metafunc;
auto func = metafunc->func;
current_target.setup_intrinsic_symtab (func->locals);
}
auto extra = &expr->intrinsic.extra->list;
int extra_count = list_count (extra);

25
tools/qfcc/source/glsl-builtins.c
View file

@ -848,14 +848,18 @@ SRC_LINE
" __sampler(,2D,,Array,Shadow)]," "\n"
" gsamplerCAS=[__sampler(,Cube,,Array,Shadow)]) {" "\n"
"gvec4 texture(gsampler sampler, gtex_coord P)" "\n"
"= " SPV(OpImageSampleExplicitLod) "[sampler, P, Lod, 0];" "\n"
"= " SPV(OpImageSampleExplicitLod) "\n"
"[sampler, P, ImageOperands.Lod, 0];" "\n"
"float texture(gsamplerSh sampler, gshadow_coord P)" "\n"
"= " SPV(OpImageSampleDrefExplicitLod) "\n"
"[sampler, [gsamplerSh shadow_coord(P)], [gsamplerSh comp(P)], Lod, 0];" "\n"
"[sampler, [gsamplerSh shadow_coord(P)], [gsamplerSh comp(P)]," "\n"
" ImageOperands.Lod, 0];" "\n"
"float texture(gsamplerCAS sampler, vec4 P, float comp)" "\n"
"= " SPV(OpImageSampleDrefExplicitLod) "[sampler, P, comp, Lod, 0];" "\n"
"= " SPV(OpImageSampleDrefExplicitLod) "[sampler, P, comp," "\n"
" ImageOperands.Lod, 0];" "\n"
"gvec4 textureProj(gsampler sampler, gproj_coord P)" "\n"
"= " SPV(OpImageSampleProjExplicitLod) "[sampler, P, Lod, 0];" "\n"
"= " SPV(OpImageSampleProjExplicitLod) "\n"
"[sampler, P, ImageOperands.Lod, 0];" "\n"
"};" "\n"
"#undef __sampler" "\n"
"#undef _sampler" "\n"
@ -885,19 +889,22 @@ SRC_LINE
" __sampler(,2D,,Array,Shadow)]," "\n"
" gsamplerCAS=[__sampler(,Cube,,Array,Shadow)]) {" "\n"
"gvec4 texture(gsampler sampler, gtex_coord P, float bias)" "\n"
"= " SPV(OpImageSampleImplicitLod) "[sampler, P, Bias, bias];" "\n"
"= " SPV(OpImageSampleImplicitLod) "\n"
"[sampler, P, ImageOperands.Bias, bias];" "\n"
"gvec4 texture(gsampler sampler, gtex_coord P)" "\n"
"= " SPV(OpImageSampleImplicitLod) "[sampler, P];" "\n"
"float texture(gsamplerSh sampler, gshadow_coord P, float bias)" "\n"
"= " SPV(OpImageSampleDrefImplicitLod) "\n"
"[sampler, [gsamplerSh shadow_coord(P)], [gsamplerSh comp(P)], Bias, bias];" "\n"
"[sampler, [gsamplerSh shadow_coord(P)], [gsamplerSh comp(P)]," "\n"
" ImageOperands.Bias, bias];" "\n"
"float texture(gsamplerSh sampler, gshadow_coord P)" "\n"
"= " SPV(OpImageSampleDrefImplicitLod) "\n"
"[sampler, [gsamplerSh shadow_coord(P)], [gsamplerSh comp(P)]];" "\n"
"float texture(gsamplerCAS sampler, vec4 P, float comp)" "\n"
"= " SPV(OpImageSampleDrefImplicitLod) "[sampler, P, comp];" "\n"
"gvec4 textureProj(gsampler sampler, gproj_coord P, float bias)" "\n"
"= " SPV(OpImageSampleProjImplicitLod) "[sampler, P, Bias, bias];" "\n"
"= " SPV(OpImageSampleProjImplicitLod) "\n"
"[sampler, P, ImageOperands.Bias, bias];" "\n"
"gvec4 textureProj(gsampler sampler, gproj_coord P)" "\n"
"= " SPV(OpImageSampleProjImplicitLod) "[sampler, P];" "\n"
"};" "\n"
@ -926,7 +933,7 @@ SRC_LINE
" gsamplerMS=[_sampler(2D,MS,,)," "\n"
" _sampler(2D,MS,Array,)]) {" "\n"
"gvec4 texelFetch(gsampler sampler, gtex_coord P, int lod)" "\n"
"= " SPV(OpImageFetch) "[sampler, P, Lod, lod];" "\n"
"= " SPV(OpImageFetch) "[sampler, P, ImageOperands.Lod, lod];" "\n"
"gvec4B texelFetch(gsamplerB sampler, int P)" "\n"
"= " SPV(OpImageFetch) "[sampler, P];" "\n"
"gvec4MS texelFetch(gsamplerMS sampler, ivec2 P, int sample)" "\n"
@ -957,7 +964,7 @@ SRC_LINE
" gtextureMS=[_texture(2D,MS,,)," "\n"
" _texture(2D,MS,Array,)]) {" "\n"
"gvec4 texelFetch(gtexture texture, gtex_coord P, int lod)" "\n"
"= " SPV(OpImageFetch) "[texture, P, Lod, lod];" "\n"
"= " SPV(OpImageFetch) "[texture, P, ImageOperands.Lod, lod];" "\n"
"gvec4B texelFetch(gtextureB texture, int P)" "\n"
"= " SPV(OpImageFetch) "[texture, P];" "\n"
"gvec4MS texelFetch(gtextureMS texture, ivec2 P, int sample)" "\n"

66
tools/qfcc/source/spirv_grammar.c
View file

@ -472,3 +472,69 @@ spirv_instruction_opcode (const char *set, const expr_t *opcode)
}
return instruction->opcode;
}
static symbol_t *
spirv_kind_symbol (const char *name, symtab_t *symtab)
{
symbol_t *sym = nullptr;
spirv_kind_t *kind = symtab->procsymbol_data;
spirv_enumerant_t *enumerant = nullptr;
enumerant = bsearch (&(spirv_enumerant_t) { .enumerant = name },
kind->enumerants, kind->num,
sizeof (spirv_enumerant_t), spirv_enumerant_cmp);
if (enumerant) {
sym = new_symbol_type (name, &type_uint);
sym->sy_type = sy_const;
sym->value = new_uint_val (enumerant->value);
}
return sym;
}
static symbol_t *
spirv_intrinsic_symbol (const char *name, symtab_t *symtab)
{
symbol_t *sym = nullptr;
spirv_grammar_t *grammar = symtab->procsymbol_data;
spirv_kind_t *kind = nullptr;
kind = bsearch (&(spirv_kind_t) { .kind = name },
grammar->operand_kinds, grammar->num_operand_kinds,
sizeof (spirv_kind_t), spirv_kind_cmp);
if (kind && strcmp (kind->category, "Composite") != 0
&& strcmp (kind->category, "Literal") != 1) {
if (!kind->symtab) {
kind->symtab = new_symtab (nullptr, stab_enum);
kind->symtab->procsymbol = spirv_kind_symbol;
kind->symtab->procsymbol_data = kind;
}
sym = new_symbol (name);
sym->sy_type = sy_namespace;
sym->namespace = kind->symtab;
}
return sym;
}
bool
spirv_setup_intrinsic_symtab (symtab_t *symtab)
{
if (!built) {
build_grammars ();
built = true;
}
const char *set = "core";
spirv_grammar_t *grammar = nullptr;
for (int i = 0; builtin_json[i].name; i++) {
if (strcmp (builtin_json[i].name, set) == 0) {
grammar = builtin_json[i].grammar;
break;
}
}
if (!grammar) {
error (0, "unrecognized grammar set %s", set);
return false;
}
symtab->procsymbol = spirv_intrinsic_symbol;
symtab->procsymbol_data = grammar;
return true;
}

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

@ -1217,6 +1217,9 @@ spirv_symbol (const expr_t *e, spirvctx_t *ctx)
sym->id = spirv_function_ref (func, ctx);
} else if (sym->sy_type == sy_var) {
sym->id = spirv_variable (sym, ctx);
} else if (sym->sy_type == sy_const) {
auto e = new_value_expr (sym->value, false);
sym->id = spirv_value (e, ctx);
} else {
internal_error (e, "unexpected symbol type: %s for %s",
symtype_str (sym->sy_type), sym->name);
@ -2205,4 +2208,5 @@ target_t spirv_target = {
.declare_sym = spirv_declare_sym,
.initialized_temp = spirv_initialized_temp,
.assign_vector = spirv_assign_vector,
.setup_intrinsic_symtab = spirv_setup_intrinsic_symtab,
};