June 2024 - Wine-commits - list.winehq.org

Nikolay Sivov : vkd3d-shader/hlsl: Store original semantic name.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: 1124ea46eec70879b934dd0bb636427624306bb0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1124ea46eec70879b934dd0bb6364… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 12:25:12 2024 +0200 vkd3d-shader/hlsl: Store original semantic name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 16 ++++++++++++++++ libs/vkd3d-shader/hlsl.h | 4 ++++ libs/vkd3d-shader/hlsl.y | 13 ++++++------- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index d4180675..c69af4e9 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3352,9 +3352,25 @@ void hlsl_free_attribute(struct hlsl_attribute *attr) void hlsl_cleanup_semantic(struct hlsl_semantic *semantic) { vkd3d_free((void *)semantic->name); + vkd3d_free((void *)semantic->raw_name); memset(semantic, 0, sizeof(*semantic)); } +bool hlsl_clone_semantic(struct hlsl_ctx *ctx, struct hlsl_semantic *dst, const struct hlsl_semantic *src) +{ + *dst = *src; + dst->name = dst->raw_name = NULL; + if (src->name && !(dst->name = hlsl_strdup(ctx, src->name))) + return false; + if (src->raw_name && !(dst->raw_name = hlsl_strdup(ctx, src->raw_name))) + { + hlsl_cleanup_semantic(dst); + return false; + } + + return true; +} + static void free_function_decl(struct hlsl_ir_function_decl *decl) { unsigned int i; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 1db83243..669ab551 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -222,6 +222,8 @@ struct hlsl_semantic const char *name; uint32_t index; + /* Name exactly as it appears in the sources. */ + const char *raw_name; /* If the variable or field that stores this hlsl_semantic has already reported that it is missing. */ bool reported_missing; /* In case the variable or field that stores this semantic has already reported to use a @@ -1284,7 +1286,9 @@ bool hlsl_init_deref_from_index_chain(struct hlsl_ctx *ctx, struct hlsl_deref *d bool hlsl_copy_deref(struct hlsl_ctx *ctx, struct hlsl_deref *deref, const struct hlsl_deref *other); void hlsl_cleanup_deref(struct hlsl_deref *deref); + void hlsl_cleanup_semantic(struct hlsl_semantic *semantic); +bool hlsl_clone_semantic(struct hlsl_ctx *ctx, struct hlsl_semantic *dst, const struct hlsl_semantic *src); void hlsl_cleanup_ir_switch_cases(struct list *cases); void hlsl_free_ir_switch_case(struct hlsl_ir_switch_case *c); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 052573a2..c120613e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2335,14 +2335,10 @@ static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v) if (!(var_name = vkd3d_strdup(v->name))) return; - new_semantic = v->semantic; - if (v->semantic.name) + if (!hlsl_clone_semantic(ctx, &new_semantic, &v->semantic)) { - if (!(new_semantic.name = vkd3d_strdup(v->semantic.name))) - { - vkd3d_free(var_name); - return; - } + vkd3d_free(var_name); + return; } if (!(var = hlsl_new_var(ctx, var_name, type, &v->loc, &new_semantic, modifiers, &v->reg_reservation))) @@ -6433,6 +6429,9 @@ semantic: { char *p; + if (!($$.raw_name = hlsl_strdup(ctx, $2))) + YYABORT; + for (p = $2 + strlen($2); p > $2 && isdigit(p[-1]); --p) ; $$.name = $2; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5420d529..fb108ad9 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -320,7 +320,7 @@ static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir } } - if (!(new_semantic.name = hlsl_strdup(ctx, semantic->name))) + if (!(hlsl_clone_semantic(ctx, &new_semantic, semantic))) { vkd3d_free(new_name); return NULL;

1 0

Nikolay Sivov : vkd3d-shader/fx: Use original full semantic name.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: 72ddea60307de818ae4735973e08d7f34d595de3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72ddea60307de818ae4735973e08d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 12:26:45 2024 +0200 vkd3d-shader/fx: Use original full semantic name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index e5e5eb54..bd3bba6a 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -494,7 +494,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co uint32_t semantic_offset, field_type_offset; name_offset = write_string(field->name, fx); - semantic_offset = write_string(field->semantic.name, fx); + semantic_offset = write_string(field->semantic.raw_name, fx); field_type_offset = write_type(field->type, fx); put_u32_unaligned(buffer, name_offset); @@ -683,7 +683,7 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n } name_offset = write_string(name, fx); - semantic_offset = write_string(semantic->name, fx); + semantic_offset = write_string(semantic->raw_name, fx); offset = put_u32(buffer, hlsl_sm1_base_type(type)); put_u32(buffer, hlsl_sm1_class(type)); @@ -995,7 +995,7 @@ static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, bool shared, st type_offset = write_type(var->data_type, fx); name_offset = write_string(var->name, fx); - semantic_offset = write_string(var->semantic.name, fx); + semantic_offset = write_string(var->semantic.raw_name, fx); put_u32(buffer, name_offset); put_u32(buffer, type_offset); @@ -1349,7 +1349,7 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ type_offset = write_type(var->data_type, fx); name_offset = write_string(var->name, fx); - semantic_offset = write_string(var->semantic.name, fx); + semantic_offset = write_string(var->semantic.raw_name, fx); put_u32(buffer, name_offset); put_u32(buffer, type_offset);

1 0

Elizabeth Figura : vkd3d-shader/hlsl: Always initialize $$ when parsing modifiers from an arbitrary string.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: 2f88442d7d51aed1ff597ec3df31ce12ed3b54a6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2f88442d7d51aed1ff597ec3df31c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri May 31 14:45:41 2024 -0500 vkd3d-shader/hlsl: Always initialize $$ when parsing modifiers from an arbitrary string. This avoids spurious errors like "row_major and column_major are mutually exclusive" when an invalid modifier is used. Fixes: cf7c05f4315dd21a96f60653497c1228a38f61af --- libs/vkd3d-shader/hlsl.y | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c120613e..a2c89b15 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -7296,6 +7296,8 @@ var_modifiers: } | var_identifier var_modifiers { + $$ = $2; + if (!strcmp($1, "precise")) $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_PRECISE, &@1); else if (!strcmp($1, "single"))

1 0

Conor McCarthy : tests/shader-runner: Set the correct flag and format for raw UAVs.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: 7534b88a15c803aa6232d8ea5ed65f8e3f835ce9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7534b88a15c803aa6232d8ea5ed65… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 31 23:46:38 2024 +1000 tests/shader-runner: Set the correct flag and format for raw UAVs. --- tests/hlsl/tgsm.shader_test | 12 +++++------ tests/hlsl/uav-rwbyteaddressbuffer.shader_test | 6 +++--- tests/shader_runner.c | 7 +++++++ tests/shader_runner.h | 1 + tests/shader_runner_d3d11.c | 29 +++++++++++++++++++------- tests/shader_runner_d3d12.c | 1 + tests/shader_runner_gl.c | 1 + 7 files changed, 40 insertions(+), 17 deletions(-) diff --git a/tests/hlsl/tgsm.shader_test b/tests/hlsl/tgsm.shader_test index c18e7c1d..a4213597 100644 --- a/tests/hlsl/tgsm.shader_test +++ b/tests/hlsl/tgsm.shader_test @@ -2,8 +2,8 @@ shader model >= 5.0 [uav 1] -format r32 uint -size (buffer, 4) +format r32 typeless +size (raw_buffer, 4) 1 0 0 0 @@ -32,8 +32,8 @@ probe uav 1 (3) rui (99) [uav 1] -format r32 sint -size (buffer, 4) +format r32 typeless +size (raw_buffer, 4) 1 0 0 0 @@ -136,8 +136,8 @@ probe uav 2 (7) ri (4) [uav 1] -format r32 uint -size (buffer, 1) +format r32 typeless +size (raw_buffer, 1) 0 diff --git a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test index 556d0fb3..c7b3be21 100644 --- a/tests/hlsl/uav-rwbyteaddressbuffer.shader_test +++ b/tests/hlsl/uav-rwbyteaddressbuffer.shader_test @@ -2,10 +2,10 @@ shader model >= 5.0 [uav 1] -format r32 float -size (buffer, 4) +format r32 typeless +size (raw_buffer, 4) -0.1 0.2 0.3 0.4 +1 2 3 4 [pixel shader todo] RWByteAddressBuffer u : register(u1); diff --git a/tests/shader_runner.c b/tests/shader_runner.c index c2fc30d1..dd2f0b0d 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -374,6 +374,7 @@ static DXGI_FORMAT parse_format(const char *line, enum texture_data_type *data_t {"r32 float", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT}, {"r32 sint", TEXTURE_DATA_SINT, 4, DXGI_FORMAT_R32_SINT}, {"r32 uint", TEXTURE_DATA_UINT, 4, DXGI_FORMAT_R32_UINT}, + {"r32 typeless", TEXTURE_DATA_UINT, 4, DXGI_FORMAT_R32_TYPELESS}, }; unsigned int i; @@ -511,6 +512,12 @@ static void parse_resource_directive(struct resource_params *resource, const cha resource->dimension = RESOURCE_DIMENSION_BUFFER; resource->height = 1; } + else if (sscanf(line, "( raw_buffer , %u ) ", &resource->width) == 1) + { + resource->dimension = RESOURCE_DIMENSION_BUFFER; + resource->height = 1; + resource->is_raw = true; + } else if (sscanf(line, "( counter_buffer , %u ) ", &resource->width) == 1) { resource->dimension = RESOURCE_DIMENSION_BUFFER; diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 60dc9ff3..91a499ed 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -92,6 +92,7 @@ struct resource_params DXGI_FORMAT format; bool is_shadow; + bool is_raw; bool is_uav_counter; enum texture_data_type data_type; unsigned int texel_size; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index a21f2ea4..941709c4 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -333,7 +333,7 @@ static void destroy_test_context(struct d3d11_shader_runner *runner) } static ID3D11Buffer *create_buffer(ID3D11Device *device, unsigned int bind_flags, unsigned int size, - unsigned int stride, const void *data) + bool is_raw, unsigned int stride, const void *data) { D3D11_SUBRESOURCE_DATA resource_data; D3D11_BUFFER_DESC buffer_desc; @@ -344,7 +344,12 @@ static ID3D11Buffer *create_buffer(ID3D11Device *device, unsigned int bind_flags buffer_desc.Usage = D3D11_USAGE_DEFAULT; buffer_desc.BindFlags = bind_flags; buffer_desc.CPUAccessFlags = 0; - buffer_desc.MiscFlags = stride ? D3D11_RESOURCE_MISC_BUFFER_STRUCTURED : 0; + if (is_raw) + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS; + else if (stride) + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_STRUCTURED; + else + buffer_desc.MiscFlags = 0; buffer_desc.StructureByteStride = stride; resource_data.pSysMem = data; @@ -443,7 +448,8 @@ static void init_resource_srv_buffer(struct d3d11_shader_runner *runner, struct ID3D11Device *device = runner->device; HRESULT hr; - resource->buffer = create_buffer(device, D3D11_BIND_SHADER_RESOURCE, params->data_size, params->stride, params->data); + resource->buffer = create_buffer(device, D3D11_BIND_SHADER_RESOURCE, params->data_size, params->is_raw, + params->stride, params->data); resource->resource = (ID3D11Resource *)resource->buffer; srv_desc.Format = params->format; @@ -461,7 +467,8 @@ static void init_resource_uav_buffer(struct d3d11_shader_runner *runner, struct ID3D11Device *device = runner->device; HRESULT hr; - resource->buffer = create_buffer(device, D3D11_BIND_UNORDERED_ACCESS, params->data_size, params->stride, params->data); + resource->buffer = create_buffer(device, D3D11_BIND_UNORDERED_ACCESS, params->data_size, params->is_raw, + params->stride, params->data); resource->resource = (ID3D11Resource *)resource->buffer; resource->is_uav_counter = params->is_uav_counter; @@ -469,7 +476,12 @@ static void init_resource_uav_buffer(struct d3d11_shader_runner *runner, struct uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; uav_desc.Buffer.FirstElement = 0; uav_desc.Buffer.NumElements = params->data_size / params->texel_size; - uav_desc.Buffer.Flags = params->is_uav_counter ? D3D11_BUFFER_UAV_FLAG_COUNTER : 0; + if (params->is_raw) + uav_desc.Buffer.Flags = D3D11_BUFFER_UAV_FLAG_RAW; + else if (params->is_uav_counter) + uav_desc.Buffer.Flags = D3D11_BUFFER_UAV_FLAG_COUNTER; + else + uav_desc.Buffer.Flags = 0; hr = ID3D11Device_CreateUnorderedAccessView(device, resource->resource, &uav_desc, &resource->uav); ok(hr == S_OK, "Failed to create view, hr %#lx.\n", hr); } @@ -502,7 +514,8 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co break; case RESOURCE_TYPE_VERTEX_BUFFER: - resource->buffer = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, params->data_size, params->stride, params->data); + resource->buffer = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, params->data_size, params->is_raw, + params->stride, params->data); resource->resource = (ID3D11Resource *)resource->buffer; break; } @@ -568,7 +581,7 @@ static bool d3d11_runner_dispatch(struct shader_runner *r, unsigned int x, unsig ID3D11Buffer *cb; cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, - runner->r.uniform_count * sizeof(*runner->r.uniforms), 0, runner->r.uniforms); + runner->r.uniform_count * sizeof(*runner->r.uniforms), false, 0, runner->r.uniforms); ID3D11DeviceContext_CSSetConstantBuffers(context, 0, 1, &cb); ID3D11Buffer_Release(cb); } @@ -730,7 +743,7 @@ static bool d3d11_runner_draw(struct shader_runner *r, if (runner->r.uniform_count) { cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, - runner->r.uniform_count * sizeof(*runner->r.uniforms), 0, runner->r.uniforms); + runner->r.uniform_count * sizeof(*runner->r.uniforms), false, 0, runner->r.uniforms); ID3D11DeviceContext_VSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); if (hs_code) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index a9b4f244..8734524f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -230,6 +230,7 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; uav_desc.Buffer.NumElements = params->width * params->height; uav_desc.Buffer.StructureByteStride = params->stride; + uav_desc.Buffer.Flags = params->is_raw ? D3D12_BUFFER_UAV_FLAG_RAW : 0; ID3D12Device_CreateUnorderedAccessView(device, resource->resource, params->is_uav_counter ? resource->resource : NULL, &uav_desc, diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index 4a4717a1..a1544336 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -341,6 +341,7 @@ static const struct format_info *get_format_info(enum DXGI_FORMAT format, bool i {DXGI_FORMAT_D32_FLOAT, 1, false, true, GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT}, {DXGI_FORMAT_R32_UINT, 1, true, false, GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT}, {DXGI_FORMAT_R32_SINT, 1, true, false, GL_R32I, GL_RED_INTEGER, GL_INT}, + {DXGI_FORMAT_R32_TYPELESS, 1, true, false, GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT}, }; for (i = 0; i < ARRAY_SIZE(format_info); ++i)

1 0

Conor McCarthy : tests/shader-runner: Create a new runner object for the shader model 6 tests.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: da1d96f7089655d0d6de1bbd5172261c1376ee8e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/da1d96f7089655d0d6de1bbd51722… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 5 14:13:24 2024 +1000 tests/shader-runner: Create a new runner object for the shader model 6 tests. If cleaning up the old runner is not completed, descriptors for destroyed resources may remain on the heap. --- tests/shader_runner_d3d12.c | 46 ++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 8734524f..ff2cad2f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -765,7 +765,8 @@ static const struct shader_runner_ops d3d12_runner_ops = .release_readback = d3d12_runner_release_readback, }; -static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner) +static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner, + enum shader_model minimum_shader_model, enum shader_model maximum_shader_model) { ID3D12Device *device = runner->test_context.device; D3D12_FEATURE_DATA_D3D12_OPTIONS1 options1; @@ -782,8 +783,8 @@ static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner) #else runner->caps.runner = "vkd3d"; #endif - runner->caps.minimum_shader_model = SHADER_MODEL_4_0; - runner->caps.maximum_shader_model = SHADER_MODEL_5_1; + runner->caps.minimum_shader_model = minimum_shader_model; + runner->caps.maximum_shader_model = maximum_shader_model; runner->caps.float64 = options.DoublePrecisionFloatShaderOps; runner->caps.int64 = options1.Int64ShaderOps; runner->caps.rov = options.ROVsSupported; @@ -800,7 +801,8 @@ static bool device_supports_shader_model_6_0(ID3D12Device *device) return sm.HighestShaderModel >= D3D_SHADER_MODEL_6_0; } -void run_shader_tests_d3d12(void *dxc_compiler) +static void run_shader_tests_for_model_range(void *dxc_compiler, + enum shader_model minimum_shader_model, enum shader_model maximum_shader_model) { static const struct test_context_desc desc = { @@ -813,14 +815,19 @@ void run_shader_tests_d3d12(void *dxc_compiler) ID3D12Device *device; HRESULT hr; - enable_d3d12_debug_layer(); - init_adapter_info(); if (!init_test_context(&runner.test_context, &desc)) return; - d3d12_runner_init_caps(&runner); - device = runner.test_context.device; + if (minimum_shader_model >= SHADER_MODEL_6_0 && !device_supports_shader_model_6_0(device)) + { + trace("Device does not support shader model 6.0.\n"); + destroy_test_context(&runner.test_context); + return; + } + + d3d12_runner_init_caps(&runner, minimum_shader_model, maximum_shader_model); + runner.dxc_compiler = dxc_compiler; runner.compute_queue = create_command_queue(device, @@ -834,17 +841,7 @@ void run_shader_tests_d3d12(void *dxc_compiler) runner.compute_allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&runner.compute_list); ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); - run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, NULL); - if (dxc_compiler) - { - runner.caps.minimum_shader_model = SHADER_MODEL_6_0; - runner.caps.maximum_shader_model = SHADER_MODEL_6_0; - - if (device_supports_shader_model_6_0(device)) - run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, dxc_compiler); - else - trace("Device does not support shader model 6.0.\n"); - } + run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, dxc_compiler); ID3D12GraphicsCommandList_Release(runner.compute_list); ID3D12CommandAllocator_Release(runner.compute_allocator); @@ -857,3 +854,14 @@ void run_shader_tests_d3d12(void *dxc_compiler) ID3D12DescriptorHeap_Release(runner.dsv_heap); destroy_test_context(&runner.test_context); } + +void run_shader_tests_d3d12(void *dxc_compiler) +{ + enable_d3d12_debug_layer(); + init_adapter_info(); + + run_shader_tests_for_model_range(NULL, SHADER_MODEL_4_0, SHADER_MODEL_5_1); + + if (dxc_compiler) + run_shader_tests_for_model_range(dxc_compiler, SHADER_MODEL_6_0, SHADER_MODEL_6_0); +}

1 0

Conor McCarthy : vkd3d: Allow block compressed textures to have unaligned width and height.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: 589ed1e358a28d54287ed3ff3effbc677587dcdb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/589ed1e358a28d54287ed3ff3effb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 23 12:32:23 2024 +1000 vkd3d: Allow block compressed textures to have unaligned width and height. --- libs/vkd3d/device.c | 3 ++- libs/vkd3d/resource.c | 8 -------- tests/d3d12.c | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cfc9c5f5..c27a96e2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3806,7 +3806,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 return E_INVALIDARG; } - data->UnalignedBlockTexturesSupported = FALSE; + /* Vulkan does not restrict block texture alignment. */ + data->UnalignedBlockTexturesSupported = TRUE; TRACE("Unaligned block texture support %#x.\n", data->UnalignedBlockTexturesSupported); return S_OK; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c897d9f2..db2d8742 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1809,14 +1809,6 @@ static bool d3d12_resource_validate_texture_format(const D3D12_RESOURCE_DESC1 *d return false; } - if (align(desc->Width, format->block_width) != desc->Width - || align(desc->Height, format->block_height) != desc->Height) - { - WARN("Invalid size %"PRIu64"x%u for block compressed format %#x.\n", - desc->Width, desc->Height, desc->Format); - return false; - } - return true; } diff --git a/tests/d3d12.c b/tests/d3d12.c index 589fd33a..55a85e8c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20519,7 +20519,6 @@ static void test_get_copyable_footprints(void) { resource_desc.Width = align(resource_desc.Width, 4); resource_desc.Height = align(resource_desc.Height, 4); - todo check_copyable_footprints(&resource_desc, 0, invalid_descs[i].sub_resource_count, 0, layouts, row_counts, row_sizes, &total_size); }

1 0

Conor McCarthy : tests/d3d12: Test a null vertex buffer 'views' pointer on multiple slots.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: c3ea43b6194a89534359be9aba769f58da5a6c3e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c3ea43b6194a89534359be9aba769… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 24 10:24:11 2024 +1000 tests/d3d12: Test a null vertex buffer 'views' pointer on multiple slots. --- tests/d3d12.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 55a85e8c..7380ef57 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20137,6 +20137,30 @@ static void test_null_vbv(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + reset_command_list(command_list, context.allocator); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + /* A NULL "views" pointer can apply to multiple view slots. */ + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, NULL); + + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + todo + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); ID3D12Resource_Release(vb); destroy_test_context(&context);

1 0

Conor McCarthy : vkd3d: Interpret a null vertex buffer 'views' pointer as a null buffer.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: 47d077e5ce477e569cabffbfb41e103046f0dc33 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/47d077e5ce477e569cabffbfb41e1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 24 10:28:27 2024 +1000 vkd3d: Interpret a null vertex buffer 'views' pointer as a null buffer. --- libs/vkd3d/command.c | 8 +------- tests/d3d12.c | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 95366d34..6e37209c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4814,15 +4814,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi return; } - if (!views) - { - WARN("NULL \"views\" pointer specified.\n"); - return; - } - for (i = 0; i < view_count; ++i) { - if (views[i].BufferLocation) + if (views && views[i].BufferLocation) { resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferLocation); buffers[i] = resource->u.vk_buffer; diff --git a/tests/d3d12.c b/tests/d3d12.c index 7380ef57..a4b20696 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20135,7 +20135,6 @@ static void test_null_vbv(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); reset_command_list(command_list, context.allocator); @@ -20159,7 +20158,6 @@ static void test_null_vbv(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); ID3D12Resource_Release(vb);

1 0

Elizabeth Figura : vkd3d-shader/hlsl: Add a hlsl_fixme() for 5.1 resource arrays.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: 558320b52ff30468092c47d0b335cb2b42fe9270 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/558320b52ff30468092c47d0b335c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon May 13 23:55:38 2024 -0500 vkd3d-shader/hlsl: Add a hlsl_fixme() for 5.1 resource arrays. These are a bit trickier to handle, and need more tests. --- libs/vkd3d-shader/hlsl.y | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d2fc43b6..4f9d2dff 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1013,6 +1013,10 @@ static bool gen_struct_fields(struct hlsl_ctx *ctx, struct parse_fields *fields, field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[k]); } } + + if (hlsl_version_ge(ctx, 5, 1) && field->type->class == HLSL_CLASS_ARRAY && hlsl_type_is_resource(field->type)) + hlsl_fixme(ctx, &v->loc, "Shader model 5.1+ resource array."); + vkd3d_free(v->arrays.sizes); field->loc = v->loc; field->name = v->name; @@ -2319,6 +2323,15 @@ static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v) } } + if (hlsl_version_ge(ctx, 5, 1) && type->class == HLSL_CLASS_ARRAY && hlsl_type_is_resource(type)) + { + /* SM 5.1/6.x descriptor arrays act differently from previous versions. + * Not only are they treated as a single object in reflection, but they + * act as a single component for the purposes of assignment and + * initialization. */ + hlsl_fixme(ctx, &v->loc, "Shader model 5.1+ resource array."); + } + if (!(var_name = vkd3d_strdup(v->name))) return; @@ -6545,6 +6558,9 @@ parameter: } $$.type = type; + if (hlsl_version_ge(ctx, 5, 1) && type->class == HLSL_CLASS_ARRAY && hlsl_type_is_resource(type)) + hlsl_fixme(ctx, &@2, "Shader model 5.1+ resource array."); + $$.name = $3; $$.semantic = $5.semantic; $$.reg_reservation = $5.reg_reservation;

1 0

Elizabeth Figura : vkd3d-shader/hlsl: Put constant buffers into the extern_resources struct.
by Alexandre Julliard 11 Jun '24

11 Jun '24

Module: vkd3d Branch: master Commit: 19a13740dedcf0a7472b69e45e385a55ddefc57b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/19a13740dedcf0a7472b69e45e385… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri May 3 00:23:38 2024 -0500 vkd3d-shader/hlsl: Put constant buffers into the extern_resources struct. Mostly to get the same sorting logic. --- libs/vkd3d-shader/tpf.c | 103 ++++++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 48 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 0340091d..60f80175 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3178,6 +3178,7 @@ struct extern_resource /* var is only not NULL if this resource is a whole variable, so it may be responsible for more * than one component. */ const struct hlsl_ir_var *var; + const struct hlsl_buffer *buffer; char *name; struct hlsl_type *data_type; @@ -3220,6 +3221,7 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un bool separate_components = ctx->profile->major_version == 5 && ctx->profile->minor_version == 0; struct extern_resource *extern_resources = NULL; const struct hlsl_ir_var *var; + struct hlsl_buffer *buffer; enum hlsl_regset regset; size_t capacity = 0; char *name; @@ -3272,6 +3274,7 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un hlsl_release_string_buffer(ctx, name_buffer); extern_resources[*count].var = NULL; + extern_resources[*count].buffer = NULL; extern_resources[*count].name = name; extern_resources[*count].data_type = component_type; @@ -3313,6 +3316,7 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un } extern_resources[*count].var = var; + extern_resources[*count].buffer = NULL; extern_resources[*count].name = name; extern_resources[*count].data_type = var->data_type; @@ -3327,14 +3331,48 @@ static struct extern_resource *sm4_get_extern_resources(struct hlsl_ctx *ctx, un } } + LIST_FOR_EACH_ENTRY(buffer, &ctx->buffers, struct hlsl_buffer, entry) + { + if (!buffer->reg.allocated) + continue; + + if (!(hlsl_array_reserve(ctx, (void **)&extern_resources, &capacity, *count + 1, + sizeof(*extern_resources)))) + { + sm4_free_extern_resources(extern_resources, *count); + *count = 0; + return NULL; + } + + if (!(name = hlsl_strdup(ctx, buffer->name))) + { + sm4_free_extern_resources(extern_resources, *count); + *count = 0; + return NULL; + } + + extern_resources[*count].var = NULL; + extern_resources[*count].buffer = buffer; + + extern_resources[*count].name = name; + extern_resources[*count].data_type = NULL; + extern_resources[*count].is_user_packed = !!buffer->reservation.reg_type; + + extern_resources[*count].regset = HLSL_REGSET_NUMERIC; + extern_resources[*count].id = buffer->reg.id; + extern_resources[*count].bind_count = 1; + + ++*count; + } + qsort(extern_resources, *count, sizeof(*extern_resources), sm4_compare_extern_resources); return extern_resources; } static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { - unsigned int cbuffer_count = 0, resource_count = 0, extern_resources_count, i, j; size_t cbuffers_offset, resources_offset, creator_offset, string_offset; + unsigned int cbuffer_count = 0, extern_resources_count, i, j; size_t cbuffer_position, resource_position, creator_position; const struct hlsl_profile_info *profile = ctx->profile; struct vkd3d_bytecode_buffer buffer = {0}; @@ -3354,19 +3392,15 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) extern_resources = sm4_get_extern_resources(ctx, &extern_resources_count); - resource_count += extern_resources_count; LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry) { if (cbuffer->reg.allocated) - { ++cbuffer_count; - ++resource_count; - } } put_u32(&buffer, cbuffer_count); cbuffer_position = put_u32(&buffer, 0); - put_u32(&buffer, resource_count); + put_u32(&buffer, extern_resources_count); resource_position = put_u32(&buffer, 0); put_u32(&buffer, vkd3d_make_u32(vkd3d_make_u16(profile->minor_version, profile->major_version), target_types[profile->type])); @@ -3396,20 +3430,18 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) uint32_t flags = 0; if (hlsl_version_ge(ctx, 5, 1)) - hlsl_fixme(ctx, &resource->var->loc, "Shader model 5.1 resource reflection."); + hlsl_fixme(ctx, resource->buffer ? &resource->buffer->loc : &resource->var->loc, + "Shader model 5.1 resource reflection."); if (resource->is_user_packed) flags |= D3D_SIF_USERPACKED; put_u32(&buffer, 0); /* name */ - put_u32(&buffer, sm4_resource_type(resource->data_type)); - if (resource->regset == HLSL_REGSET_SAMPLERS) - { - put_u32(&buffer, 0); - put_u32(&buffer, 0); - put_u32(&buffer, 0); - } + if (resource->buffer) + put_u32(&buffer, resource->buffer->type == HLSL_BUFFER_CONSTANT ? D3D_SIT_CBUFFER : D3D_SIT_TBUFFER); else + put_u32(&buffer, sm4_resource_type(resource->data_type)); + if (resource->regset == HLSL_REGSET_TEXTURES || resource->regset == HLSL_REGSET_UAVS) { unsigned int dimx = hlsl_type_get_component_type(ctx, resource->data_type, 0)->e.resource.format->dimx; @@ -3418,34 +3450,17 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) put_u32(&buffer, ~0u); /* FIXME: multisample count */ flags |= (dimx - 1) << VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT; } + else + { + put_u32(&buffer, 0); + put_u32(&buffer, 0); + put_u32(&buffer, 0); + } put_u32(&buffer, resource->id); put_u32(&buffer, resource->bind_count); put_u32(&buffer, flags); } - LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry) - { - uint32_t flags = 0; - - if (!cbuffer->reg.allocated) - continue; - - if (hlsl_version_ge(ctx, 5, 1)) - hlsl_fixme(ctx, &cbuffer->loc, "Shader model 5.1 resource reflection."); - - if (cbuffer->reservation.reg_type) - flags |= D3D_SIF_USERPACKED; - - put_u32(&buffer, 0); /* name */ - put_u32(&buffer, cbuffer->type == HLSL_BUFFER_CONSTANT ? D3D_SIT_CBUFFER : D3D_SIT_TBUFFER); - put_u32(&buffer, 0); /* return type */ - put_u32(&buffer, 0); /* dimension */ - put_u32(&buffer, 0); /* multisample count */ - put_u32(&buffer, cbuffer->reg.id); /* bind point */ - put_u32(&buffer, 1); /* bind count */ - put_u32(&buffer, flags); /* flags */ - } - for (i = 0; i < extern_resources_count; ++i) { const struct extern_resource *resource = &extern_resources[i]; @@ -3454,15 +3469,6 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) set_u32(&buffer, resources_offset + i * 8 * sizeof(uint32_t), string_offset); } - LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry) - { - if (!cbuffer->reg.allocated) - continue; - - string_offset = put_string(&buffer, cbuffer->name); - set_u32(&buffer, resources_offset + i++ * 8 * sizeof(uint32_t), string_offset); - } - /* Buffers. */ cbuffers_offset = bytecode_align(&buffer); @@ -5840,7 +5846,8 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, const struct extern_resource *resource = &extern_resources[i]; if (hlsl_version_ge(ctx, 5, 1)) - hlsl_fixme(ctx, &resource->var->loc, "Shader model 5.1 resource declaration."); + hlsl_fixme(ctx, resource->buffer ? &resource->buffer->loc : &resource->var->loc, + "Shader model 5.1 resource declaration."); if (resource->regset == HLSL_REGSET_SAMPLERS) write_sm4_dcl_samplers(&tpf, resource); @@ -5903,7 +5910,7 @@ static void write_sm4_sfi0(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) extern_resources = sm4_get_extern_resources(ctx, &extern_resources_count); for (unsigned int i = 0; i < extern_resources_count; ++i) { - if (extern_resources[i].data_type->e.resource.rasteriser_ordered) + if (extern_resources[i].data_type && extern_resources[i].data_type->e.resource.rasteriser_ordered) *flags |= VKD3D_SM4_REQUIRES_ROVS; } sm4_free_extern_resources(extern_resources, extern_resources_count);

1 0