May 2024 - Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Only allocate numeric bind count for SM1 numeric uniforms.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: f5486442227c9e2d6ec45fcfd515660f56a1b720 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f5486442227c9e2d6ec45fcfd5156… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri May 3 02:06:37 2024 -0400 vkd3d-shader/hlsl: Only allocate numeric bind count for SM1 numeric uniforms. Unless they have register reservations, in which case the whole variable is still reserved. --- libs/vkd3d-shader/hlsl_codegen.c | 7 +++---- tests/hlsl/sm1-const-allocation.shader_test | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 25bd5d9c..de778000 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4593,15 +4593,14 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - unsigned int reg_size = var->data_type->reg_size[HLSL_REGSET_NUMERIC]; + unsigned int alloc_size = 4 * var->bind_count[HLSL_REGSET_NUMERIC]; - if (!var->is_uniform || !var->last_read || reg_size == 0) + if (!var->is_uniform || alloc_size == 0) continue; if (!var->regs[HLSL_REGSET_NUMERIC].allocated) { - var->regs[HLSL_REGSET_NUMERIC] = allocate_numeric_registers_for_type(ctx, &allocator, - 1, UINT_MAX, var->data_type); + var->regs[HLSL_REGSET_NUMERIC] = allocate_range(ctx, &allocator, 1, UINT_MAX, alloc_size); TRACE("Allocated %s to %s.\n", var->name, debug_register('c', var->regs[HLSL_REGSET_NUMERIC], var->data_type)); } diff --git a/tests/hlsl/sm1-const-allocation.shader_test b/tests/hlsl/sm1-const-allocation.shader_test index 0a4340ea..e8a60255 100644 --- a/tests/hlsl/sm1-const-allocation.shader_test +++ b/tests/hlsl/sm1-const-allocation.shader_test @@ -26,7 +26,7 @@ float4 main() : sv_target uniform 0 float4 1 2 3 4 uniform 4 float4 100 200 300 400 draw quad -todo probe all rgba (101, 202, 303, 404) +probe all rgba (101, 202, 303, 404) [pixel shader] @@ -188,7 +188,7 @@ uniform 16 float4 41 42 43 44 uniform 20 float4 51 52 53 54 uniform 24 float4 61 62 63 64 draw quad -todo probe all rgba (31, 52, 61, 62) +probe all rgba (31, 52, 61, 62) [pixel shader]

1 0

Francisco Casas : vkd3d-shader/d3dbc: Write used bind count for numeric uniforms.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: e7450ce539f95cce39d6148f867564e665363191 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e7450ce539f95cce39d6148f86756… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri May 3 02:51:17 2024 -0400 vkd3d-shader/d3dbc: Write used bind count for numeric uniforms. --- libs/vkd3d-shader/d3dbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index c7991407..7c7c71e3 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1758,7 +1758,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe if (r == HLSL_REGSET_NUMERIC) { put_u32(buffer, vkd3d_make_u32(D3DXRS_FLOAT4, var->regs[r].id)); - put_u32(buffer, var->data_type->reg_size[r] / 4); + put_u32(buffer, var->bind_count[r]); } else {

1 0

Francisco Casas : vkd3d-shader: Return a valid pointer when count=0 in param allocator (ubsan).
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: 5b7191280b7709d51b585c4f517e7ede763e01b5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5b7191280b7709d51b585c4f517e7… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon May 6 16:51:36 2024 -0400 vkd3d-shader: Return a valid pointer when count=0 in param allocator (ubsan). After compiling and linking with '-fsanitize=undefined' the following error pops up in many tests: vkd3d_shader_main.c:2024:12: runtime error: member access within null pointer of type 'struct vkd3d_shader_param_node' This happens in the scenario where shader_param_allocator_get() gets called with 'count = 0' but no allocation has been made yet, so allocator->current is NULL. In this case the result of the function, given by: params = &allocator->current->param[allocator->index * allocator->stride]; is an invalid non-NULL pointer. Functions like shader_sm4_read_instruction() may call vsir_program_get_src_params() or vsir_program_get_dst_params() with 0 counts for various DCL_ instructions, as well as things like NOP, ELSE, and SYNC. We could avoid calling the functions in question with 0 counts, but it doesn't seem worth the effort. Alternatively, we could just return NULL on 'count == 0', but this is also complicated because NULL is interpreted as a memory allocation failure on the callers. So we force allocation of the next node even if 'count = 0' when allocator->current is NULL. --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a7b42217..18456480 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -2004,7 +2004,7 @@ void *shader_param_allocator_get(struct vkd3d_shader_param_allocator *allocator, { void *params; - if (count > allocator->count - allocator->index) + if (!allocator->current || count > allocator->count - allocator->index) { struct vkd3d_shader_param_node *next;

1 0

Conor McCarthy : vkd3d-shader/dxil: Emit bool inputs and outputs as uint.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: ea5624e5e866caac25bdf79c3c5b6c7925d0b481 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea5624e5e866caac25bdf79c3c5b6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 28 16:14:13 2023 +1000 vkd3d-shader/dxil: Emit bool inputs and outputs as uint. DXIL reads/writes uint for these. --- libs/vkd3d-shader/dxil.c | 4 ++++ tests/hlsl/bool-semantics.shader_test | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 811a7c97..ab165910 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -9387,6 +9387,10 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const e->used_mask <<= index; } + /* DXIL reads/writes uint for bool I/O. */ + if (e->component_type == VKD3D_SHADER_COMPONENT_BOOL) + e->component_type = VKD3D_SHADER_COMPONENT_UINT; + m = element_node->operands[4]; if (!sm6_metadata_value_is_node(m)) { diff --git a/tests/hlsl/bool-semantics.shader_test b/tests/hlsl/bool-semantics.shader_test index af945397..0214e957 100644 --- a/tests/hlsl/bool-semantics.shader_test +++ b/tests/hlsl/bool-semantics.shader_test @@ -49,5 +49,5 @@ float4 main(struct input i) : sv_target } [test] -todo(sm>=6 | glsl) draw triangle strip 4 +todo(glsl) draw triangle strip 4 probe all rgba (0.0, 2.0, 2.0, 2.0)

1 0

Nikolay Sivov : tests: Test SM1 constant register allocation with a row_major matrix.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: 9dcb74341f0cffb2dafcba0fd189c03c7b83ca7b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9dcb74341f0cffb2dafcba0fd189c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 2 20:01:19 2024 -0400 tests: Test SM1 constant register allocation with a row_major matrix. Co-authored-by: Francisco Casas <fcasas(a)codeweavers.com> --- tests/hlsl/sm1-const-allocation.shader_test | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/hlsl/sm1-const-allocation.shader_test b/tests/hlsl/sm1-const-allocation.shader_test index 29625fa5..741545b1 100644 --- a/tests/hlsl/sm1-const-allocation.shader_test +++ b/tests/hlsl/sm1-const-allocation.shader_test @@ -225,3 +225,32 @@ uniform 24 float4 61 62 63 64 uniform 28 float4 71 72 73 74 draw quad todo probe all rgba (74, 31, 63, 0) + + +[pixel shader] +typedef float2x2 matrix_t; +typedef row_major matrix_t row_matrix_t; +typedef column_major matrix_t col_matrix_t; +uniform row_matrix_t m1; +uniform col_matrix_t m2; +float4 main() : COLOR +{ + float4 ret; + ret.xy = m1[0]; + ret.zw = m2[0]; + return ret; +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// m2 c0 2 +// m1 c2 1 +// + +[test] +uniform 0 float4 1 2 3 4 +uniform 4 float4 11 12 13 14 +uniform 8 float4 21 22 23 24 +draw quad +todo probe all rgba (21, 22, 1, 11)

1 0

Francisco Casas : tests: Test SM1 const register allocation with relative addressing.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: 7b3644d9f28a9e25016a4fa8deb5df4162630d56 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b3644d9f28a9e25016a4fa8deb5d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri May 3 04:15:09 2024 -0400 tests: Test SM1 const register allocation with relative addressing. --- tests/hlsl/sm1-const-allocation.shader_test | 37 +++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tests/hlsl/sm1-const-allocation.shader_test b/tests/hlsl/sm1-const-allocation.shader_test index 3f4da40a..ca641b14 100644 --- a/tests/hlsl/sm1-const-allocation.shader_test +++ b/tests/hlsl/sm1-const-allocation.shader_test @@ -373,3 +373,40 @@ uniform 20 float 5 uniform 24 float 6 draw quad todo probe all rgba (6, 1, 0, 0) + + +[pixel shader todo] +// Relative addressing extends the allocation size only up to the array's size. +float idx; + +struct +{ + float dyn[5]; + float unused; +} a; + + +float4 main() : sv_target +{ + return a.dyn[idx]; +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// a c0 5 +// idx c5 1 +// + +[test] +uniform 0 float 0 +uniform 4 float 1 +uniform 8 float 2 +uniform 12 float 3 +uniform 16 float 4 +uniform 20 float 3 +todo draw quad +probe all rgba (3, 3, 3, 3) +uniform 20 float 1 +todo draw quad +probe all rgba (1, 1, 1, 1)

1 0

Giovanni Mascellani : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS16 in CheckFeatureSupport().
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: d528fdbebfd260a75c576208dc03271a6dab55ba URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d528fdbebfd260a75c576208dc032… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 8 11:21:28 2024 +0200 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS16 in CheckFeatureSupport(). --- include/vkd3d_d3d12.idl | 7 +++++++ libs/vkd3d/device.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 35994c20..23f1567e 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2460,6 +2460,12 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS15 BOOL DynamicIndexBufferStripCutSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS15; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS16 +{ + BOOL DynamicDepthBiasSupported; + BOOL GPUUploadHeapSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS16; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2497,6 +2503,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS13 = 42, D3D12_FEATURE_D3D12_OPTIONS14 = 43, D3D12_FEATURE_D3D12_OPTIONS15 = 44, + D3D12_FEATURE_D3D12_OPTIONS16 = 45, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ba745e54..2a11105d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3955,6 +3955,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS16: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS16 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + } + + data->DynamicDepthBiasSupported = FALSE; + data->GPUUploadHeapSupported = FALSE; + + TRACE("Dynamic depth bias %#x.\n", data->DynamicDepthBiasSupported); + TRACE("GPU upload heap %#x.\n", data->GPUUploadHeapSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Giovanni Mascellani : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS17 in CheckFeatureSupport().
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: 7c7503713a0e898c77ff217e26d3de70a3f69f4d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7c7503713a0e898c77ff217e26d3d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 8 11:25:22 2024 +0200 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS17 in CheckFeatureSupport(). --- include/vkd3d_d3d12.idl | 7 +++++++ libs/vkd3d/device.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 23f1567e..30776092 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2466,6 +2466,12 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS16 BOOL GPUUploadHeapSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS16; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS17 +{ + BOOL NonNormalizedCoordinateSamplersSupported; + BOOL ManualWriteTrackingResourceSupported; +} D3D12_FEATURE_DATA_D3D12_OPTIONS17; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2504,6 +2510,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS14 = 43, D3D12_FEATURE_D3D12_OPTIONS15 = 44, D3D12_FEATURE_D3D12_OPTIONS16 = 45, + D3D12_FEATURE_D3D12_OPTIONS17 = 46, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 2a11105d..4c2e9d4a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3972,6 +3972,23 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS17: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS17 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + } + + data->NonNormalizedCoordinateSamplersSupported = FALSE; + data->ManualWriteTrackingResourceSupported = FALSE; + + TRACE("Non-normalized coordinate samplers %#x.\n", data->NonNormalizedCoordinateSamplersSupported); + TRACE("Manual write tracking resource %#x.\n", data->ManualWriteTrackingResourceSupported); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Giovanni Mascellani : vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS18 in CheckFeatureSupport().
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: 05394b624a7921b451a906bc68a95c25a8a92ad8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/05394b624a7921b451a906bc68a95… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed May 8 11:26:44 2024 +0200 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS18 in CheckFeatureSupport(). --- include/vkd3d_d3d12.idl | 6 ++++++ libs/vkd3d/device.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 30776092..a72732e4 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2472,6 +2472,11 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS17 BOOL ManualWriteTrackingResourceSupported; } D3D12_FEATURE_DATA_D3D12_OPTIONS17; +typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS18 +{ + BOOL RenderPassesValid; +} D3D12_FEATURE_DATA_D3D12_OPTIONS18; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -2511,6 +2516,7 @@ typedef enum D3D12_FEATURE D3D12_FEATURE_D3D12_OPTIONS15 = 44, D3D12_FEATURE_D3D12_OPTIONS16 = 45, D3D12_FEATURE_D3D12_OPTIONS17 = 46, + D3D12_FEATURE_D3D12_OPTIONS18 = 47, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4c2e9d4a..8b817264 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3989,6 +3989,21 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return S_OK; } + case D3D12_FEATURE_D3D12_OPTIONS18: + { + D3D12_FEATURE_DATA_D3D12_OPTIONS18 *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + } + + data->RenderPassesValid = FALSE; + + TRACE("Render passes valid %#x.\n", data->RenderPassesValid); + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Francisco Casas : tests: Test SM1 constant register allocation.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: vkd3d Branch: master Commit: 7debe25a8b70e01caa249a1139b3d1be96ad7275 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7debe25a8b70e01caa249a1139b3d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu May 2 19:51:36 2024 -0400 tests: Test SM1 constant register allocation. --- Makefile.am | 1 + tests/hlsl/sm1-const-allocation.shader_test | 227 ++++++++++++++++++++++++++++ 2 files changed, 228 insertions(+) diff --git a/Makefile.am b/Makefile.am index 558938c5..b4f863fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -193,6 +193,7 @@ vkd3d_shader_tests = \ tests/hlsl/sign.shader_test \ tests/hlsl/single-numeric-initializer.shader_test \ tests/hlsl/sm1-const-folding.shader_test \ + tests/hlsl/sm1-const-allocation.shader_test \ tests/hlsl/sm6-ternary.shader_test \ tests/hlsl/sm6-uav-rwtexture.shader_test \ tests/hlsl/smoothstep.shader_test \ diff --git a/tests/hlsl/sm1-const-allocation.shader_test b/tests/hlsl/sm1-const-allocation.shader_test new file mode 100644 index 00000000..29625fa5 --- /dev/null +++ b/tests/hlsl/sm1-const-allocation.shader_test @@ -0,0 +1,227 @@ +[require] +shader model < 4.0 + + +[pixel shader] +// Only the used size is reserved. +// Note that these matrices are column-major. +float4x2 a; +float4x2 b; + +float4 main() : sv_target +{ + float4x2 c = a; + float4x2 d = c + b; + + return float4(d[0].x, d[1].x, d[2].x, d[3].x); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// a c0 1 +// b c1 1 +// +[test] +uniform 0 float4 1 2 3 4 +uniform 4 float4 100 200 300 400 +draw quad +todo probe all rgba (101, 202, 303, 404) + + +[pixel shader] +// Size 2 always are allocated before size 1 +float4x2 a; +float4x2 b; + +float4 main() : sv_target +{ + return float4(a[0].x, a[1].x, a[2].x, b[0].y); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// b c0 2 +// a c2 1 +// +[test] +uniform 0 float4 1 2 3 4 +uniform 4 float4 11 12 13 14 +uniform 8 float4 21 22 23 24 +draw quad +todo probe all rgba (21, 22, 23, 11) + + +[pixel shader] +// Size 3 always allocated before size 2, probably means that they are allocated in decreasing used size. +float4x3 a; +float4x3 b; + +float4 main() : sv_target +{ + return float4(a[0].y, b[0].z, 0, 0); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// b c0 3 +// a c3 2 +// +[test] +uniform 0 float4 1 2 3 4 +uniform 4 float4 11 12 13 14 +uniform 8 float4 21 22 23 24 +uniform 12 float4 31 32 33 34 +uniform 16 float4 41 42 43 44 +draw quad +todo probe all rgba (41, 21, 0, 0) + + +[pixel shader] +// Test same used size, how a comes before b. +float4x3 a; +float4x3 b; + +float4 main() : sv_target +{ + return float4(a[0].z, b[0].z, 0, 0); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// a c0 3 +// b c3 3 +// +[test] +uniform 0 float4 1 2 3 4 +uniform 4 float4 11 12 13 14 +uniform 8 float4 21 22 23 24 +uniform 12 float4 31 32 33 34 +uniform 16 float4 41 42 43 44 +uniform 20 float4 51 52 53 54 +draw quad +probe all rgba (21, 51, 0, 0) + + +[pixel shader] +// Declaration order is more important than instruction order to break ties. +float4x3 zzz; +float4x3 aaa; + +float4 main() : sv_target +{ + return float4(aaa[0].z, zzz[0].z, 0, 0); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// zzz c0 3 +// aaa c3 3 +// +[test] +uniform 0 float4 1 2 3 4 +uniform 4 float4 11 12 13 14 +uniform 8 float4 21 22 23 24 +uniform 12 float4 31 32 33 34 +uniform 16 float4 41 42 43 44 +uniform 20 float4 51 52 53 54 +draw quad +probe all rgba (51, 21, 0, 0) + + +[pixel shader] +// Arrays follow the same rules +float2 zzz[2], aaa[4]; + +float4 main() : sv_target +{ + return float4(aaa[1], zzz[1]); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// zzz c0 2 +// aaa c2 2 +// +[test] +uniform 0 float4 1 2 3 4 +uniform 4 float4 11 12 13 14 +uniform 8 float4 21 22 23 24 +uniform 12 float4 31 32 33 34 +draw quad +probe all rgba (31, 32, 11, 12) + + +[pixel shader] +struct apple +{ + float2 a; + float3x2 b; + float4 c[2]; +}; + +struct apple zzz, hhh, aaa; + +float4 main() : sv_target +{ + return float4(zzz.c[0].x, hhh.b[1].x, aaa.a); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// zzz c0 4 +// hhh c4 2 +// aaa c6 1 +// +[test] +uniform 0 float4 1 2 3 4 +uniform 4 float4 11 12 13 14 +uniform 8 float4 21 22 23 24 +uniform 12 float4 31 32 33 34 +uniform 16 float4 41 42 43 44 +uniform 20 float4 51 52 53 54 +uniform 24 float4 61 62 63 64 +draw quad +todo probe all rgba (31, 52, 61, 62) + + +[pixel shader] +// Constant buffer variables are treated indistinctively. +float4x4 size3; +float4x4 unused; + +cbuffer buff +{ + float4x4 size1; + float4x4 size4; +}; + +float4 main() : sv_target +{ + return float4(size1[3].x, size4[0].w, size3[2].z, 0); +} +// Registers: +// +// Name Reg Size +// ------------ ----- ---- +// size4 c0 4 +// size3 c4 3 +// size1 c7 1 + +[test] +uniform 0 float4 1 2 3 4 +uniform 4 float4 11 12 13 14 +uniform 8 float4 21 22 23 24 +uniform 12 float4 31 32 33 34 +uniform 16 float4 41 42 43 44 +uniform 20 float4 51 52 53 54 +uniform 24 float4 61 62 63 64 +uniform 28 float4 71 72 73 74 +draw quad +todo probe all rgba (74, 31, 63, 0)

1 0