system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 17:54:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3dcompiler: Set the dimensions for array types.

Browse source 
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:42 -05:00 committed by Alexandre Julliard
parent aa333c63fc
commit c6c0601396
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/d3dcompiler_43/tests/hlsl_d3d9.c
View file

@ -894,12 +894,12 @@ static void test_constant_table(void)
"#pragma pack_matrix(row_major)\n"
" float2x2 d;\n"
"} f;\n"
"uniform float g[5];\n"
"uniform float2 g[5];\n"
"uniform matrix_t i;\n"
"uniform struct matrix_record j;\n"
"float4 main(uniform float4 h) : COLOR\n"
"{\n"
" return a + b + c._31 + d._31 + f.d._22 + g[e] + h + i._33 + j.a._33;\n"
" return a + b + c._31 + d._31 + f.d._22 + g[e].x + h + i._33 + j.a._33;\n"
"}";
D3DXCONSTANTTABLE_DESC table_desc;
@ -920,7 +920,7 @@ static void test_constant_table(void)
{"d", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12},
{"e", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4},
{"f", D3DXRS_FLOAT4, 0, 6, D3DXPC_STRUCT, D3DXPT_VOID, 1, 10, 1, 4, 40},
{"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 5, 0, 20},
{"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 2, 5, 0, 40},
{"i", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 3, 1, 0, 36},
{"j", D3DXRS_FLOAT4, 0, 3, D3DXPC_STRUCT, D3DXPT_VOID, 1, 9, 1, 1, 36},
};

2
dlls/d3dcompiler_43/utils.c
View file

@ -841,6 +841,8 @@ struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int arra
type->e.array.elements_count = array_size;
type->e.array.type = basic_type;
type->reg_size = basic_type->reg_size * array_size;
type->dimx = basic_type->dimx;
type->dimy = basic_type->dimy;
return type;
}