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] Implement glsl field and swizzle expressions

Browse source 
Ruamoko should have swizzles as well since the same underlying code is
used.
This commit is contained in:
Bill Currie 2024-04-22 11:28:13 +09:00
parent 953be00a72
commit f3d3bc8ec1
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/qfcc/source/expr.c
View file

@ -1461,7 +1461,7 @@ get_struct_field (const type_t *t1, const expr_t *e1, const expr_t *e2)
return 0; return 0;
} }
field = symtab_lookup (strct, sym->name); field = symtab_lookup (strct, sym->name);
if (!field && !is_entity(t1)) { if (!field && !is_entity(t1) && !is_nonscalar (t1)) {
const char *name = t1->name; const char *name = t1->name;
if (!strncmp (name, "tag ", 4)) { if (!strncmp (name, "tag ", 4)) {
name += 4; name += 4;
@ -1471,6 +1471,17 @@ get_struct_field (const type_t *t1, const expr_t *e1, const expr_t *e2)
return field; return field;
} }
static const expr_t *
swizzle_expr (const expr_t *vec, const expr_t *swizzle)
{
auto sym = get_name (swizzle);
if (!sym) {
// error already reported
return vec;
}
return new_swizzle_expr (vec, sym->name);
}
const expr_t * const expr_t *
field_expr (const expr_t *e1, const expr_t *e2) field_expr (const expr_t *e1, const expr_t *e2)
{ {
@ -1540,8 +1551,12 @@ field_expr (const expr_t *e1, const expr_t *e2)
symbol_t *field; symbol_t *field;
field = get_struct_field (t1, e1, e2); field = get_struct_field (t1, e1, e2);
if (!field) if (!field) {
if (is_nonscalar (t1)) {
return swizzle_expr (e1, e2);
}
return e1; return e1;
}
if (e1->type == ex_expr && e1->expr.op == '.' if (e1->type == ex_expr && e1->expr.op == '.'
&& is_entity(get_type (e1->expr.e1))) { && is_entity(get_type (e1->expr.e1))) {

4
tools/qfcc/source/glsl-parse.y
View file

@ -276,6 +276,10 @@ postfix_expression
} }
| function_call | function_call
| postfix_expression '.' IDENTIFIER/*FIELD_SELECTION*/ | postfix_expression '.' IDENTIFIER/*FIELD_SELECTION*/
{
auto sym = new_symbol_expr ($3);
$$ = field_expr ($1, sym);
}
| postfix_expression INCOP { $$ = incop_expr ($2, $1, 1); } | postfix_expression INCOP { $$ = incop_expr ($2, $1, 1); }
; ;