February 2019 - Wine-commits

Józef Kucia : vkd3d-shader: Do not assume vec4 destination in vkd3d_dxbc_compiler_emit_store().
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: 04e2091afa27fcbbac80b95d8d3932a01c0d9735 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=04e2091afa27fcbbac80b95… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:13 2019 +0100 vkd3d-shader: Do not assume vec4 destination in vkd3d_dxbc_compiler_emit_store(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 08065f9..ac19aaf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2932,8 +2932,8 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, SpvStorageClass storage_class, unsigned int write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int component_count, dst_component_count; uint32_t type_id, dst_val_id; - unsigned int component_count; assert(write_mask); @@ -2945,13 +2945,14 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, dst_id, dst_write_mask, component_type, storage_class, write_mask, val_id); } - if (component_count != VKD3D_VEC4_SIZE) + dst_component_count = vkd3d_write_mask_component_count(dst_write_mask); + if (dst_component_count != component_count) { - type_id = vkd3d_spirv_get_type_id(builder, component_type, VKD3D_VEC4_SIZE); + type_id = vkd3d_spirv_get_type_id(builder, component_type, dst_component_count); dst_val_id = vkd3d_spirv_build_op_load(builder, type_id, dst_id, SpvMemoryAccessMaskNone); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - dst_val_id, val_id, write_mask, component_type, VKD3D_VEC4_SIZE); + dst_val_id, val_id, write_mask, component_type, dst_component_count); } vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone);

1 0

Józef Kucia : vkd3d-shader: Do not assume float type for arrayed shader outputs.
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: cb24be8e83f626bb1bf6f49ccb4542c85903b4ee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cb24be8e83f626bb1bf6f49… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:14 2019 +0100 vkd3d-shader: Do not assume float type for arrayed shader outputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ac19aaf..f1e4a71 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4081,7 +4081,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi return; } - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); + type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); mask = output_info->array_element_mask; mask &= (1u << (output->semantic_index * VKD3D_VEC4_SIZE)) - 1;

1 0

Józef Kucia : vkd3d-shader: Get rid of vkd3d_dxbc_compiler_emit_swizzle_ext().
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: 02cbc53b966ae206a7fdc3e56ffafe3a3bf8b776 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=02cbc53b966ae206a7fdc3e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:15 2019 +0100 vkd3d-shader: Get rid of vkd3d_dxbc_compiler_emit_swizzle_ext(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f1e4a71..e169aa0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2621,7 +2621,7 @@ static bool vkd3d_swizzle_is_equal(unsigned int dst_write_mask, return vkd3d_compact_swizzle(VKD3D_NO_SWIZZLE, dst_write_mask) == vkd3d_compact_swizzle(swizzle, write_mask); } -static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler *compiler, +static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *compiler, uint32_t val_id, unsigned int val_write_mask, enum vkd3d_component_type component_type, unsigned int swizzle, unsigned int write_mask) { @@ -2668,13 +2668,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler type_id, val_id, val_id, components, component_count); } -static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *compiler, - uint32_t val_id, enum vkd3d_component_type component_type, DWORD swizzle, DWORD write_mask) -{ - return vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, - val_id, VKD3DSP_WRITEMASK_ALL, component_type, swizzle, write_mask); -} - static uint32_t vkd3d_dxbc_compiler_emit_vector_shuffle(struct vkd3d_dxbc_compiler *compiler, uint32_t vector1_id, uint32_t vector2_id, uint32_t write_mask, enum vkd3d_component_type component_type, unsigned int component_count) @@ -2806,7 +2799,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); } - val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, reg_info.write_mask, reg_info.component_type, swizzle, write_mask); if (component_type != reg_info.component_type) @@ -3019,7 +3012,7 @@ static void vkd3d_dxbc_compiler_emit_store_dst_swizzled(struct vkd3d_dxbc_compil { struct vkd3d_shader_dst_param typed_dst = *dst; val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, component_type, swizzle, dst->write_mask); + val_id, VKD3DSP_WRITEMASK_ALL, component_type, swizzle, dst->write_mask); /* XXX: The register data type could be fixed by the shader parser. For SM5 * shaders the data types are stored in instructions modifiers. */ @@ -3658,7 +3651,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi val_id = vkd3d_spirv_build_op_bitcast(builder, float_type_id, val_id); } - val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, vkd3d_write_mask_from_component_count(input_component_count) << component_idx, VKD3D_TYPE_FLOAT, VKD3D_NO_SWIZZLE, dst->write_mask); @@ -4053,7 +4046,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi use_mask = (output->mask >> 8) & 0xff; swizzle = get_shader_output_swizzle(compiler, output->register_index); val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, swizzle, write_mask); + val_id, VKD3DSP_WRITEMASK_ALL, VKD3D_TYPE_FLOAT, swizzle, write_mask); component_count = vkd3d_write_mask_component_count(write_mask); @@ -4093,7 +4086,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, index++); chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, output_id, indexes, ARRAY_SIZE(indexes)); - object_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, + object_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i); vkd3d_spirv_build_op_store(builder, chain_id, object_id, SpvMemoryAccessMaskNone); } @@ -7324,7 +7317,7 @@ static void vkd3d_dxbc_compiler_emit_bufinfo(struct vkd3d_dxbc_compiler *compile val_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, 2)); } - val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, write_mask, VKD3D_TYPE_UINT, src->swizzle, dst->write_mask); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } @@ -7384,7 +7377,7 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile val_id = vkd3d_spirv_build_op_convert_utof(builder, type_id, val_id); } val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, src[1].swizzle, dst->write_mask); + val_id, VKD3DSP_WRITEMASK_ALL, VKD3D_TYPE_FLOAT, src[1].swizzle, dst->write_mask); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } @@ -7431,7 +7424,7 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com } val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, src->swizzle, dst->write_mask); + val_id, VKD3DSP_WRITEMASK_ALL, VKD3D_TYPE_FLOAT, src->swizzle, dst->write_mask); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); }

1 0

Józef Kucia : include: Add typedefs for vkd3d-shader function pointers.
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: d96076a919cc2662934276a8979909655e93e7c8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d96076a919cc2662934276a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:16 2019 +0100 include: Add typedefs for vkd3d-shader function pointers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 86 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 26 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fef058c..ed4c0a0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1,5 +1,5 @@ /* - * Copyright 2017 Józef Kucia for CodeWeavers + * Copyright 2017-2019 Józef Kucia for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -222,12 +222,6 @@ struct vkd3d_shader_domain_shader_compile_arguments enum vkd3d_tessellator_output_primitive partitioning; }; -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface_info *shader_interface_info, - const struct vkd3d_shader_compile_arguments *compile_args); -void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); - enum vkd3d_filter { VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0, @@ -405,10 +399,6 @@ struct vkd3d_root_signature_desc enum vkd3d_root_signature_flags flags; }; -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature); -void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); - enum vkd3d_root_signature_version { VKD3D_ROOT_SIGNATURE_VERSION_1_0 = 0x1, @@ -416,10 +406,6 @@ enum vkd3d_root_signature_version VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_SIGNATURE_VERSION), }; -/* FIXME: Add support for returning error messages (ID3DBlob). */ -int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, - enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); - /* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 @@ -434,9 +420,6 @@ struct vkd3d_shader_scan_info bool use_vocp; }; -int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_scan_info *scan_info); - enum vkd3d_component_type { VKD3D_TYPE_VOID = 0, @@ -489,27 +472,78 @@ struct vkd3d_shader_signature unsigned int element_count; }; -int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature); -struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( - const struct vkd3d_shader_signature *signature, const char *semantic_name, - unsigned int semantic_index, unsigned int stream_index); -void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); - /* swizzle bits fields: wwzzyyxx */ #define VKD3D_SWIZZLE_X (0u) #define VKD3D_SWIZZLE_Y (1u) #define VKD3D_SWIZZLE_Z (2u) #define VKD3D_SWIZZLE_W (3u) + #define VKD3D_SWIZZLE_MASK (0x3u) #define VKD3D_SWIZZLE_SHIFT(idx) (2u * (idx)) -#define VKD3D_SWIZZLE(x, y, z, w) (((x & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(0)) \ + +#define VKD3D_SWIZZLE(x, y, z, w) \ + (((x & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(0)) \ | ((y & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(1)) \ | ((z & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(2)) \ | ((w & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(3))) + #define VKD3D_NO_SWIZZLE \ VKD3D_SWIZZLE(VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_Y, VKD3D_SWIZZLE_Z, VKD3D_SWIZZLE_W) +#ifndef VKD3D_SHADER_NO_PROTOTYPES + +int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, + const struct vkd3d_shader_interface_info *shader_interface_info, + const struct vkd3d_shader_compile_arguments *compile_args); +void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); + +int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *root_signature); +void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); + +/* FIXME: Add support for returning error messages (ID3DBlob). */ +int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, + enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); + +int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_scan_info *scan_info); + +int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_signature *signature); +struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( + const struct vkd3d_shader_signature *signature, const char *semantic_name, + unsigned int semantic_index, unsigned int stream_index); +void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); + +#endif /* VKD3D_SHADER_NO_PROTOTYPES */ + +/* + * Function pointer typedefs for vkd3d-shader functions. + */ +typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, + const struct vkd3d_shader_interface_info *shader_interface_info, + const struct vkd3d_shader_compile_arguments *compile_args); +typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); + +typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *root_signature); +typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); + +typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, + enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); + +typedef int (*PFN_vkd3d_shader_scan_dxbc)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_scan_info *scan_info); + +typedef int (*PFN_vkd3d_shader_parse_input_signature)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_signature *signature); +typedef struct vkd3d_shader_signature_element * (*PFN_vkd3d_shader_find_signature_element)( + const struct vkd3d_shader_signature *signature, const char *semantic_name, + unsigned int semantic_index, unsigned int stream_index); +typedef void (*PFN_vkd3d_shader_free_shader_signature)(struct vkd3d_shader_signature *signature); + #ifdef __cplusplus } #endif /* __cplusplus */

1 0

Józef Kucia : tests: Add test for vkd3d shader function pointers.
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: b277b12f5ffa55e1188781c0950a9f669339f87c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b277b12f5ffa55e1188781c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:17 2019 +0100 tests: Add test for vkd3d shader function pointers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/vkd3d_shader_api.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index ec439e1..65099f2 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -52,7 +52,79 @@ static void test_invalid_shaders(void) ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } +static void test_vkd3d_shader_pfns(void) +{ + PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; + PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; + PFN_vkd3d_shader_free_shader_signature pfn_vkd3d_shader_free_shader_signature; + PFN_vkd3d_shader_parse_input_signature pfn_vkd3d_shader_parse_input_signature; + PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; + PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; + PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; + PFN_vkd3d_shader_compile_dxbc pfn_vkd3d_shader_compile_dxbc; + PFN_vkd3d_shader_scan_dxbc pfn_vkd3d_shader_scan_dxbc; + + struct vkd3d_root_signature_desc root_signature_desc; + struct vkd3d_shader_signature_element *element; + struct vkd3d_shader_scan_info scan_info; + struct vkd3d_shader_signature signature; + struct vkd3d_shader_code dxbc, spirv; + int rc; + + static const struct vkd3d_root_signature_desc empty_rs_desc; + static const DWORD vs_code[] = + { +#if 0 + float4 main(int4 p : POSITION) : SV_Position + { + return p; + } +#endif + 0x43425844, 0x3fd50ab1, 0x580a1d14, 0x28f5f602, 0xd1083e3a, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0500002b, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; + + pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; + pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; + pfn_vkd3d_shader_free_shader_signature = vkd3d_shader_free_shader_signature; + pfn_vkd3d_shader_parse_input_signature = vkd3d_shader_parse_input_signature; + pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; + pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; + pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; + pfn_vkd3d_shader_compile_dxbc = vkd3d_shader_compile_dxbc; + pfn_vkd3d_shader_scan_dxbc = vkd3d_shader_scan_dxbc; + + rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, VKD3D_ROOT_SIGNATURE_VERSION_1_0, &dxbc); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + pfn_vkd3d_shader_free_root_signature(&root_signature_desc); + pfn_vkd3d_shader_free_shader_code(&dxbc); + + rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + element = pfn_vkd3d_shader_find_signature_element(&signature, "POSITION", 0, 0); + ok(element, "Could not find shader signature element.\n"); + pfn_vkd3d_shader_free_shader_signature(&signature); + + rc = pfn_vkd3d_shader_compile_dxbc(&vs, &spirv, 0, NULL, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + pfn_vkd3d_shader_free_shader_code(&spirv); + + memset(&scan_info, 0, sizeof(scan_info)); + scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; + rc = pfn_vkd3d_shader_scan_dxbc(&vs, &scan_info); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); +} + START_TEST(vkd3d_shader_api) { run_test(test_invalid_shaders); + run_test(test_vkd3d_shader_pfns); }

1 0

Philip Rebohle : vkd3d-shader: Decorate integer fragment shader builtins as flat.
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: c560fdfa269c41fd5c9c20ef2afa8a5d6c4595ef URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c560fdfa269c41fd5c9c20e… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Sat Feb 23 15:25:51 2019 +0100 vkd3d-shader: Decorate integer fragment shader builtins as flat. >From the Vulkan spec, 8.13 "Interpolation Decorations": Fragment shader inputs that are signed or unsigned integers, integer vectors, or any double-precision floating-point type must be decorated with Flat. This also matches glslang behaviour. Specifically, this fixes tone-mapping in Unreal Engine 4 on RADV and AMDGPU-PRO, where gl_Layer is used as a fragment shader input. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 82598df..5ed4df2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3489,6 +3489,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_comp vkd3d_spirv_add_iface_variable(builder, id); vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL && storage_class == SpvStorageClassInput + && builtin->component_type != VKD3D_TYPE_FLOAT && builtin->component_type != VKD3D_TYPE_BOOL) + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); + return id; }

1 0

Józef Kucia : vkd3d-shader: Merge ifs in vkd3d_dxbc_compiler_emit_swizzle_ext().
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: 64f7ff38981b2ec13da7af07ff48e7f0c23fe727 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=64f7ff38981b2ec13da7af0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:09 2019 +0100 vkd3d-shader: Merge ifs in vkd3d_dxbc_compiler_emit_swizzle_ext(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5ed4df2..b447a13 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2633,14 +2633,11 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler val_component_count = vkd3d_write_mask_component_count(val_write_mask); if (component_count == val_component_count - && vkd3d_swizzle_is_equal(val_write_mask, swizzle, write_mask)) + && (component_count == 1 || vkd3d_swizzle_is_equal(val_write_mask, swizzle, write_mask))) return val_id; type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); - if (component_count == 1 && val_component_count == 1) - return val_id; - if (component_count == 1) { component_idx = vkd3d_write_mask_get_component_idx(write_mask);

1 0

Jacek Caban : server: Support process object type.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 2bb4d24589d5029c767801bbc39f616c309d360a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bb4d24589d5029c767801bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 13:14:05 2019 +0100 server: Support process object type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 3 +++ server/process.c | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 9ced706..bc1c6a4 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1560,6 +1560,9 @@ static void test_query_object(void) pNtClose( handle ); } pRtlFreeUnicodeString( &session ); + + test_object_type( GetCurrentProcess(), "Process" ); + test_no_file_info( GetCurrentProcess() ); } static void test_type_mismatch(void) diff --git a/server/process.c b/server/process.c index e55c8a8..77bd1e7 100644 --- a/server/process.c +++ b/server/process.c @@ -60,6 +60,7 @@ static int shutdown_stage; /* current stage in the shutdown process */ /* process operations */ static void process_dump( struct object *obj, int verbose ); +static struct object_type *process_get_type( struct object *obj ); static int process_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int process_map_access( struct object *obj, unsigned int access ); static void process_poll_event( struct fd *fd, int event ); @@ -70,7 +71,7 @@ static const struct object_ops process_ops = { sizeof(struct process), /* size */ process_dump, /* dump */ - no_get_type, /* get_type */ + process_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ process_signaled, /* signaled */ @@ -630,6 +631,13 @@ static void process_dump( struct object *obj, int verbose ) fprintf( stderr, "Process id=%04x handles=%p\n", process->id, process->handles ); } +static struct object_type *process_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'P','r','o','c','e','s','s'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + static int process_signaled( struct object *obj, struct wait_queue_entry *entry ) { struct process *process = (struct process *)obj;

1 0

Jacek Caban : server: Support thread object type.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: eea7702eb6f9236861fc7ed997c34f59b73d061e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eea7702eb6f9236861fc7ed9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 13:14:12 2019 +0100 server: Support thread object type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 3 +++ server/thread.c | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index bc1c6a4..516304e 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1563,6 +1563,9 @@ static void test_query_object(void) test_object_type( GetCurrentProcess(), "Process" ); test_no_file_info( GetCurrentProcess() ); + + test_object_type( GetCurrentThread(), "Thread" ); + test_no_file_info( GetCurrentThread() ); } static void test_type_mismatch(void) diff --git a/server/thread.c b/server/thread.c index 7162fc3..4c3d9c3 100644 --- a/server/thread.c +++ b/server/thread.c @@ -128,6 +128,7 @@ static const struct object_ops thread_apc_ops = /* thread operations */ static void dump_thread( struct object *obj, int verbose ); +static struct object_type *thread_get_type( struct object *obj ); static int thread_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int thread_map_access( struct object *obj, unsigned int access ); static void thread_poll_event( struct fd *fd, int event ); @@ -137,7 +138,7 @@ static const struct object_ops thread_ops = { sizeof(struct thread), /* size */ dump_thread, /* dump */ - no_get_type, /* get_type */ + thread_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ thread_signaled, /* signaled */ @@ -361,6 +362,13 @@ static void dump_thread( struct object *obj, int verbose ) thread->id, thread->unix_pid, thread->unix_tid, thread->state ); } +static struct object_type *thread_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'T','h','r','e','a','d'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + static int thread_signaled( struct object *obj, struct wait_queue_entry *entry ) { struct thread *mythread = (struct thread *)obj;

1 0

Jacek Caban : server: Support token object type.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: c55c4ab88c7178f92ca21813ed138a9528f04dad URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55c4ab88c7178f92ca21813… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 13:14:20 2019 +0100 server: Support token object type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 10 ++++++++++ server/token.c | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 516304e..3110dbf 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1348,6 +1348,7 @@ static void test_query_object(void) UNICODE_STRING path, session, *str; char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; LARGE_INTEGER size; + BOOL ret; sprintf( tmp_path, "\\Sessions\\%u", NtCurrentTeb()->Peb->SessionId ); pRtlCreateUnicodeStringFromAsciiz( &session, tmp_path ); @@ -1566,6 +1567,15 @@ static void test_query_object(void) test_object_type( GetCurrentThread(), "Thread" ); test_no_file_info( GetCurrentThread() ); + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &handle); + ok(ret, "OpenProcessToken failed: %u\n", GetLastError()); + + test_object_type( handle, "Token" ); + test_no_file_info( handle ); + + pNtClose(handle); + } static void test_type_mismatch(void) diff --git a/server/token.c b/server/token.c index d88f16c..e440d48 100644 --- a/server/token.c +++ b/server/token.c @@ -134,6 +134,7 @@ struct group }; static void token_dump( struct object *obj, int verbose ); +static struct object_type *token_get_type( struct object *obj ); static unsigned int token_map_access( struct object *obj, unsigned int access ); static void token_destroy( struct object *obj ); @@ -141,7 +142,7 @@ static const struct object_ops token_ops = { sizeof(struct token), /* size */ token_dump, /* dump */ - no_get_type, /* get_type */ + token_get_type, /* get_type */ no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -167,6 +168,13 @@ static void token_dump( struct object *obj, int verbose ) token->token_id.low_part, token->primary, token->impersonation_level ); } +static struct object_type *token_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'T','o','k','e','n'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + static unsigned int token_map_access( struct object *obj, unsigned int access ) { if (access & GENERIC_READ) access |= TOKEN_READ;

1 0