[PATCH 3/5] d3dcompiler: Avoid using the lookahead token for location.
Zebediah Figura
z.figura12 at gmail.com
Tue Apr 14 19:39:56 CDT 2020
From: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/d3dcompiler_43/hlsl.y | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y
index 5366181f356..2d6ed925640 100644
--- a/dlls/d3dcompiler_43/hlsl.y
+++ b/dlls/d3dcompiler_43/hlsl.y
@@ -2035,7 +2035,7 @@ primary_expr: C_FLOAT
YYABORT;
}
c->node.type = HLSL_IR_CONSTANT;
- c->node.loc = get_location(&yylloc);
+ c->node.loc = get_location(&@1);
c->node.data_type = new_hlsl_type(d3dcompiler_strdup("float"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1);
c->v.value.f[0] = $1;
if (!($$ = make_list(&c->node)))
@@ -2050,7 +2050,7 @@ primary_expr: C_FLOAT
YYABORT;
}
c->node.type = HLSL_IR_CONSTANT;
- c->node.loc = get_location(&yylloc);
+ c->node.loc = get_location(&@1);
c->node.data_type = new_hlsl_type(d3dcompiler_strdup("int"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1);
c->v.value.i[0] = $1;
if (!($$ = make_list(&c->node)))
@@ -2065,7 +2065,7 @@ primary_expr: C_FLOAT
YYABORT;
}
c->node.type = HLSL_IR_CONSTANT;
- c->node.loc = get_location(&yylloc);
+ c->node.loc = get_location(&@1);
c->node.data_type = new_hlsl_type(d3dcompiler_strdup("bool"), HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1);
c->v.value.b[0] = $1;
if (!($$ = make_list(&c->node)))
--
2.26.0
More information about the wine-devel
mailing list