- Wine-Commits - list.winehq.org

Alex Henrie : wined3d: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: wine Branch: master Commit: e8d849efce454658f459739bdc054d83a9d75834 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8d849efce454658f459739bdc054d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:33:23 2023 -0600 wined3d: Use debugstr_fourcc instead of debugstr_an. --- dlls/wined3d/shader_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 74391cc1be8..f76bd693b3b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -2070,7 +2070,7 @@ static HRESULT shader_dxbc_process_section(struct wined3d_shader *shader, unsign break; default: - TRACE("Skipping chunk %s.\n", debugstr_an((const char *)&tag, 4)); + TRACE("Skipping chunk %s.\n", debugstr_fourcc(tag)); break; }

1 0

Conor McCarthy : vkd3d-shader/spirv: Align constant buffer sizes to 16 bytes.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: 9b64d04ed397168b358c5b505fda5b40cddaf5ca URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9b64d04ed397168b358c5b505fda5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Oct 6 00:39:34 2023 +1000 vkd3d-shader/spirv: Align constant buffer sizes to 16 bytes. DXIL constant buffer sizes are not aligned to 16 bytes. --- libs/vkd3d-shader/spirv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bd9e7a33..2dab97cc 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5639,7 +5639,8 @@ static void spirv_compiler_emit_cbv_declaration(struct spirv_compiler *compiler, reg.idx[1].offset = range->first; reg.idx[2].offset = range->last; - size = size_in_bytes / (VKD3D_VEC4_SIZE * sizeof(uint32_t)); + size = align(size_in_bytes, VKD3D_VEC4_SIZE * sizeof(uint32_t)); + size /= VKD3D_VEC4_SIZE * sizeof(uint32_t); if ((push_cb = spirv_compiler_find_push_constant_buffer(compiler, range))) {

1 0

Conor McCarthy : vkd3d-shader/dxil: Read CBV descriptors.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: b7b128595ee9ba4513d445c72cb30de39aaa11db URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b7b128595ee9ba4513d445c72cb30… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Oct 15 13:47:25 2023 +1000 vkd3d-shader/dxil: Read CBV descriptors. --- libs/vkd3d-shader/dxil.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 166 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4bfebea2..19ce2936 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2821,6 +2821,11 @@ static bool sm6_metadata_value_is_node(const struct sm6_metadata_value *m) return m && m->type == VKD3D_METADATA_NODE; } +static bool sm6_metadata_value_is_value(const struct sm6_metadata_value *m) +{ + return m && m->type == VKD3D_METADATA_VALUE; +} + static bool sm6_metadata_value_is_string(const struct sm6_metadata_value *m) { return m && m->type == VKD3D_METADATA_STRING; @@ -3375,11 +3380,170 @@ static const struct sm6_metadata_value *sm6_parser_find_named_metadata(struct sm return NULL; } +static bool sm6_parser_resources_load_register_range(struct sm6_parser *sm6, + const struct sm6_metadata_node *node, struct vkd3d_shader_register_range *range) +{ + unsigned int size; + + if (!sm6_metadata_value_is_value(node->operands[1])) + { + WARN("Resource data type is not a value.\n"); + return false; + } + if (!sm6_type_is_pointer(node->operands[1]->value_type)) + { + WARN("Resource type is not a pointer.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH, + "Resource metadata value type is not a pointer."); + } + + if (!sm6_metadata_get_uint_value(sm6, node->operands[3], &range->space)) + { + WARN("Failed to load register space.\n"); + return false; + } + if (!sm6_metadata_get_uint_value(sm6, node->operands[4], &range->first)) + { + WARN("Failed to load register first.\n"); + return false; + } + if (!sm6_metadata_get_uint_value(sm6, node->operands[5], &size)) + { + WARN("Failed to load register range size.\n"); + return false; + } + if (!size || (size != UINT_MAX && !vkd3d_bound_range(range->first, size, UINT_MAX))) + { + WARN("Invalid register range, first %u, size %u.\n", range->first, size); + return false; + } + range->last = (size == UINT_MAX) ? UINT_MAX : range->first + size - 1; + + return true; +} + +static enum vkd3d_result sm6_parser_resources_load_cbv(struct sm6_parser *sm6, + const struct sm6_metadata_node *node, const struct vkd3d_shader_register_range *range, + unsigned int register_id, struct vkd3d_shader_instruction *ins) +{ + struct vkd3d_shader_register *reg; + unsigned int buffer_size; + + if (node->operand_count < 7) + { + WARN("Invalid operand count %u.\n", node->operand_count); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT, + "Invalid operand count %u for a CBV descriptor.", node->operand_count); + return VKD3D_ERROR_INVALID_SHADER; + } + if (node->operand_count > 7 && node->operands[7]) + { + WARN("Ignoring %u extra operands.\n", node->operand_count - 7); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring %u extra operands for a CBV descriptor.", node->operand_count - 7); + } + + if (!sm6_metadata_get_uint_value(sm6, node->operands[6], &buffer_size)) + { + WARN("Failed to load buffer size.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Constant buffer size metadata value is not an integer."); + return VKD3D_ERROR_INVALID_SHADER; + } + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_DCL_CONSTANT_BUFFER); + ins->resource_type = VKD3D_SHADER_RESOURCE_BUFFER; + ins->declaration.cb.size = buffer_size; + ins->declaration.cb.src.swizzle = VKD3D_SHADER_NO_SWIZZLE; + ins->declaration.cb.src.modifiers = VKD3DSPSM_NONE; + + reg = &ins->declaration.cb.src.reg; + vsir_register_init(reg, VKD3DSPR_CONSTBUFFER, VKD3D_DATA_FLOAT, 3); + reg->idx[0].offset = register_id; + reg->idx[1].offset = range->first; + reg->idx[2].offset = range->last; + + ins->declaration.cb.range = *range; + + return VKD3D_OK; +} + +static enum vkd3d_result sm6_parser_descriptor_type_init(struct sm6_parser *sm6, + enum vkd3d_shader_descriptor_type type, const struct sm6_metadata_node *descriptor_node) +{ + struct vkd3d_shader_register_range range; + struct vkd3d_shader_instruction *ins; + const struct sm6_metadata_node *node; + const struct sm6_metadata_value *m; + unsigned int i, register_id; + enum vkd3d_result ret; + + for (i = 0; i < descriptor_node->operand_count; ++i) + { + m = descriptor_node->operands[i]; + if (!sm6_metadata_value_is_node(m)) + { + WARN("Resource descriptor is not a node.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource descriptor is not a metadata node."); + return VKD3D_ERROR_INVALID_SHADER; + } + + node = m->u.node; + if (node->operand_count < 6) + { + WARN("Invalid operand count %u.\n", node->operand_count); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT, + "Invalid operand count %u for a descriptor.", node->operand_count); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!sm6_metadata_get_uint_value(sm6, node->operands[0], &register_id)) + { + WARN("Failed to load resource id.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource id metadata value is not an integer."); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!sm6_parser_resources_load_register_range(sm6, node, &range)) + { + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource register range is invalid."); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!(ins = sm6_parser_require_space(sm6, 1))) + { + ERR("Failed to allocate instruction.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + switch (type) + { + case VKD3D_SHADER_DESCRIPTOR_TYPE_CBV: + if ((ret = sm6_parser_resources_load_cbv(sm6, node, &range, register_id, ins)) < 0) + return ret; + break; + default: + FIXME("Unsupported descriptor type %u.\n", type); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource descriptor type %u is unsupported.", type); + return VKD3D_ERROR_INVALID_SHADER; + } + + ++sm6->p.instructions.count; + } + + return VKD3D_OK; +} + static enum vkd3d_result sm6_parser_resources_init(struct sm6_parser *sm6) { const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.resources"); enum vkd3d_shader_descriptor_type type; const struct sm6_metadata_node *node; + enum vkd3d_result ret; if (!m) return VKD3D_OK; @@ -3406,7 +3570,8 @@ static enum vkd3d_result sm6_parser_resources_init(struct sm6_parser *sm6) return VKD3D_ERROR_INVALID_SHADER; } - FIXME("Descriptor info is unhandled.\n"); + if ((ret = sm6_parser_descriptor_type_init(sm6, type, m->u.node)) < 0) + return ret; } return VKD3D_OK;

1 0

Henri Verbeet : vkd3d-utils: Implement D3DStripShader().
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: f75bdd6e217863840cc5fb3251a171ca0abe729b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f75bdd6e217863840cc5fb3251a17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 21 16:33:56 2023 +0100 vkd3d-utils: Implement D3DStripShader(). --- include/private/vkd3d_common.h | 1 + include/vkd3d_d3dcompiler.h | 11 ++++ include/vkd3d_utils.h | 2 + libs/vkd3d-utils/vkd3d_utils.map | 1 + libs/vkd3d-utils/vkd3d_utils_main.c | 94 +++++++++++++++++++++++++++++ tests/hlsl_d3d12.c | 114 ++++++++++++++++++++++++++++++++++++ 6 files changed, 223 insertions(+)

1 0

Conor McCarthy : vkd3d-shader/dxil: Validate the descriptor list metadata nodes.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: f7525bf0c6c28aad2a1b81a12ce0db56064be45e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f7525bf0c6c28aad2a1b81a12ce0d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Oct 15 13:38:11 2023 +1000 vkd3d-shader/dxil: Validate the descriptor list metadata nodes. --- libs/vkd3d-shader/dxil.c | 41 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 42 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 06faddac..4bfebea2 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -25,6 +25,7 @@ #define BITCODE_MAGIC VKD3D_MAKE_TAG('B', 'C', 0xc0, 0xde) #define DXIL_OP_MAX_OPERANDS 17 +static const unsigned int SHADER_DESCRIPTOR_TYPE_COUNT = 4; static const unsigned int dx_max_thread_group_size[3] = {1024, 1024, 64}; @@ -3374,6 +3375,43 @@ static const struct sm6_metadata_value *sm6_parser_find_named_metadata(struct sm return NULL; } +static enum vkd3d_result sm6_parser_resources_init(struct sm6_parser *sm6) +{ + const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.resources"); + enum vkd3d_shader_descriptor_type type; + const struct sm6_metadata_node *node; + + if (!m) + return VKD3D_OK; + + node = m->u.node; + if (node->operand_count != SHADER_DESCRIPTOR_TYPE_COUNT) + { + WARN("Unexpected descriptor type count %u.\n", node->operand_count); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Descriptor type count %u is invalid.", node->operand_count); + return VKD3D_ERROR_INVALID_SHADER; + } + + for (type = 0; type < SHADER_DESCRIPTOR_TYPE_COUNT; ++type) + { + if (!(m = node->operands[type])) + continue; + + if (!sm6_metadata_value_is_node(m)) + { + WARN("Resource list is not a node.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource list is not a metadata node."); + return VKD3D_ERROR_INVALID_SHADER; + } + + FIXME("Descriptor info is unhandled.\n"); + } + + return VKD3D_OK; +} + static void signature_element_read_additional_element_values(struct signature_element *e, const struct sm6_metadata_node *node, struct sm6_parser *sm6) { @@ -4176,6 +4214,9 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t if ((ret = sm6_parser_entry_point_init(sm6)) < 0) return ret; + if ((ret = sm6_parser_resources_init(sm6)) < 0) + return ret; + if ((ret = sm6_parser_module_init(sm6, &sm6->root_block, 0)) < 0) { if (ret == VKD3D_ERROR_OUT_OF_MEMORY) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e4e294d8..c9d2dec8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -180,6 +180,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT = 8015, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE = 8016, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES = 8017, + VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES = 8018, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301,

1 0

Conor McCarthy : vkd3d-shader: Emit IR CBV declaration sizes in bytes.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: 1e5f91b371dac88330962b375b09758123149d28 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1e5f91b371dac88330962b375b097… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Oct 19 13:15:46 2023 +1000 vkd3d-shader: Emit IR CBV declaration sizes in bytes. DXIL declares CBV sizes in bytes and they are not aligned to 16 bytes. --- libs/vkd3d-shader/d3d_asm.c | 4 +++- libs/vkd3d-shader/tpf.c | 2 ++ libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 197c689d..40daa535 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1626,8 +1626,10 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_CONSTANT_BUFFER: vkd3d_string_buffer_printf(buffer, " "); shader_dump_register(compiler, &ins->declaration.cb.src.reg, true); - if (shader_ver_ge(&compiler->shader_version, 5, 1)) + if (shader_ver_ge(&compiler->shader_version, 6, 0)) shader_print_subscript(compiler, ins->declaration.cb.size, NULL); + else if (shader_ver_ge(&compiler->shader_version, 5, 1)) + shader_print_subscript(compiler, ins->declaration.cb.size / VKD3D_VEC4_SIZE / sizeof(float), NULL); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); shader_dump_register_space(compiler, ins->declaration.cb.range.space); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 845b4423..0ea5a682 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -884,6 +884,8 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction ins->declaration.cb.size = *tokens++; shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.cb.range.space); } + + ins->declaration.cb.size *= VKD3D_VEC4_SIZE * sizeof(float); } static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 052edeb5..7aaec49f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -817,7 +817,7 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc if (!(d = vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, &cb->src.reg, &cb->range, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT))) return; - d->buffer_size = cb->size * 16; + d->buffer_size = cb->size; } static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_context *context,

1 0

Henri Verbeet : tests: Add basic RWTexture2DArray tests.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: 6fe781ff5052064df1d09e0f1c2743386ff9a31d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6fe781ff5052064df1d09e0f1c274… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 18 23:01:49 2023 +0200 tests: Add basic RWTexture2DArray tests. --- tests/hlsl/uav-rwtexture.shader_test | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/tests/hlsl/uav-rwtexture.shader_test b/tests/hlsl/uav-rwtexture.shader_test index 8029eef8..46cbe7ab 100644 --- a/tests/hlsl/uav-rwtexture.shader_test +++ b/tests/hlsl/uav-rwtexture.shader_test @@ -216,6 +216,24 @@ float4 main() : sv_target1 return 0; } +% RWTexture2DArray types +[pixel shader fail(sm>=6) todo] +struct s +{ + float3 a; +}; + +RWTexture2DArray<float4> u : register(u2); +RWTexture2DArray<float> u1; +RWTexture2DArray<float2x2> u2; +RWTexture2DArray<struct s> u3; + +float4 main() : sv_target1 +{ + u[int3(0, 0, 0)] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + % RWTexture3D types [pixel shader fail(sm>=6)] struct s @@ -309,6 +327,14 @@ float4 main() : sv_target1 return 0; } +[pixel shader fail] +RWTexture2DArray<Texture2D> u; + +float4 main() : sv_target1 +{ + return 0; +} + [pixel shader fail] RWTexture3D<Texture2D> u; @@ -362,6 +388,19 @@ struct s Texture2D t; }; +RWTexture2DArray<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +struct s +{ + Texture2D t; +}; + RWTexture3D<struct s> u; float4 main() : sv_target1

1 0

Henri Verbeet : vkd3d-shader/hlsl: Add support for RWTexture2DArray.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: 96556a88346b91cb0751bf868e64886e5fa71f4d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/96556a88346b91cb0751bf868e648… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 18 22:56:52 2023 +0200 vkd3d-shader/hlsl: Add support for RWTexture2DArray. --- libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 6 ++++++ tests/hlsl/uav-rwtexture.shader_test | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index e3da914e..b3d4aeee 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -111,6 +111,7 @@ RWStructuredBuffer {return KW_RWSTRUCTUREDBUFFER; } RWTexture1D {return KW_RWTEXTURE1D; } RWTexture1DArray {return KW_RWTEXTURE1DARRAY; } RWTexture2D {return KW_RWTEXTURE2D; } +RWTexture2DArray {return KW_RWTEXTURE2DARRAY; } RWTexture3D {return KW_RWTEXTURE3D; } sampler {return KW_SAMPLER; } sampler1D {return KW_SAMPLER1D; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7d645ce9..e58574f7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4724,6 +4724,7 @@ static struct hlsl_scope *get_loop_scope(struct hlsl_scope *scope) %token KW_RWTEXTURE1D %token KW_RWTEXTURE1DARRAY %token KW_RWTEXTURE2D +%token KW_RWTEXTURE2DARRAY %token KW_RWTEXTURE3D %token KW_SAMPLER %token KW_SAMPLER1D @@ -5556,6 +5557,10 @@ uav_type: { $$ = HLSL_SAMPLER_DIM_2D; } + | KW_RWTEXTURE2DARRAY + { + $$ = HLSL_SAMPLER_DIM_2DARRAY; + } | KW_RWTEXTURE3D { $$ = HLSL_SAMPLER_DIM_3D; @@ -5704,6 +5709,7 @@ type_no_void: case HLSL_SAMPLER_DIM_1D: case HLSL_SAMPLER_DIM_1DARRAY: case HLSL_SAMPLER_DIM_2D: + case HLSL_SAMPLER_DIM_2DARRAY: case HLSL_SAMPLER_DIM_3D: if ($3->class == HLSL_CLASS_ARRAY) { diff --git a/tests/hlsl/uav-rwtexture.shader_test b/tests/hlsl/uav-rwtexture.shader_test index 46cbe7ab..76535bd5 100644 --- a/tests/hlsl/uav-rwtexture.shader_test +++ b/tests/hlsl/uav-rwtexture.shader_test @@ -217,7 +217,7 @@ float4 main() : sv_target1 } % RWTexture2DArray types -[pixel shader fail(sm>=6) todo] +[pixel shader fail(sm>=6)] struct s { float3 a;

1 0

Henri Verbeet : vkd3d-shader/hlsl: Add support for RWTexture1DArray.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: 2c71c188796b3c79b96b1b8bcc52970c333afbb3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2c71c188796b3c79b96b1b8bcc529… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 18 22:49:18 2023 +0200 vkd3d-shader/hlsl: Add support for RWTexture1DArray. --- libs/vkd3d-shader/hlsl.l | 1 + libs/vkd3d-shader/hlsl.y | 6 ++++++ tests/hlsl/uav-rwtexture.shader_test | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 90abd64a..e3da914e 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -109,6 +109,7 @@ register {return KW_REGISTER; } RWBuffer {return KW_RWBUFFER; } RWStructuredBuffer {return KW_RWSTRUCTUREDBUFFER; } RWTexture1D {return KW_RWTEXTURE1D; } +RWTexture1DArray {return KW_RWTEXTURE1DARRAY; } RWTexture2D {return KW_RWTEXTURE2D; } RWTexture3D {return KW_RWTEXTURE3D; } sampler {return KW_SAMPLER; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ba738473..7d645ce9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4722,6 +4722,7 @@ static struct hlsl_scope *get_loop_scope(struct hlsl_scope *scope) %token KW_RWBUFFER %token KW_RWSTRUCTUREDBUFFER %token KW_RWTEXTURE1D +%token KW_RWTEXTURE1DARRAY %token KW_RWTEXTURE2D %token KW_RWTEXTURE3D %token KW_SAMPLER @@ -5547,6 +5548,10 @@ uav_type: { $$ = HLSL_SAMPLER_DIM_1D; } + | KW_RWTEXTURE1DARRAY + { + $$ = HLSL_SAMPLER_DIM_1DARRAY; + } | KW_RWTEXTURE2D { $$ = HLSL_SAMPLER_DIM_2D; @@ -5697,6 +5702,7 @@ type_no_void: { case HLSL_SAMPLER_DIM_BUFFER: case HLSL_SAMPLER_DIM_1D: + case HLSL_SAMPLER_DIM_1DARRAY: case HLSL_SAMPLER_DIM_2D: case HLSL_SAMPLER_DIM_3D: if ($3->class == HLSL_CLASS_ARRAY) diff --git a/tests/hlsl/uav-rwtexture.shader_test b/tests/hlsl/uav-rwtexture.shader_test index 79cb47de..8029eef8 100644 --- a/tests/hlsl/uav-rwtexture.shader_test +++ b/tests/hlsl/uav-rwtexture.shader_test @@ -181,7 +181,7 @@ float4 main() : sv_target1 } % RWTexture1DArray types -[pixel shader fail(sm>=6) todo] +[pixel shader fail(sm>=6)] struct s { float3 a;

1 0

Henri Verbeet : tests: Add basic RWTexture1DArray tests.
by Alexandre Julliard Oct. 19, 2023

Oct. 19, 2023

Module: vkd3d Branch: master Commit: ae9d29a37745b2e68af9d14fbbe75ae82094d507 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ae9d29a37745b2e68af9d14fbbe75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 18 23:00:43 2023 +0200 tests: Add basic RWTexture1DArray tests. --- tests/hlsl/uav-rwtexture.shader_test | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/tests/hlsl/uav-rwtexture.shader_test b/tests/hlsl/uav-rwtexture.shader_test index bfa2b441..79cb47de 100644 --- a/tests/hlsl/uav-rwtexture.shader_test +++ b/tests/hlsl/uav-rwtexture.shader_test @@ -180,6 +180,24 @@ float4 main() : sv_target1 return 0; } +% RWTexture1DArray types +[pixel shader fail(sm>=6) todo] +struct s +{ + float3 a; +}; + +RWTexture1DArray<float4> u : register(u2); +RWTexture1DArray<float> u1; +RWTexture1DArray<float2x2> u2; +RWTexture1DArray<struct s> u3; + +float4 main() : sv_target1 +{ + u[int2(0, 0)] = float4(11.1, 12.2, 13.3, 14.4); + return 0; +} + % RWTexture2D types [pixel shader fail(sm>=6)] struct s @@ -275,6 +293,14 @@ float4 main() : sv_target1 return 0; } +[pixel shader fail] +RWTexture1DArray<Texture2D> u; + +float4 main() : sv_target1 +{ + return 0; +} + [pixel shader fail] RWTexture2D<Texture2D> u; @@ -310,6 +336,19 @@ struct s Texture2D t; }; +RWTexture1DArray<struct s> u; + +float4 main() : sv_target1 +{ + return 0; +} + +[pixel shader fail] +struct s +{ + Texture2D t; +}; + RWTexture2D<struct s> u; float4 main() : sv_target1

1 0