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

[qfcc] Allow assignment to superset multi-vectors

Browse source 
If the destination multi-vector fully contains the source multi-vector,
then the assignment is ok (any missing values are zeroed).
This commit is contained in:
Bill Currie 2023-08-30 14:56:12 +09:00
parent 52eaa2fee7
commit 4c808fd254
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tools/qfcc/source/algebra.c
View file

@ -742,7 +742,11 @@ algebra_type_assignable (const type_t *dst, const type_t *src)
// had to be different) // had to be different)
return 0; return 0;
} }
if (dst->meta == ty_algebra && dst->type == ev_invalid) { if (!is_algebra (dst)) {
// no implicit casts from multi-vectors to scalars
return 0;
}
if (dst->type == ev_invalid) {
if (is_scalar (src)) { if (is_scalar (src)) {
// scalars can always be assigned to a full algebra type (sets // scalars can always be assigned to a full algebra type (sets
// the scalar element and zeros the other elements) // the scalar element and zeros the other elements)
@ -757,10 +761,27 @@ algebra_type_assignable (const type_t *dst, const type_t *src)
// the multivec is a member of the destination algebra // the multivec is a member of the destination algebra
return 1; return 1;
} }
if (dst->meta != ty_algebra || src->meta != ty_algebra) { if (!is_algebra (src)) {
if (is_scalar (src)) {
auto algebra = dst->t.multivec->algebra;
auto layout = &algebra->layout;
int group = layout->group_map[layout->mask_map[0]][0];
if (dst->t.multivec->group_mask & (1u << group)) {
// the source scalar is a member of the destination
// multi-vector
return 1;
}
}
return 0; return 0;
} }
return dst->t.multivec == src->t.multivec; if (dst->t.multivec->algebra != src->t.multivec->algebra) {
return 0;
}
if (src->t.multivec->group_mask & ~dst->t.multivec->group_mask) {
return 0;
}
// the source multi-vector is a subset of the destinatin multi-vector
return 1;
} }
type_t * type_t *