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

[qfcc] Emit bool types

Browse source 
Because spir-v's bools are abstract and have no specific size, bool and
lbool need to both have the same spir-v id, as do the vector
counterparts, so when one gets emitted, the id is copied to the mirror
type.
This commit is contained in:
Bill Currie 2024-11-15 13:09:26 +09:00
parent ebb3ec592a
commit 27afd608f1
2 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -304,6 +304,34 @@ spirv_TypeStruct (const type_t *type, spirvctx_t *ctx)
return id;
}
static void
spirv_mirror_bool (const type_t *type, unsigned id, spirvctx_t *ctx)
{
// This is rather hacky as spir-v supports only an abstract bool type,
// thus bool and lbool need to get the same type id
auto base = base_type (type);
int width = type_width (type);
// invert the size
if (is_bool (base)) {
base = &type_lbool;
} else {
base = &type_bool;
}
type = vector_type (base, width);
spirv_add_type_id (type, id, ctx);
}
static unsigned
spirv_TypeBool (const type_t *type, spirvctx_t *ctx)
{
auto globals = ctx->module->globals;
int id = spirv_id (ctx);
auto insn = spirv_new_insn (SpvOpTypeBool, 2, globals);
INSN (insn, 1) = id;
spirv_mirror_bool (type, id, ctx);
return id;
}
static unsigned
spirv_TypeFunction (symbol_t *fsym, spirvctx_t *ctx)
{
@ -367,6 +395,9 @@ type_id (const type_t *type, spirvctx_t *ctx)
auto btype = base_type (type);
unsigned bid = type_id (btype, ctx);
id = spirv_TypeVector (bid, type_width (type), ctx);
if (is_boolean (type)) {
spirv_mirror_bool (type, id, ctx);
}
} else if (is_int (type)) {
id = spirv_TypeInt (32, true, ctx);
} else if (is_uint (type)) {
@ -383,6 +414,8 @@ type_id (const type_t *type, spirvctx_t *ctx)
id = spirv_TypePointer (type, ctx);
} else if (is_struct (type)) {
id = spirv_TypeStruct (type, ctx);
} else if (is_boolean (type)) {
id = spirv_TypeBool (type, ctx);
}
if (!id) {
dstring_t *str = dstring_newstr ();

6
tools/qfcc/source/type.c
View file

@ -801,6 +801,12 @@ base_type (const type_t *vec_type)
if (!is_math (vec_type)) {
return nullptr;
}
if (is_bool (vec_type)) {
return &type_bool;
}
if (is_lbool (vec_type)) {
return &type_lbool;
}
// vec_type->type for quaternion and vector points back to itself
if (is_quaternion (vec_type) || is_vector (vec_type)) {
return &type_float;