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] Support vector value expressions for spir-v

Browse source 
It seems constant initializers are different from constants in an
expression.
This commit is contained in:
Bill Currie 2024-11-15 17:52:01 +09:00
parent 27afd608f1
commit 22794caf11
3 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -217,7 +217,7 @@ typedef struct ex_value_s {
unsigned id; unsigned id;
bool is_constexpr; bool is_constexpr;
union { union {
uint8_t raw_value; ///< for memcpy pr_type_t raw_value; ///< for memcpy
const char *string_val; ///< string constant const char *string_val; ///< string constant
double double_val; ///< double constant double double_val; ///< double constant
int64_t long_val; ///< signed 64-bit constant int64_t long_val; ///< signed 64-bit constant

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

@ -77,6 +77,10 @@ math_constructor (const type_t *type, const expr_t *params, const expr_t *e)
if (!ptype) { if (!ptype) {
continue; continue;
} }
if (is_reference (ptype)) {
pexpr = pointer_deref (pexpr);
ptype = dereference_type (ptype);
}
if (!is_math (ptype)) { if (!is_math (ptype)) {
components[c++] = error (pexpr, "invalid type for conversion"); components[c++] = error (pexpr, "invalid type for conversion");
continue; continue;

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

@ -47,6 +47,7 @@
#include "tools/qfcc/include/symtab.h" #include "tools/qfcc/include/symtab.h"
#include "tools/qfcc/include/target.h" #include "tools/qfcc/include/target.h"
#include "tools/qfcc/include/type.h" #include "tools/qfcc/include/type.h"
#include "tools/qfcc/include/value.h"
#define INSN(i,o) D_var_o(int,(i),o) #define INSN(i,o) D_var_o(int,(i),o)
#define ADD_DATA(d,s) defspace_add_data((d), (s)->data, (s)->size) #define ADD_DATA(d,s) defspace_add_data((d), (s)->data, (s)->size)
@ -946,11 +947,51 @@ spirv_temp (const expr_t *e, spirvctx_t *ctx)
return 0;//FIXME don't want return 0;//FIXME don't want
} }
static unsigned spirv_value (const expr_t *e, spirvctx_t *ctx);
static unsigned
spirv_vector_value (const ex_value_t *value, spirvctx_t *ctx)
{
auto base = base_type (value->type);
int width = type_width (value->type);
ex_value_t *comp_vals[width];
if (type_size (base) == 1) {
for (int i = 0; i < width; i++) {
comp_vals[i] = new_type_value (base, &value->raw_value + i);
}
} else if (type_size (base) == 2) {
for (int i = 0; i < width; i++) {
comp_vals[i] = new_type_value (base, &value->raw_value + i * 2);
}
} else {
internal_error (nullptr, "invalid vector component size");
}
unsigned comp_ids[width];
for (int i = 0; i < width; i++) {
auto e = new_value_expr (comp_vals[i], false);
comp_ids[i] = spirv_value (e, ctx);
}
auto space = ctx->module->globals;
int tid = type_id (value->type, ctx);
int id = spirv_id (ctx);
auto insn = spirv_new_insn (SpvOpConstantComposite, 3 + width, space);
INSN (insn, 1) = tid;
INSN (insn, 2) = id;
for (int i = 0; i < width; i++) {
INSN (insn, 3 + i) = comp_ids[i];
}
return id;
}
static unsigned static unsigned
spirv_value (const expr_t *e, spirvctx_t *ctx) spirv_value (const expr_t *e, spirvctx_t *ctx)
{ {
auto value = e->value; auto value = e->value;
if (!value->id) { if (!value->id) {
if (is_nonscalar (value->type) && type_cols (value->type) == 1) {
return spirv_vector_value (value, ctx);
}
unsigned tid = type_id (value->type, ctx); unsigned tid = type_id (value->type, ctx);
unsigned op = SpvOpConstant; unsigned op = SpvOpConstant;
int val_size = 1; int val_size = 1;