Skip to content

W
wine-winehq
Commit be350b0b authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard
Browse files
Options

d3dcompiler: Store location information in constants, variable dereferences and constructors.

parent 55f9e9ff
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 1 deletion
dlls/d3dcompiler_43/hlsl.y
View file @ be350b0b
......@@ -799,6 +799,7 @@ primary_expr: C_FLOAT
return -1;
}
c->node.type = HLSL_IR_CONSTANT;
set_location(&c->node.loc, &yylloc);
c->node.data_type = new_hlsl_type("float", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1);
c->v.value.f[0] = $1;
$$ = &c->node;
......@@ -812,6 +813,7 @@ primary_expr: C_FLOAT
return -1;
}
c->node.type = HLSL_IR_CONSTANT;
set_location(&c->node.loc, &yylloc);
c->node.data_type = new_hlsl_type("int", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1);
c->v.value.i[0] = $1;
$$ = &c->node;
......@@ -825,6 +827,7 @@ primary_expr: C_FLOAT
return -1;
}
c->node.type = HLSL_IR_CONSTANT;
set_location(&c->node.loc, &yylloc);
c->node.data_type = new_hlsl_type("bool", HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1);
c->v.value.b[0] = $1;
$$ = &c->node;
......@@ -832,7 +835,13 @@ primary_expr: C_FLOAT
| variable
{
struct hlsl_ir_deref *deref = new_var_deref($1);
$$ = deref ? &deref->node : NULL;
if (deref)
{
$$ = &deref->node;
set_location(&$$->loc, &@1);
}
else
$$ = NULL;
}
| '(' expr ')'
{
......@@ -888,6 +897,7 @@ postfix_expr: primary_expr
constructor = d3dcompiler_alloc(sizeof(*constructor));
constructor->node.type = HLSL_IR_CONSTRUCTOR;
set_location(&constructor->node.loc, &@3);
constructor->node.data_type = $2;
constructor->arguments = $4;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment