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] Split up vector/quaternion compare by target

Browse source 
The v6 and v6p targets don't have horizontal operations, instead they
have direct vector/quaternion equality to float/int scalar result. Fixes
an ice when building game-source/quake.
This commit is contained in:
Bill Currie 2025-01-18 14:05:09 +09:00
parent a5272d2e05
commit 92727019b5
5 changed files with 67 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,8 @@ typedef struct {
const expr_t *(*proc_switch) (const expr_t *expr, rua_ctx_t *ctx);
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);
// for both vector and quaternion types
const expr_t *(*vector_compare)(int op, const expr_t *e1, const expr_t *e2);
bool (*setup_intrinsic_symtab) (symtab_t *symtab);

10
tools/qfcc/source/expr_binary.c
View file

@ -36,6 +36,7 @@
#include "tools/qfcc/include/expr.h"
#include "tools/qfcc/include/options.h"
#include "tools/qfcc/include/rua-lang.h"
#include "tools/qfcc/include/target.h"
#include "tools/qfcc/include/type.h"
typedef struct {
@ -213,13 +214,12 @@ math_compare (int op, const expr_t *e1, const expr_t *e2)
t1 = get_type (e1);
t2 = get_type (e2);
}
if (is_vector (t1) || is_quaternion (t1)) {
return current_target.vector_compare (op, e1, e2);
}
auto e = new_binary_expr (op, e1, e2);
e->expr.type = bool_type (t1);
if (is_vector (t1) || is_quaternion (t1)) {
//FIXME operators other than just == and != ?
int hop = op == QC_EQ ? '&' : '|';
e = new_horizontal_expr (hop, e, &type_int);
}
return e;
}

16
tools/qfcc/source/target_rua.c
View file

@ -355,6 +355,21 @@ ruamoko_proc_address (const expr_t *expr, rua_ctx_t *ctx)
return address_expr (e, nullptr);
}
static const expr_t *
ruamoko_vector_compare (int op, const expr_t *e1, const expr_t *e2)
{
// both e1 and e2 should have the same types here
auto type = get_type (e1);
if (op != QC_EQ && op != QC_NE) {
return error (e2, "invalid comparison for %s", type->name);
}
int hop = op == QC_EQ ? '&' : '|';
auto e = new_binary_expr (op, e1, e2);
e->expr.type = bool_type (type);
e = new_horizontal_expr (hop, e, &type_int);
return e;
}
target_t ruamoko_target = {
.value_too_large = ruamoko_value_too_large,
.build_scope = ruamoko_build_scope,
@ -365,4 +380,5 @@ target_t ruamoko_target = {
.proc_switch = ruamoko_proc_switch,
.proc_caselabel = ruamoko_proc_caselabel,
.proc_address = ruamoko_proc_address,
.vector_compare = ruamoko_vector_compare,
};

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

@ -2201,6 +2201,21 @@ spirv_assign_vector (const expr_t *dst, const expr_t *src)
return new_assign_expr (dst, new);;
}
static const expr_t *
spirv_vector_compare (int op, const expr_t *e1, const expr_t *e2)
{
// both e1 and e2 should have the same types here
auto type = get_type (e1);
if (op != QC_EQ && op != QC_NE) {
return error (e2, "invalid comparison for %s", type->name);
}
int hop = op == QC_EQ ? '&' : '|';
auto e = new_binary_expr (op, e1, e2);
e->expr.type = bool_type (type);
e = new_horizontal_expr (hop, e, &type_int);
return e;
}
target_t spirv_target = {
.value_too_large = spirv_value_too_large,
.build_scope = spirv_build_scope,
@ -2209,4 +2224,5 @@ target_t spirv_target = {
.initialized_temp = spirv_initialized_temp,
.assign_vector = spirv_assign_vector,
.setup_intrinsic_symtab = spirv_setup_intrinsic_symtab,
.vector_compare = spirv_vector_compare,
};

28
tools/qfcc/source/target_v6.c
View file

@ -193,6 +193,32 @@ v6p_assign_vector (const expr_t *dst, const expr_t *src)
return block;
}
static const expr_t *
do_vector_compare (int op, const expr_t *e1, const expr_t *e2,
const type_t *res_type)
{
// both e1 and e2 should have the same types here
auto type = get_type (e1);
if (op != QC_EQ && op != QC_NE) {
return error (e2, "invalid comparison for %s", type->name);
}
auto e = new_binary_expr (op, e1, e2);
e->expr.type = res_type;
return e;
}
static const expr_t *
v6_vector_compare (int op, const expr_t *e1, const expr_t *e2)
{
return do_vector_compare (op, e1, e2, &type_float);
}
static const expr_t *
v6p_vector_compare (int op, const expr_t *e1, const expr_t *e2)
{
return do_vector_compare (op, e1, e2, &type_int);
}
target_t v6_target = {
.value_too_large = v6_value_too_large,
.build_scope = v6p_build_scope,
@ -204,6 +230,7 @@ target_t v6_target = {
.proc_switch = ruamoko_proc_switch,
.proc_caselabel = ruamoko_proc_caselabel,
.proc_address = ruamoko_proc_address,
.vector_compare = v6_vector_compare,
};
target_t v6p_target = {
@ -217,4 +244,5 @@ target_t v6p_target = {
.proc_switch = ruamoko_proc_switch,
.proc_caselabel = ruamoko_proc_caselabel,
.proc_address = ruamoko_proc_address,
.vector_compare = v6p_vector_compare,
};