September 2018 - Wine-devel

[PATCH 1/6] dxgi: Introduce wined3d_feature_level_from_d3d() helper function.
by Józef Kucia 24 Sep '18

24 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/utils.c | 75 ++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index aed62a4a3b36..e857a1f090f5 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -621,27 +621,36 @@ HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, return hr; } -D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, - const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) +static enum wined3d_feature_level wined3d_feature_level_from_d3d(D3D_FEATURE_LEVEL feature_level) { - static const struct + switch (feature_level) { - D3D_FEATURE_LEVEL d3d; - enum wined3d_feature_level wined3d; + case D3D_FEATURE_LEVEL_11_1: + return WINED3D_FEATURE_LEVEL_11; + case D3D_FEATURE_LEVEL_11_0: + return WINED3D_FEATURE_LEVEL_11; + case D3D_FEATURE_LEVEL_10_1: + return WINED3D_FEATURE_LEVEL_10; + case D3D_FEATURE_LEVEL_10_0: + return WINED3D_FEATURE_LEVEL_10; + case D3D_FEATURE_LEVEL_9_3: + return WINED3D_FEATURE_LEVEL_9_SM3; + case D3D_FEATURE_LEVEL_9_2: + return WINED3D_FEATURE_LEVEL_9_SM2; + case D3D_FEATURE_LEVEL_9_1: + return WINED3D_FEATURE_LEVEL_9_SM2; + default: + FIXME("Unhandled feature level %#x.\n", feature_level); + return 0; } - wined3d_feature_levels[] = - { - {D3D_FEATURE_LEVEL_11_1, WINED3D_FEATURE_LEVEL_11}, - {D3D_FEATURE_LEVEL_11_0, WINED3D_FEATURE_LEVEL_11}, - {D3D_FEATURE_LEVEL_10_1, WINED3D_FEATURE_LEVEL_10}, - {D3D_FEATURE_LEVEL_10_0, WINED3D_FEATURE_LEVEL_10}, - {D3D_FEATURE_LEVEL_9_3, WINED3D_FEATURE_LEVEL_9_SM3}, - {D3D_FEATURE_LEVEL_9_2, WINED3D_FEATURE_LEVEL_9_SM2}, - {D3D_FEATURE_LEVEL_9_1, WINED3D_FEATURE_LEVEL_9_SM2}, - }; - D3D_FEATURE_LEVEL selected_feature_level = 0; +} + +D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, struct dxgi_adapter *adapter, + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) +{ + enum wined3d_feature_level wined3d_feature_level; struct wined3d_caps caps; - unsigned int i, j; + unsigned int i; HRESULT hr; wined3d_mutex_lock(); @@ -653,31 +662,19 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, for (i = 0; i < level_count; ++i) { - for (j = 0; j < ARRAY_SIZE(wined3d_feature_levels); ++j) + wined3d_feature_level = wined3d_feature_level_from_d3d(feature_levels[i]); + if (wined3d_feature_level && caps.max_feature_level >= wined3d_feature_level) { - if (feature_levels[i] == wined3d_feature_levels[j].d3d) - { - if (caps.max_feature_level >= wined3d_feature_levels[j].wined3d) - { - selected_feature_level = feature_levels[i]; - TRACE("Choosing supported feature level %s.\n", - debug_feature_level(selected_feature_level)); - } - break; - } + TRACE("Choosing supported feature level %s.\n", + debug_feature_level(feature_levels[i])); + return feature_levels[i]; } - if (selected_feature_level) - break; - if (j == ARRAY_SIZE(wined3d_feature_levels)) - FIXME("Unexpected feature level %#x.\n", feature_levels[i]); - else - TRACE("Feature level %s not supported, trying next fallback if available.\n", - debug_feature_level(feature_levels[i])); + TRACE("Feature level %s not supported, trying next fallback if available.\n", + debug_feature_level(feature_levels[i])); } - if (!selected_feature_level) - FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " - "with the current shader backend.\n"); - return selected_feature_level; + FIXME_(winediag)("None of the requested D3D feature levels is supported on this GPU " + "with the current shader backend.\n"); + return 0; } -- 2.16.4

2 1

[PATCH vkd3d 5/8] tests: Add tests for continue shader instructions.
by Józef Kucia 24 Sep '18

24 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9bb6861f7757..49e3b2371d4a 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) -- 2.16.4

2 1

[PATCH vkd3d 7/8] vkd3d-shader: Translate gather4_c instructions.
by Józef Kucia 24 Sep '18

24 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 f3111477d43f..a183d653f225 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: -- 2.16.4

2 1

[PATCH vkd3d 8/8] vkd3d-shader: Translate gather4_po instructions.
by Józef Kucia 24 Sep '18

24 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 a183d653f225..a3e8c3977b38 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 49e3b2371d4a..5f2d2d8e50bf 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); } -- 2.16.4

2 1

[PATCH vkd3d 6/8] vkd3d-shader: Find innermost loops for breakc instructions.
by Józef Kucia 24 Sep '18

24 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 86f8ff62c6ca..f3111477d43f 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: { -- 2.16.4

2 1

[PATCH vkd3d 4/8] vkd3d-shader: Translate continuec instructions.
by Józef Kucia 24 Sep '18

24 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b96b69e83934..86f8ff62c6ca 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4761,7 +4761,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst->reg, dst->write_mask, result_id); } -static void vkd3d_dxbc_compiler_emit_breakc(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_emit_conditional_branch(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction, uint32_t target_block_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -5111,7 +5111,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ assert(compiler->control_flow_depth); assert(cf_info->current_block == VKD3D_BLOCK_LOOP); - vkd3d_dxbc_compiler_emit_breakc(compiler, instruction, cf_info->u.loop.merge_block_id); + vkd3d_dxbc_compiler_emit_conditional_branch(compiler, + instruction, cf_info->u.loop.merge_block_id); break; case VKD3DSIH_CONTINUE: @@ -5130,6 +5131,21 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ break; } + case VKD3DSIH_CONTINUEP: + { + struct vkd3d_control_flow_info *loop_cf_info; + + if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) + { + ERR("Invalid 'continuec' instruction outside loop.\n"); + return; + } + + vkd3d_dxbc_compiler_emit_conditional_branch(compiler, + instruction, loop_cf_info->u.loop.continue_block_id); + break; + } + case VKD3DSIH_RET: vkd3d_dxbc_compiler_emit_return(compiler, instruction); @@ -6307,6 +6323,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_BREAKP: case VKD3DSIH_CASE: case VKD3DSIH_CONTINUE: + case VKD3DSIH_CONTINUEP: case VKD3DSIH_DEFAULT: case VKD3DSIH_ELSE: case VKD3DSIH_ENDIF: -- 2.16.4

2 1

[PATCH vkd3d 3/8] vkd3d-shader: Translate continue instructions.
by Józef Kucia 24 Sep '18

24 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 d19d89990d5c..b96b69e83934 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: -- 2.16.4

2 1

[PATCH vkd3d 2/8] vkd3d-shader: Translate ineg instructions.
by Józef Kucia 24 Sep '18

24 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 6fabeb240a0e..d19d89990d5c 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: -- 2.16.4

2 1

[PATCH vkd3d 1/8] vkd3d-shader: Promote immediate scalar constants to vectors.
by Józef Kucia 24 Sep '18

24 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 964bc49b3179..6fabeb240a0e 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 808562e86127..9bb6861f7757 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}}}, -- 2.16.4

2 1

[PATCH v3 1/5] shell32/autocomplete: Don't autocomplete at all on most control characters
by Gabriel Ivăncescu 24 Sep '18

24 Sep '18

Most control characters sent via some CTRL+key combination should not autocomplete at all. ^C is one example, where just copying some text should not show the auto-suggestion box (if not visible). ^V is another example, where it is already handled in WM_PASTE, so it has to be a no-op here, else auto-append from WM_PASTE would complete the text and then the ^V autocompletion would remove every other suggestion in the listbox. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Use iscntrlW dlls/shell32/autocomplete.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index ef835b9..048a47f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -359,6 +359,10 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam); case WM_CHAR: case WM_UNICHAR: + /* Don't autocomplete at all on most control characters */ + if (iscntrlW(wParam) && !(wParam >= '\b' && wParam <= '\r')) + break; + ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) && wParam >= ' ' ? autoappend_flag_yes : autoappend_flag_no); -- 1.9.1

3 11