ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dcompiler: Fix matrix dimension declaration and access. 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-04-29 21:54:39 -05:00 committed by Alexandre Julliard
parent 7fa051eca7
commit 4952bcfa4c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/d3dcompiler_43/hlsl.y
View File

@ -214,7 +214,7 @@ static void declare_predefined_types(struct hlsl_scope *scope)
{ {
for (x = 1; x <= 4; ++x) for (x = 1; x <= 4; ++x)
{ {
sprintf(name, "%s%ux%u", names[bt], x, y); sprintf(name, "%s%ux%u", names[bt], y, x);
type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_MATRIX, bt, x, y); type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_MATRIX, bt, x, y);
add_type_to_scope(scope, type); add_type_to_scope(scope, type);
@ -427,13 +427,13 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha
{ {
if (swizzle[i + 1] != 'm') if (swizzle[i + 1] != 'm')
return NULL; return NULL;
x = swizzle[i + 2] - '0'; y = swizzle[i + 2] - '0';
y = swizzle[i + 3] - '0'; x = swizzle[i + 3] - '0';
} }
else else
{ {
x = swizzle[i + 1] - '1'; y = swizzle[i + 1] - '1';
y = swizzle[i + 2] - '1'; x = swizzle[i + 2] - '1';
} }
if (x >= value->data_type->dimx || y >= value->data_type->dimy) if (x >= value->data_type->dimx || y >= value->data_type->dimy)