February 2019 - Wine-Commits

Józef Kucia : vkd3d-shader: Emit epilogue functions while leaving shader phases.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: vkd3d Branch: master Commit: 38f75846b462a9b7afa5ca81a92065c92cf7a6a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=38f75846b462a9b7afa5ca8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:11 2019 +0100 vkd3d-shader: Emit epilogue functions while leaving shader phases. 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 | 291 +++++++++++++++++++++++++--------------------- 1 file changed, 156 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=38f75846b462a9b7afa…

1 0

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

Feb. 25, 2019

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 Feb. 25, 2019

Feb. 25, 2019

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 Feb. 25, 2019

Feb. 25, 2019

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 Feb. 25, 2019

Feb. 25, 2019

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 : vkd3d-shader: Merge ifs in vkd3d_dxbc_compiler_emit_swizzle_ext().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

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

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

Feb. 25, 2019

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

Zebediah Figura : wined3d: Rename MAX_CLIP_DISTANCES to WINED3D_MAX_CLIP_DISTANCES.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 4b17bad34838d9378f952cffce32a398e04e8ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b17bad34838d9378f952cff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:53:55 2019 -0600 wined3d: Rename MAX_CLIP_DISTANCES to WINED3D_MAX_CLIP_DISTANCES. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c75b19e..acfed24 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -2870,7 +2870,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct gl_info->limits.arb_ps_temps = 0; gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_CLIP_DISTANCES, &gl_max); - gl_info->limits.user_clip_distances = min(MAX_CLIP_DISTANCES, gl_max); + gl_info->limits.user_clip_distances = min(WINED3D_MAX_CLIP_DISTANCES, gl_max); TRACE("Clip plane support - max planes %d.\n", gl_max); if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1a24a66..660005f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -257,7 +257,7 @@ struct glsl_shader_prog_link DWORD constant_update_mask; unsigned int constant_version; DWORD shader_controlled_clip_distances : 1; - DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD padding : 23; }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8faae3a..83a793d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -966,7 +966,7 @@ static HRESULT shader_calculate_clip_or_cull_distance_mask( /* Clip and cull distances are packed in 4 component registers. 0 and 1 are * the only allowed semantic indices. */ - if (e->semantic_idx >= MAX_CLIP_DISTANCES / 4) + if (e->semantic_idx >= WINED3D_MAX_CLIP_DISTANCES / 4) { *mask = 0; WARN("Invalid clip/cull distance index %u.\n", e->semantic_idx); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 50b7135..b8b02c8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -218,7 +218,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; - states->clipplane = (1u << MAX_CLIP_DISTANCES) - 1; + states->clipplane = (1u << WINED3D_MAX_CLIP_DISTANCES) - 1; states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff; states->vertexShaderConstantsB = 0xffff; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77f97a8..297a254 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -264,7 +264,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define WINED3D_MAX_VERTEX_SAMPLERS 4 #define WINED3D_MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS) #define WINED3D_MAX_ACTIVE_LIGHTS 8 -#define MAX_CLIP_DISTANCES 8 +#define WINED3D_MAX_CLIP_DISTANCES 8 #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 @@ -1009,8 +1009,8 @@ struct wined3d_shader_reg_maps DWORD uav_read_mask : 8; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ DWORD uav_counter_mask : 8; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ - DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ - DWORD cull_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ + DWORD cull_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD usesnrm : 1; DWORD vpos : 1; DWORD usesdsx : 1; @@ -1621,9 +1621,9 @@ enum wined3d_pipeline #define STATE_IS_SCISSORRECT(a) ((a) == STATE_SCISSORRECT) #define STATE_CLIPPLANE(a) (STATE_SCISSORRECT + 1 + (a)) -#define STATE_IS_CLIPPLANE(a) ((a) >= STATE_CLIPPLANE(0) && (a) <= STATE_CLIPPLANE(MAX_CLIP_DISTANCES - 1)) +#define STATE_IS_CLIPPLANE(a) ((a) >= STATE_CLIPPLANE(0) && (a) <= STATE_CLIPPLANE(WINED3D_MAX_CLIP_DISTANCES - 1)) -#define STATE_MATERIAL (STATE_CLIPPLANE(MAX_CLIP_DISTANCES)) +#define STATE_MATERIAL (STATE_CLIPPLANE(WINED3D_MAX_CLIP_DISTANCES)) #define STATE_IS_MATERIAL(a) ((a) == STATE_MATERIAL) #define STATE_RASTERIZER (STATE_MATERIAL + 1) @@ -1921,7 +1921,7 @@ struct wined3d_context DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ - DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD num_untracked_materials : 2; /* Max value 2 */ DWORD padding : 7; @@ -2939,7 +2939,7 @@ struct wined3d_state DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; - struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; + struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewports[WINED3D_MAX_VIEWPORTS]; unsigned int viewport_count; @@ -3001,7 +3001,7 @@ struct wined3d_stateblock_state DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; - struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; + struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewport; RECT scissor_rect;

1 0

Zebediah Figura : wined3d: Rename HIGHEST_TRANSFORMSTATE to WINED3D_HIGHEST_TRANSFORM_STATE.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: b3c5b7da9442af840431cd7f795da20989aad42a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3c5b7da9442af840431cd7f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:53:56 2019 -0600 wined3d: Rename HIGHEST_TRANSFORMSTATE to WINED3D_HIGHEST_TRANSFORM_STATE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d_private.h | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16a1956..4caa1e8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1550,7 +1550,7 @@ void CDECL wined3d_device_multiply_transform(struct wined3d_device *device, TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix); - if (state > HIGHEST_TRANSFORMSTATE) + if (state > WINED3D_HIGHEST_TRANSFORM_STATE) { WARN("Unhandled transform state %#x.\n", state); return; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b8b02c8..7495d21 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -214,7 +214,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->streamSource = 0xffff; states->streamFreq = 0xffff; states->textures = 0xfffff; - stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); + stateblock_set_bits(states->transform, WINED3D_HIGHEST_TRANSFORM_STATE + 1); stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; @@ -300,7 +300,7 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) } } - for (i = 0; i <= HIGHEST_TRANSFORMSTATE >> 5; ++i) + for (i = 0; i <= WINED3D_HIGHEST_TRANSFORM_STATE >> 5; ++i) { DWORD map = stateblock->changed.transform[i]; for (j = 0; map; map >>= 1, ++j) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 297a254..cd49789 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1446,7 +1446,7 @@ static inline void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_col wined3d_color->a = D3DCOLOR_B_A(d3d_color) / 255.0f; } -#define HIGHEST_TRANSFORMSTATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ +#define WINED3D_HIGHEST_TRANSFORM_STATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, const char *file, unsigned int line, const char *name) DECLSPEC_HIDDEN; @@ -2938,7 +2938,7 @@ struct wined3d_state DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; - struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; + struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewports[WINED3D_MAX_VIEWPORTS]; @@ -3000,7 +3000,7 @@ struct wined3d_stateblock_state DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; - struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; + struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewport; @@ -3565,7 +3565,7 @@ struct wined3d_vertex_declaration struct wined3d_saved_states { - DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; + DWORD transform[(WINED3D_HIGHEST_TRANSFORM_STATE >> 5) + 1]; WORD streamSource; /* WINED3D_MAX_STREAMS, 16 */ WORD streamFreq; /* WINED3D_MAX_STREAMS, 16 */ DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; @@ -3607,7 +3607,7 @@ struct wined3d_stateblock /* Contained state management */ DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; unsigned int num_contained_render_states; - DWORD contained_transform_states[HIGHEST_TRANSFORMSTATE + 1]; + DWORD contained_transform_states[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; unsigned int num_contained_transform_states; DWORD contained_vs_consts_i[WINED3D_MAX_CONSTS_I]; unsigned int num_contained_vs_consts_i;

1 0

Jacek Caban : server: Return proper object type for mailslot and device files.
by Alexandre Julliard Feb. 22, 2019

Feb. 22, 2019

Module: wine Branch: master Commit: 6531f79d8d5ff65fba37b431e0b9326cfaa1ffc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6531f79d8d5ff65fba37b431… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 22 13:14:34 2019 +0100 server: Return proper object type for mailslot and device files. 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/device.c | 2 +- server/file.c | 3 +-- server/file.h | 1 + server/mailslot.c | 4 ++-- server/named_pipe.c | 12 ++---------- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 3110dbf..3f627aa 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1500,6 +1500,7 @@ static void test_query_object(void) "name too short %s\n", wine_dbgstr_w(str->Buffer) ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + test_object_type( handle, "File" ); test_file_info( handle ); pNtClose( handle ); @@ -1858,6 +1859,8 @@ static void test_null_device(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + test_object_type(null, "File"); + SetLastError(0xdeadbeef); ret = WriteFile(null, buf, sizeof(buf), &num_bytes, NULL); ok(!ret, "WriteFile unexpectedly succeeded\n"); diff --git a/server/device.c b/server/device.c index ac7d88f..cae66d4 100644 --- a/server/device.c +++ b/server/device.c @@ -183,7 +183,7 @@ static const struct object_ops device_file_ops = { sizeof(struct device_file), /* size */ device_file_dump, /* dump */ - no_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ diff --git a/server/file.c b/server/file.c index 8d39f30..7ca650f 100644 --- a/server/file.c +++ b/server/file.c @@ -64,7 +64,6 @@ struct file static unsigned int generic_file_map_access( unsigned int access ); static void file_dump( struct object *obj, int verbose ); -static struct object_type *file_get_type( struct object *obj ); static struct fd *file_get_fd( struct object *obj ); static struct security_descriptor *file_get_sd( struct object *obj ); static int file_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); @@ -269,7 +268,7 @@ static void file_dump( struct object *obj, int verbose ) fprintf( stderr, "File fd=%p\n", file->fd ); } -static struct object_type *file_get_type( struct object *obj ) +struct object_type *file_get_type( struct object *obj ) { static const WCHAR name[] = {'F','i','l','e'}; static const struct unicode_str str = { name, sizeof(name) }; diff --git a/server/file.h b/server/file.h index 6b67866..0621b47 100644 --- a/server/file.h +++ b/server/file.h @@ -146,6 +146,7 @@ extern int get_file_unix_fd( struct file *file ); extern struct file *create_file_for_fd( int fd, unsigned int access, unsigned int sharing ); extern struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigned int sharing ); extern void file_set_error(void); +extern struct object_type *file_get_type( struct object *obj ); extern struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID *group ); extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ); diff --git a/server/mailslot.c b/server/mailslot.c index 95308c4..75a397d 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -75,7 +75,7 @@ static const struct object_ops mailslot_ops = { sizeof(struct mailslot), /* size */ mailslot_dump, /* dump */ - no_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -131,7 +131,7 @@ static const struct object_ops mail_writer_ops = { sizeof(struct mail_writer), /* size */ mail_writer_dump, /* dump */ - no_get_type, /* get_type */ + file_get_type, /* get_type */ no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ diff --git a/server/named_pipe.c b/server/named_pipe.c index 8c32ef8..101ff63 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -134,7 +134,6 @@ static const struct object_ops named_pipe_ops = /* common server and client pipe end functions */ static void pipe_end_destroy( struct object *obj ); -static struct object_type *pipe_end_get_type( struct object *obj ); static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); static struct fd *pipe_end_get_fd( struct object *obj ); static struct security_descriptor *pipe_end_get_sd( struct object *obj ); @@ -156,7 +155,7 @@ static const struct object_ops pipe_server_ops = { sizeof(struct pipe_server), /* size */ pipe_server_dump, /* dump */ - pipe_end_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -197,7 +196,7 @@ static const struct object_ops pipe_client_ops = { sizeof(struct pipe_end), /* size */ pipe_client_dump, /* dump */ - pipe_end_get_type, /* get_type */ + file_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -341,13 +340,6 @@ static void named_pipe_destroy( struct object *obj) free_async_queue( &pipe->waiters ); } -static struct object_type *pipe_end_get_type( struct object *obj ) -{ - static const WCHAR name[] = {'F','i','l','e'}; - static const struct unicode_str str = { name, sizeof(name) }; - return get_object_type( &str ); -} - static struct fd *pipe_end_get_fd( struct object *obj ) { struct pipe_end *pipe_end = (struct pipe_end *) obj;

1 0