September 2018 - Wine-commits

Józef Kucia : tests: Add tests for continue shader instructions.
by Alexandre Julliard 24 Sep '18

24 Sep '18

Module: vkd3d Branch: master Commit: c54752102217b71cf06a10803999dc32a688b020 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c54752102217b71cf06a108… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 10:25:21 2018 +0200 tests: Add tests for continue shader instructions. 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/d3d12.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9bb6861..49e3b23 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5632,6 +5632,84 @@ static void test_shader_instructions(void) 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_breakc_z = {ps_breakc_z_code, sizeof(ps_breakc_z_code)}; + static const DWORD ps_continue_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + + for (uint i = 0; i < 255; ++i) + { + if (i == 10) + continue; + ++counter; + } + + return float4(counter, 0.0f, 0.0f, 0.0f); + } +#endif + 0x43425844, 0x8cab8e1f, 0x527560f9, 0x04eb888b, 0x20d89b05, 0x00000001, 0x000001c4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x0000014c, 0x00000050, 0x00000053, + 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x05000036, 0x00100022, + 0x00000000, 0x00004001, 0x0000000b, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x07000050, 0x00100012, 0x00000001, 0x0010002a, + 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010000a, 0x00000001, 0x07000020, 0x00100012, + 0x00000001, 0x0010002a, 0x00000000, 0x00004001, 0x0000000a, 0x0304001f, 0x0010000a, 0x00000001, + 0x05000036, 0x00100012, 0x00000000, 0x0010003a, 0x00000000, 0x05000036, 0x001000c2, 0x00000000, + 0x00100156, 0x00000000, 0x01000007, 0x01000015, 0x0700001e, 0x00100082, 0x00000000, 0x0010003a, + 0x00000000, 0x00004001, 0x00000001, 0x0700001e, 0x00100042, 0x00000000, 0x0010002a, 0x00000000, + 0x00004001, 0x00000001, 0x01000016, 0x05000056, 0x00102012, 0x00000000, 0x0010003a, 0x00000000, + 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_continue = {ps_continue_code, sizeof(ps_continue_code)}; + static const DWORD ps_continuec_nz_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + + for (uint i = 0; i < 255; ++i) + { + ++counter; + if (i % 2 == 0) + continue; + ++counter; + if (i != 0) + continue; + ++counter; + } + + return float4(counter, 0.0f, 0.0f, 0.0f); + } +#endif + /* compiled with /Gfa */ + 0x43425844, 0xf35d8ce6, 0x54988f56, 0x5848863e, 0xa1618498, 0x00000001, 0x00000278, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x00000200, 0x00000050, 0x00000080, + 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000036, 0x00100032, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x07000050, + 0x00100042, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, + 0x00000000, 0x0700001e, 0x00100042, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001, + 0x07000001, 0x00100082, 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x0700001e, + 0x00100012, 0x00000001, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x09000037, 0x00100022, + 0x00000001, 0x0010003a, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000001, 0x05000036, + 0x00100012, 0x00000000, 0x0010002a, 0x00000000, 0x05000036, 0x00100022, 0x00000000, 0x0010001a, + 0x00000001, 0x03000008, 0x0010003a, 0x00000000, 0x0700001e, 0x00100042, 0x00000000, 0x0010000a, + 0x00000000, 0x00004001, 0x00000002, 0x07000027, 0x00100082, 0x00000000, 0x0010001a, 0x00000000, + 0x00004001, 0x00000000, 0x09000037, 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, + 0x00000001, 0x00004001, 0x00000000, 0x05000036, 0x00100032, 0x00000000, 0x00100a66, 0x00000000, + 0x03040008, 0x0010003a, 0x00000000, 0x0700001e, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x00004001, 0x00000003, 0x05000036, 0x00100022, 0x00000000, 0x0010000a, 0x00000001, 0x01000016, + 0x05000056, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_continuec_nz = {ps_continuec_nz_code, sizeof(ps_continuec_nz_code)}; static const DWORD ps_src_modifiers_code[] = { #if 0 @@ -6646,6 +6724,7 @@ static void test_shader_instructions(void) struct uvec4 u; struct ivec4 i; } output; + bool skip_on_warp; } tests[] = { @@ -6733,6 +6812,9 @@ static void test_shader_instructions(void) {&ps_breakc_nz, {}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, {&ps_breakc_z, {}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_continue, {}, {{254.0f}}, TRUE}, + {&ps_continuec_nz, {}, {{509.0f}}}, + {&ps_src_modifiers, {{ 1.0f, 1.0f, 1.0f, 2.0f}}, {{-1.0f, 1.0f, -1.0f, -2.0f}}}, {&ps_src_modifiers, {{-1.0f, -1.0f, -1.0f, -2.0f}}, {{ 1.0f, 1.0f, -1.0f, -2.0f}}}, @@ -7384,6 +7466,12 @@ static void test_shader_instructions(void) current_ps = NULL; for (i = 0; i < ARRAY_SIZE(tests); ++i) { + if (tests[i].skip_on_warp && use_warp_device) + { + skip("Skipping shader test on WARP.\n"); + continue; + } + if (current_ps != tests[i].ps) { if (context.pipeline_state)

1 0

Józef Kucia : vkd3d-shader: Find innermost loops for breakc instructions.
by Alexandre Julliard 24 Sep '18

24 Sep '18

Module: vkd3d Branch: master Commit: 01ef2ceced0bd39f9d6795b7770ef6f257c29fb8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=01ef2ceced0bd39f9d6795b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 10:25:22 2018 +0200 vkd3d-shader: Find innermost loops for breakc instructions. 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 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 86f8ff6..f311147 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5108,12 +5108,19 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ } case VKD3DSIH_BREAKP: - assert(compiler->control_flow_depth); - assert(cf_info->current_block == VKD3D_BLOCK_LOOP); + { + struct vkd3d_control_flow_info *loop_cf_info; + + if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) + { + ERR("Invalid 'breakc' instruction outside loop.\n"); + return; + } vkd3d_dxbc_compiler_emit_conditional_branch(compiler, - instruction, cf_info->u.loop.merge_block_id); + instruction, loop_cf_info->u.loop.merge_block_id); break; + } case VKD3DSIH_CONTINUE: {

1 0

Józef Kucia : vkd3d-shader: Translate gather4_c instructions.
by Alexandre Julliard 24 Sep '18

24 Sep '18

Module: vkd3d Branch: master Commit: a553eb1afed1a224559c3566cc5c986a9c8cf5ae URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a553eb1afed1a224559c356… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 10:25:23 2018 +0200 vkd3d-shader: Translate gather4_c instructions. 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 | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f311147..a183d65 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1353,6 +1353,15 @@ static uint32_t vkd3d_spirv_build_op_image_gather(struct vkd3d_spirv_builder *bu operands, ARRAY_SIZE(operands), image_operands_mask, image_operands, image_operand_count); } +static uint32_t vkd3d_spirv_build_op_image_dref_gather(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t sampled_image_id, uint32_t coordinate_id, uint32_t dref_id, + uint32_t image_operands_mask, const uint32_t *image_operands, unsigned int image_operand_count) +{ + const uint32_t operands[] = {sampled_image_id, coordinate_id, dref_id}; + return vkd3d_spirv_build_image_instruction(builder, SpvOpImageDrefGather, result_type, + operands, ARRAY_SIZE(operands), image_operands_mask, image_operands, image_operand_count); +} + static uint32_t vkd3d_spirv_build_op_image_fetch(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t image_id, uint32_t coordinate_id, uint32_t image_operands_mask, const uint32_t *image_operands, unsigned int image_operand_count) @@ -5415,7 +5424,7 @@ static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - uint32_t sampled_type_id, coordinate_id, ref_id, val_id, type_id; + uint32_t sampled_type_id, coordinate_id, dref_id, val_id, type_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; @@ -5444,13 +5453,13 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_DEPTH); sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); - ref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); + dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); /* XXX: Nvidia is broken and expects that the D_ref is packed together with coordinates. */ type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); coordinate_id = vkd3d_spirv_build_op_composite_insert(builder, - type_id, ref_id, coordinate_id, &image.resource_type_info->coordinate_component_count, 1); + type_id, dref_id, coordinate_id, &image.resource_type_info->coordinate_component_count, 1); val_id = vkd3d_spirv_build_op_image_sample_dref(builder, op, sampled_type_id, - image.sampled_image_id, coordinate_id, ref_id, operands_mask, + image.sampled_image_id, coordinate_id, dref_id, operands_mask, image_operands, image_operand_count); vkd3d_dxbc_compiler_emit_store_dst_scalar(compiler, @@ -5460,8 +5469,8 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + uint32_t sampled_type_id, coordinate_id, component_id, dref_id, val_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t sampled_type_id, coordinate_id, component_id, val_id; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; const struct vkd3d_shader_src_param *resource, *sampler; @@ -5475,10 +5484,6 @@ static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compile resource = &src[1]; sampler = &src[2]; - component_idx = vkd3d_swizzle_get_component(sampler->swizzle, 0); - /* Nvidia driver requires signed integer type. */ - component_id = vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_INT, 1, &component_idx); - vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, &resource->reg, &sampler->reg, VKD3D_IMAGE_FLAG_NONE); @@ -5492,9 +5497,22 @@ static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compile sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); - val_id = vkd3d_spirv_build_op_image_gather(builder, sampled_type_id, - image.sampled_image_id, coordinate_id, component_id, - operands_mask, image_operands, image_operand_count); + if (instruction->handler_idx == VKD3DSIH_GATHER4_C) + { + dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); + val_id = vkd3d_spirv_build_op_image_dref_gather(builder, sampled_type_id, + image.sampled_image_id, coordinate_id, dref_id, + operands_mask, image_operands, image_operand_count); + } + else + { + component_idx = vkd3d_swizzle_get_component(sampler->swizzle, 0); + /* Nvidia driver requires signed integer type. */ + component_id = vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_INT, 1, &component_idx); + val_id = vkd3d_spirv_build_op_image_gather(builder, sampled_type_id, + image.sampled_image_id, coordinate_id, component_id, + operands_mask, image_operands, image_operand_count); + } vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, dst, val_id, image.sampled_type, resource->swizzle); @@ -6363,6 +6381,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_sample_c(compiler, instruction); break; case VKD3DSIH_GATHER4: + case VKD3DSIH_GATHER4_C: vkd3d_dxbc_compiler_emit_gather4(compiler, instruction); break; case VKD3DSIH_LD_RAW:

1 0

Józef Kucia : vkd3d-shader: Translate gather4_po instructions.
by Alexandre Julliard 24 Sep '18

24 Sep '18

Module: vkd3d Branch: master Commit: 5319cc242075ce47bcf022ab44bb0d2c5916f795 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5319cc242075ce47bcf022a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 10:25:24 2018 +0200 vkd3d-shader: Translate gather4_po instructions. 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 | 30 +++++++++++++++++++++++------- tests/d3d12.c | 4 ++-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a183d65..a3e8c39 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5469,25 +5469,38 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + const struct vkd3d_shader_src_param *addr, *offset, *resource, *sampler; uint32_t sampled_type_id, coordinate_id, component_id, dref_id, val_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - const struct vkd3d_shader_src_param *resource, *sampler; SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; unsigned int component_idx; uint32_t image_operands[1]; DWORD coordinate_mask; + bool extended_offset; - resource = &src[1]; - sampler = &src[2]; + extended_offset = instruction->handler_idx == VKD3DSIH_GATHER4_PO + || instruction->handler_idx == VKD3DSIH_GATHER4_PO_C; + + addr = &src[0]; + offset = extended_offset ? &src[1] : NULL; + resource = &src[1 + extended_offset]; + sampler = &src[2 + extended_offset]; vkd3d_dxbc_compiler_prepare_sampled_image(compiler, &image, &resource->reg, &sampler->reg, VKD3D_IMAGE_FLAG_NONE); - if (vkd3d_shader_instruction_has_texel_offset(instruction)) + if (offset) + { + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageGatherExtended); + operands_mask |= SpvImageOperandsOffsetMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, + offset, (1u << image.resource_type_info->offset_component_count) - 1); + } + else if (vkd3d_shader_instruction_has_texel_offset(instruction)) { operands_mask |= SpvImageOperandsConstOffsetMask; image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, @@ -5496,10 +5509,11 @@ static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compile sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; - coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); + coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, addr, coordinate_mask); if (instruction->handler_idx == VKD3DSIH_GATHER4_C) { - dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); + dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, + &src[3 + extended_offset], VKD3DSP_WRITEMASK_0); val_id = vkd3d_spirv_build_op_image_dref_gather(builder, sampled_type_id, image.sampled_image_id, coordinate_id, dref_id, operands_mask, image_operands, image_operand_count); @@ -5508,7 +5522,8 @@ static void vkd3d_dxbc_compiler_emit_gather4(struct vkd3d_dxbc_compiler *compile { component_idx = vkd3d_swizzle_get_component(sampler->swizzle, 0); /* Nvidia driver requires signed integer type. */ - component_id = vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_INT, 1, &component_idx); + component_id = vkd3d_dxbc_compiler_get_constant(compiler, + VKD3D_TYPE_INT, 1, &component_idx); val_id = vkd3d_spirv_build_op_image_gather(builder, sampled_type_id, image.sampled_image_id, coordinate_id, component_id, operands_mask, image_operands, image_operand_count); @@ -6382,6 +6397,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler break; case VKD3DSIH_GATHER4: case VKD3DSIH_GATHER4_C: + case VKD3DSIH_GATHER4_PO: vkd3d_dxbc_compiler_emit_gather4(compiler, instruction); break; case VKD3DSIH_LD_RAW: diff --git a/tests/d3d12.c b/tests/d3d12.c index 49e3b23..5f2d2d8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9870,7 +9870,7 @@ static void test_gather(void) { const struct vec4 *expected = &expected_gather4_offset[y * rb.width + x]; const struct vec4 *got = get_readback_vec4(&rb, x, y); - todo(compare_vec4(got, expected, 0), + ok(compare_vec4(got, expected, 0), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w); } @@ -9906,7 +9906,7 @@ static void test_gather(void) { const struct vec4 *expected = &expected_gather4[y * rb.width + x]; const struct vec4 *got = get_readback_vec4(&rb, x, y); - todo(compare_vec4(got, expected, 0), + ok(compare_vec4(got, expected, 0), "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", got->x, got->y, got->z, got->w, expected->x, expected->y, expected->z, expected->w); }

1 0

Józef Kucia : vkd3d-shader: Promote immediate scalar constants to vectors.
by Alexandre Julliard 24 Sep '18

24 Sep '18

Module: vkd3d Branch: master Commit: 62628dd90d8f34a770686db73b802815ed435822 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=62628dd90d8f34a770686db… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 10:25:17 2018 +0200 vkd3d-shader: Promote immediate scalar constants to vectors. 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 ++-- tests/d3d12.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 964bc49..6fabeb2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2537,8 +2537,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compile if (reg->immconst_type == VKD3D_IMMCONST_SCALAR) { - assert(component_count == 1); - values[0] = *reg->u.immconst_uint; + for (i = 0; i < component_count; ++i) + values[i] = *reg->u.immconst_uint; } else { diff --git a/tests/d3d12.c b/tests/d3d12.c index 808562e..9bb6861 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6136,6 +6136,24 @@ static void test_shader_instructions(void) 0x00000001, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_ishl = {ps_ishl_code, sizeof(ps_ishl_code)}; + static const DWORD ps_ishl_const_code[] = + { +#if 0 + uint4 src; + + void main(out uint4 dst : SV_Target) + { + dst = src << 2; + } +#endif + 0x43425844, 0x5b749bf4, 0xe24de3dc, 0xbbd75bc9, 0xc6fc9eca, 0x00000001, 0x000000c0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000048, 0x00000040, 0x00000012, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x08000029, + 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_ishl_const = {ps_ishl_const_code, sizeof(ps_ishl_const_code)}; static const DWORD ps_not_code[] = { #if 0 @@ -6956,6 +6974,11 @@ static void test_shader_instructions(void) {&ps_ishl, {{{0x00000001, 0x00000001, 0x00000001, 0x800feac1}, { 31, 7, 15, 11}}}, {{0x80000000, 0x00000080, 0x00008000, 0x7f560800}}}, + {&ps_ishl_const, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, + {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, + {&ps_ishl_const, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}}, + {{0xfffffffc, 0xfffffffc, 0xfffffffc, 0xfffffffc}}}, + {&ps_not, {{{0x00000000, 0xffffffff}}}, {{0xffffffff, 0x00000000, 0x00000000, 0xffffffff}}}, {&ps_not, {{{0xf0f0f0f0, 0x0f0f0f0f}}}, {{0x0f0f0f0f, 0xf0f0f0f0, 0xf0f0f0f0, 0x0f0f0f0f}}},

1 0

Józef Kucia : vkd3d-shader: Translate ineg instructions.
by Alexandre Julliard 24 Sep '18

24 Sep '18

Module: vkd3d Branch: master Commit: a970f71581d20b949f2a8d4fd2a1c53b610475ec URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a970f71581d20b949f2a8d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 10:25:18 2018 +0200 vkd3d-shader: Translate ineg instructions. 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, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6fabeb2..d19d899 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4186,6 +4186,7 @@ static SpvOp vkd3d_dxbc_compiler_map_alu_instruction(const struct vkd3d_shader_i {VKD3DSIH_FTOI, SpvOpConvertFToS}, {VKD3DSIH_FTOU, SpvOpConvertFToU}, {VKD3DSIH_IADD, SpvOpIAdd}, + {VKD3DSIH_INEG, SpvOpSNegate}, {VKD3DSIH_ISHL, SpvOpShiftLeftLogical}, {VKD3DSIH_ISHR, SpvOpShiftRightArithmetic}, {VKD3DSIH_ITOF, SpvOpConvertSToF}, @@ -6198,6 +6199,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_FTOI: case VKD3DSIH_FTOU: case VKD3DSIH_IADD: + case VKD3DSIH_INEG: case VKD3DSIH_ISHL: case VKD3DSIH_ISHR: case VKD3DSIH_ITOF:

1 0

Józef Kucia : vkd3d-shader: Translate continue instructions.
by Alexandre Julliard 24 Sep '18

24 Sep '18

Module: vkd3d Branch: master Commit: 79339d153a512c5f69204f05b7739aa30ff5e84e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=79339d153a512c5f69204f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 10:25:19 2018 +0200 vkd3d-shader: Translate continue instructions. 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 | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d19d899..b96b69e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4850,6 +4850,20 @@ static void vkd3d_dxbc_compiler_pop_control_flow_level(struct vkd3d_dxbc_compile memset(cf_info, 0, sizeof(*cf_info)); } +static struct vkd3d_control_flow_info *vkd3d_dxbc_compiler_find_innermost_loop( + struct vkd3d_dxbc_compiler *compiler) +{ + int depth; + + for (depth = compiler->control_flow_depth - 1; depth >= 0; --depth) + { + if (compiler->control_flow_info[depth].current_block == VKD3D_BLOCK_LOOP) + return &compiler->control_flow_info[depth]; + } + + return NULL; +} + static struct vkd3d_control_flow_info *vkd3d_dxbc_compiler_find_innermost_breakable_cf_construct( struct vkd3d_dxbc_compiler *compiler) { @@ -5079,8 +5093,6 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ return; } - assert(compiler->control_flow_depth); - if (breakable_cf_info->current_block == VKD3D_BLOCK_LOOP) { vkd3d_spirv_build_op_branch(builder, breakable_cf_info->u.loop.merge_block_id); @@ -5102,6 +5114,22 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ vkd3d_dxbc_compiler_emit_breakc(compiler, instruction, cf_info->u.loop.merge_block_id); break; + case VKD3DSIH_CONTINUE: + { + struct vkd3d_control_flow_info *loop_cf_info; + + if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) + { + ERR("Invalid 'continue' instruction outside loop.\n"); + return; + } + + vkd3d_spirv_build_op_branch(builder, loop_cf_info->u.loop.continue_block_id); + + cf_info->inside_block = false; + break; + } + case VKD3DSIH_RET: vkd3d_dxbc_compiler_emit_return(compiler, instruction); @@ -6278,6 +6306,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_BREAK: case VKD3DSIH_BREAKP: case VKD3DSIH_CASE: + case VKD3DSIH_CONTINUE: case VKD3DSIH_DEFAULT: case VKD3DSIH_ELSE: case VKD3DSIH_ENDIF:

1 0

Zebediah Figura : quartz/filtergraph: Try other output pins if one shouldn 't be rendered.
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: wine Branch: master Commit: 1922272225585ed6c89ff66995af9d15eb464e5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1922272225585ed6c89ff669… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 20 23:34:12 2018 -0500 quartz/filtergraph: Try other output pins if one shouldn't be rendered. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 3 +-- dlls/quartz/tests/filtergraph.c | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c4ba644..c1b7e5b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1059,8 +1059,7 @@ static HRESULT connect_output_pin(IFilterGraphImpl *graph, IBaseFilter *filter, { TRACE("Skipping non-rendered pin %s.\n", debugstr_w(info.achName)); IPin_Release(pin); - IEnumPins_Release(enumpins); - return E_FAIL; + continue; } if (SUCCEEDED(IFilterGraph2_Connect(&graph->IFilterGraph2_iface, pin, sink))) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 9ef229f..30bf0cc 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1783,11 +1783,9 @@ todo_wine parser1.pin_count = 3; hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); ok(sink_pin.peer == &parser1_pins[2].IPin_iface, "Got peer %p.\n", sink_pin.peer); -} IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer);

1 0

Zebediah Figura : quartz/filtergraph: Simplify FilterGraph2_RenderRecurse( ).
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: wine Branch: master Commit: c1af822758b5be9bf6566a8cde4e93bce48355ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1af822758b5be9bf6566a8c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 20 23:34:13 2018 -0500 quartz/filtergraph: Simplify FilterGraph2_RenderRecurse(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c1b7e5b..969cbec 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1360,47 +1360,37 @@ out: return SUCCEEDED(hr) ? S_OK : hr; } -static HRESULT FilterGraph2_RenderRecurse(IFilterGraphImpl *This, IPin *ppinOut) +/* Render all output pins of the given filter. Helper for FilterGraph2_Render(). */ +static HRESULT render_output_pins(IFilterGraphImpl *graph, IBaseFilter *filter) { - /* This pin has been connected now, try to call render on all pins that aren't connected */ - IPin *to = NULL; - PIN_INFO info; - IEnumPins *enumpins = NULL; BOOL renderany = FALSE; BOOL renderall = TRUE; + IEnumPins *enumpins; + IPin *pin, *peer; - IPin_QueryPinInfo(ppinOut, &info); - - IBaseFilter_EnumPins(info.pFilter, &enumpins); - /* Don't need to hold a reference, IEnumPins does */ - IBaseFilter_Release(info.pFilter); - - IEnumPins_Reset(enumpins); - while (IEnumPins_Next(enumpins, 1, &to, NULL) == S_OK) + IBaseFilter_EnumPins(filter, &enumpins); + while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) { PIN_DIRECTION dir = PINDIR_INPUT; - IPin_QueryDirection(to, &dir); + IPin_QueryDirection(pin, &dir); if (dir == PINDIR_OUTPUT) { - IPin *out = NULL; - - IPin_ConnectedTo(to, &out); - if (!out) + if (IPin_ConnectedTo(pin, &peer) == VFW_E_NOT_CONNECTED) { HRESULT hr; - hr = IFilterGraph2_Render(&This->IFilterGraph2_iface, to); + hr = IFilterGraph2_Render(&graph->IFilterGraph2_iface, pin); if (SUCCEEDED(hr)) renderany = TRUE; else renderall = FALSE; } else - IPin_Release(out); + IPin_Release(peer); } - IPin_Release(to); + IPin_Release(pin); } IEnumPins_Release(enumpins); @@ -1496,7 +1486,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) TRACE("Connected successfully %p/%p, %08x look if we should render more!\n", ppinOut, pin, hr); IPin_Release(pin); - hr = FilterGraph2_RenderRecurse(This, pin); + hr = render_output_pins(This, filter->filter); if (FAILED(hr)) { IPin_Disconnect(ppinOut); @@ -1646,7 +1636,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) VariantClear(&var); - hr = FilterGraph2_RenderRecurse(This, ppinfilter); + hr = render_output_pins(This, pfilter); if (FAILED(hr)) { WARN("Unable to connect recursively (%x)\n", hr); goto error;

1 0

Zebediah Figura : quartz/filtergraph: Don' t recursively render pins whose names begin with ~.
by Alexandre Julliard 21 Sep '18

21 Sep '18

Module: wine Branch: master Commit: 42929b75fce15e79de472b3379acb9fd9b26e24e URL: https://source.winehq.org/git/wine.git/?a=commit;h=42929b75fce15e79de472b33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 20 23:34:14 2018 -0500 quartz/filtergraph: Don't recursively render pins whose names begin with ~. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 16 +++++++++++----- dlls/quartz/tests/filtergraph.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 969cbec..4f3e0a7 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1367,16 +1367,22 @@ static HRESULT render_output_pins(IFilterGraphImpl *graph, IBaseFilter *filter) BOOL renderall = TRUE; IEnumPins *enumpins; IPin *pin, *peer; + PIN_INFO info; IBaseFilter_EnumPins(filter, &enumpins); while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) { - PIN_DIRECTION dir = PINDIR_INPUT; - - IPin_QueryDirection(pin, &dir); - - if (dir == PINDIR_OUTPUT) + IPin_QueryPinInfo(pin, &info); + IBaseFilter_Release(info.pFilter); + if (info.dir == PINDIR_OUTPUT) { + if (info.achName[0] == '~') + { + TRACE("Skipping non-rendered pin %s.\n", debugstr_w(info.achName)); + IPin_Release(pin); + continue; + } + if (IPin_ConnectedTo(pin, &peer) == VFW_E_NOT_CONNECTED) { HRESULT hr; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 30bf0cc..6c8b9fa 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1485,6 +1485,8 @@ static void test_graph_builder_render(void) ok(parser_pins[1].peer == &sink1_pin.IPin_iface, "Got peer %p.\n", parser_pins[1].peer); IFilterGraph2_Disconnect(graph, source_pin.peer); IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + IFilterGraph2_Disconnect(graph, parser_pins[0].peer); + IFilterGraph2_Disconnect(graph, &parser_pins[0].IPin_iface); IFilterGraph2_RemoveFilter(graph, &sink1.IBaseFilter_iface); IFilterGraph2_AddFilter(graph, &sink1.IBaseFilter_iface, NULL); @@ -1492,6 +1494,32 @@ static void test_graph_builder_render(void) hr = IFilterGraph2_Render(graph, &source_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source_pin.peer == &sink1_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + IFilterGraph2_Disconnect(graph, source_pin.peer); + IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + + /* A pin whose name (not ID) begins with a tilde is not rendered. */ + + IFilterGraph2_RemoveFilter(graph, &sink2.IBaseFilter_iface); + IFilterGraph2_RemoveFilter(graph, &parser.IBaseFilter_iface); + IFilterGraph2_AddFilter(graph, &parser.IBaseFilter_iface, NULL); + + parser_pins[1].name[0] = '~'; + hr = IFilterGraph2_Render(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &parser_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!parser_pins[1].peer, "Got peer %p.\n", parser_pins[1].peer); + ok(!sink1_pin.peer, "Got peer %p.\n", sink1_pin.peer); + IFilterGraph2_Disconnect(graph, source_pin.peer); + IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + + parser_pins[1].name[0] = 0; + parser_pins[1].id[0] = '~'; + hr = IFilterGraph2_Render(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &parser_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(parser_pins[1].peer == &sink1_pin.IPin_iface, "Got peer %p.\n", parser_pins[1].peer); + IFilterGraph2_Disconnect(graph, source_pin.peer); + IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0