Skip to content
Snippets Groups Projects

Two more fixes for functions.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:pr0 into master
2 files
+ 16
8
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 14
6
@@ -3721,6 +3721,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
%type <type> unnamed_struct_spec
%type <type> struct_spec
%type <type> type
%type <type> type_no_void
%type <type> typedef_type
%type <variable_def> type_spec
@@ -4233,6 +4234,10 @@ parameters:
{
memset(&$$, 0, sizeof($$));
}
| scope_start KW_VOID
{
memset(&$$, 0, sizeof($$));
}
| scope_start param_list
{
$$ = $2;
@@ -4260,7 +4265,7 @@ param_list:
}
parameter:
var_modifiers type any_identifier colon_attribute
var_modifiers type_no_void any_identifier colon_attribute
{
struct hlsl_type *type;
unsigned int modifiers = $1;
@@ -4321,7 +4326,7 @@ uav_type:
$$ = HLSL_SAMPLER_DIM_3D;
}
type:
type_no_void:
KW_VECTOR '<' type ',' C_INTEGER '>'
{
if ($3->type != HLSL_CLASS_SCALAR)
@@ -4382,10 +4387,6 @@ type:
{
$$ = hlsl_get_matrix_type(ctx, HLSL_TYPE_FLOAT, 4, 4);
}
| KW_VOID
{
$$ = ctx->builtin_types.Void;
}
| KW_SAMPLER
{
$$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_GENERIC];
@@ -4467,6 +4468,13 @@ type:
vkd3d_free($2);
}
type:
type_no_void
| KW_VOID
{
$$ = ctx->builtin_types.Void;
}
declaration_statement:
declaration
| struct_declaration
Loading