August 2018 - Wine-Commits - list.winehq.org

Józef Kucia : libs/vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_vector_shuffle().
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: vkd3d Branch: master Commit: bde5dafe5bbcbc04f100df73ff60d522d5b8a550 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bde5dafe5bbcbc04f100df7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:43 2018 +0200 libs/vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_vector_shuffle(). 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, 28 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 142993a..f3344c4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2475,6 +2475,30 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *com 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) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t components[VKD3D_VEC4_SIZE]; + unsigned int i, component_idx; + uint32_t type_id; + + assert(component_count <= ARRAY_SIZE(components)); + + for (i = 0, component_idx = 0; i < component_count; ++i) + { + if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) + components[i] = VKD3D_VEC4_SIZE + component_idx++; + else + components[i] = i; + } + + type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); + return vkd3d_spirv_build_op_vector_shuffle(builder, + type_id, vector1_id, vector2_id, components, component_count); +} + static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) { @@ -2700,9 +2724,8 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - unsigned int i, component_idx, component_count; - uint32_t components[VKD3D_VEC4_SIZE]; - uint32_t reg_id; + uint32_t reg_id, type_id, reg_val_id; + unsigned int component_count; assert(reg->type != VKD3DSPR_IMMCONST); assert(write_mask); @@ -2722,21 +2745,11 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi if (component_count != VKD3D_VEC4_SIZE) { - uint32_t type_id, reg_val_id; - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_id, SpvMemoryAccessMaskNone); - for (i = 0, component_idx = 0; i < ARRAY_SIZE(components); ++i) - { - if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - components[i] = VKD3D_VEC4_SIZE + component_idx++; - else - components[i] = i; - } - - val_id = vkd3d_spirv_build_op_vector_shuffle(builder, - type_id, reg_val_id, val_id, components, ARRAY_SIZE(components)); + val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, + reg_val_id, val_id, write_mask, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); } vkd3d_spirv_build_op_store(builder, reg_id, val_id, SpvMemoryAccessMaskNone);

1 0

Józef Kucia : tests: Add tests for indexable temporary registers.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: vkd3d Branch: master Commit: 1bb21f0ea0a9b40af98e839e43697a0a57626000 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1bb21f0ea0a9b40af98e839… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:40 2018 +0200 tests: Add tests for indexable temporary registers. 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 | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e61fd3b..dfc3da7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5677,6 +5677,76 @@ static void test_shader_instructions(void) 0x0000d000, 0x001020c2, 0x00000000, 0x00208406, 0x00000000, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_sincos = {ps_sincos_code, sizeof(ps_sincos_code)}; + static const DWORD ps_indexable_temp_code[] = + { +#if 0 + float index; + + float4 main() : SV_Target + { + float4 colors[] = + { + float4(1.0f, 0.0f, 0.0f, 1.0f), + float4(0.0f, 1.0f, 0.0f, 1.0f), + float4(0.0f, 0.0f, 1.0f, 1.0f), + }; + return colors[index]; + } +#endif + 0x43425844, 0x82c65bbb, 0x5b713473, 0xa16ebe60, 0xdcc329be, 0x00000001, 0x00000170, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f8, 0x00000050, 0x0000003e, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x04000069, 0x00000000, 0x00000003, 0x00000004, 0x09000036, 0x00203072, + 0x00000000, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x09000036, + 0x00203072, 0x00000000, 0x00000001, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, + 0x09000036, 0x00203072, 0x00000000, 0x00000002, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, + 0x00000000, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036, + 0x00102072, 0x00000000, 0x04203246, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102082, + 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_indexable_temp = {ps_indexable_temp_code, sizeof(ps_indexable_temp_code)}; + static const DWORD ps_indexable_temp2_code[] = + { +#if 0 + float index; + + float4 main() : SV_Target + { + uint remap[] = {0, 1, 2, 2, 1, 0, 1, 1, 2, 2}; + float4 colors[] = + { + float4(1.0f, 0.0f, 0.0f, 1.0f), + float4(0.0f, 1.0f, 0.0f, 1.0f), + float4(0.0f, 0.0f, 1.0f, 1.0f), + }; + return colors[remap[index]]; + } +#endif + 0x43425844, 0xcacc5b8f, 0x19bb905e, 0x6af8eae1, 0x80654684, 0x00000001, 0x0000028c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000214, 0x00000050, 0x00000085, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x04000069, 0x00000000, 0x0000000a, 0x00000004, 0x04000069, 0x00000001, + 0x00000003, 0x00000004, 0x06000036, 0x00203012, 0x00000000, 0x00000000, 0x00004001, 0x00000000, + 0x06000036, 0x00203012, 0x00000000, 0x00000001, 0x00004001, 0x00000001, 0x06000036, 0x00203012, + 0x00000000, 0x00000002, 0x00004001, 0x00000002, 0x06000036, 0x00203012, 0x00000000, 0x00000003, + 0x00004001, 0x00000002, 0x06000036, 0x00203012, 0x00000000, 0x00000004, 0x00004001, 0x00000001, + 0x06000036, 0x00203012, 0x00000000, 0x00000005, 0x00004001, 0x00000000, 0x06000036, 0x00203012, + 0x00000000, 0x00000006, 0x00004001, 0x00000001, 0x06000036, 0x00203012, 0x00000000, 0x00000007, + 0x00004001, 0x00000001, 0x06000036, 0x00203012, 0x00000000, 0x00000008, 0x00004001, 0x00000002, + 0x06000036, 0x00203012, 0x00000000, 0x00000009, 0x00004001, 0x00000002, 0x09000036, 0x00203072, + 0x00000001, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x09000036, + 0x00203072, 0x00000001, 0x00000001, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, + 0x09000036, 0x00203072, 0x00000001, 0x00000002, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, + 0x00000000, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x07000036, + 0x00100012, 0x00000000, 0x0420300a, 0x00000000, 0x0010000a, 0x00000000, 0x07000036, 0x00102072, + 0x00000000, 0x04203246, 0x00000001, 0x0010000a, 0x00000000, 0x05000036, 0x00102082, 0x00000000, + 0x00004001, 0x3f800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_indexable_temp2 = {ps_indexable_temp2_code, sizeof(ps_indexable_temp2_code)}; static const DWORD ps_bfi_code[] = { #if 0 @@ -6509,6 +6579,21 @@ static void test_shader_instructions(void) {&ps_sincos, {{ 0.0f, -0.0f, 0.0f, -0.0f}}, {{ 0.0f, -0.0f, 1.0f, 1.0f}}}, {&ps_sincos, {{ 0.0f, -0.0f, M_PI, -M_PI}}, {{ 0.0f, -0.0f, 1.0f, 1.0f}}}, + + {&ps_indexable_temp, {{0.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp, {{1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp, {{2.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}}, + + {&ps_indexable_temp2, {{0.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{1.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{2.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}}, + {&ps_indexable_temp2, {{3.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}}, + {&ps_indexable_temp2, {{4.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{5.0f}}, {{1.0f, 0.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{6.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{7.0f}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_indexable_temp2, {{8.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}}, + {&ps_indexable_temp2, {{9.0f}}, {{0.0f, 0.0f, 1.0f, 1.0f}}}, }; static const struct

1 0

Józef Kucia : libs/vkd3d-shader: Translate sincos instructions.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: vkd3d Branch: master Commit: b14bb73c5b1770b43e199b2fca2771a89263ea14 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b14bb73c5b1770b43e199b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:36 2018 +0200 libs/vkd3d-shader: Translate sincos 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 | 68 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a0f084c..21d6a1a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1427,12 +1427,29 @@ static void vkd3d_spirv_build_op_memory_barrier(struct vkd3d_spirv_builder *buil SpvOpMemoryBarrier, memory_id, memory_semantics_id); } +static uint32_t vkd3d_spirv_build_op_glsl_std450_tr1(struct vkd3d_spirv_builder *builder, + enum GLSLstd450 op, uint32_t result_type, uint32_t operand) +{ + uint32_t id = vkd3d_spirv_get_glsl_std450_instr_set(builder); + return vkd3d_spirv_build_op_ext_inst(builder, result_type, id, op, &operand, 1); +} + static uint32_t vkd3d_spirv_build_op_glsl_std450_fabs(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t operand) { - uint32_t glsl_std450_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); - return vkd3d_spirv_build_op_ext_inst(builder, result_type, glsl_std450_id, - GLSLstd450FAbs, &operand, 1); + return vkd3d_spirv_build_op_glsl_std450_tr1(builder, GLSLstd450FAbs, result_type, operand); +} + +static uint32_t vkd3d_spirv_build_op_glsl_std450_sin(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand) +{ + return vkd3d_spirv_build_op_glsl_std450_tr1(builder, GLSLstd450Sin, result_type, operand); +} + +static uint32_t vkd3d_spirv_build_op_glsl_std450_cos(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand) +{ + return vkd3d_spirv_build_op_glsl_std450_tr1(builder, GLSLstd450Cos, result_type, operand); } static uint32_t vkd3d_spirv_build_op_glsl_std450_nclamp(struct vkd3d_spirv_builder *builder, @@ -4284,6 +4301,48 @@ static void vkd3d_dxbc_compiler_emit_rcp(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_sincos(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_dst_param *dst_sin = &instruction->dst[0]; + const struct vkd3d_shader_dst_param *dst_cos = &instruction->dst[1]; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, src_id, sin_id = 0, cos_id = 0; + unsigned int component_count; + + if (dst_sin->reg.type != VKD3DSPR_NULL) + { + component_count = vkd3d_write_mask_component_count(dst_sin->write_mask); + type_id = vkd3d_spirv_get_type_id(builder, + vkd3d_component_type_from_data_type(dst_sin->reg.data_type), component_count); + + src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst_sin->write_mask); + + sin_id = vkd3d_spirv_build_op_glsl_std450_sin(builder, type_id, src_id); + } + + if (dst_cos->reg.type != VKD3DSPR_NULL) + { + if (dst_sin->reg.type == VKD3DSPR_NULL || dst_cos->write_mask != dst_sin->write_mask) + { + component_count = vkd3d_write_mask_component_count(dst_cos->write_mask); + type_id = vkd3d_spirv_get_type_id(builder, + vkd3d_component_type_from_data_type(dst_cos->reg.data_type), component_count); + + src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst_cos->write_mask); + } + + cos_id = vkd3d_spirv_build_op_glsl_std450_cos(builder, type_id, src_id); + } + + if (sin_id) + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst_sin, sin_id); + + if (cos_id) + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst_cos, cos_id); +} + static void vkd3d_dxbc_compiler_emit_imul(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5951,6 +6010,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_RCP: vkd3d_dxbc_compiler_emit_rcp(compiler, instruction); break; + case VKD3DSIH_SINCOS: + vkd3d_dxbc_compiler_emit_sincos(compiler, instruction); + break; case VKD3DSIH_IMUL: vkd3d_dxbc_compiler_emit_imul(compiler, instruction); break;

1 0

Józef Kucia : tests: Add test for sincos instruction.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: vkd3d Branch: master Commit: b3f28cbfdef4ec21271424893162c95a2831a6e9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b3f28cbfdef4ec212714248… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:37 2018 +0200 tests: Add test for sincos instruction. 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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 83ec6c8..e61fd3b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5658,6 +5658,25 @@ static void test_shader_instructions(void) 0x06000081, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_rcp_vector = {ps_rcp_vector_code, sizeof(ps_rcp_vector_code)}; + static const DWORD ps_sincos_code[] = + { +#if 0 + float2 src0; + + void main(out float4 dst : SV_Target) + { + sincos(src0, dst.xy, dst.zw); + } +#endif + 0x43425844, 0xb47a22ec, 0xdb165106, 0xeee971d7, 0x8836fcc0, 0x00000001, 0x000000dc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, 0x00000019, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x0700004d, 0x00102032, 0x00000000, 0x0000d000, 0x00208046, 0x00000000, 0x00000000, 0x0700004d, + 0x0000d000, 0x001020c2, 0x00000000, 0x00208406, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_sincos = {ps_sincos_code, sizeof(ps_sincos_code)}; static const DWORD ps_bfi_code[] = { #if 0 @@ -6487,6 +6506,9 @@ static void test_shader_instructions(void) {&ps_rcp, {{ 2.0f}}, {{ 0.5f}}}, {&ps_rcp_vector, {{-1.0f, 1.0f, 4.0f, -4.0f}}, {{-1.0f, 1.0f, 0.25f, -0.25f}}}, + + {&ps_sincos, {{ 0.0f, -0.0f, 0.0f, -0.0f}}, {{ 0.0f, -0.0f, 1.0f, 1.0f}}}, + {&ps_sincos, {{ 0.0f, -0.0f, M_PI, -M_PI}}, {{ 0.0f, -0.0f, 1.0f, 1.0f}}}, }; static const struct

1 0

Józef Kucia : libs/vkd3d-shader: Translate round_ne instructions.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: vkd3d Branch: master Commit: 92f3d33e15ef711f3aad55b66554fb55fd86c4dd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=92f3d33e15ef711f3aad55b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:34 2018 +0200 libs/vkd3d-shader: Translate round_ne 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 d236db9..a0f084c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4063,6 +4063,7 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction( {VKD3DSIH_MAD, GLSLstd450Fma}, {VKD3DSIH_MAX, GLSLstd450NMax}, {VKD3DSIH_MIN, GLSLstd450NMin}, + {VKD3DSIH_ROUND_NE, GLSLstd450RoundEven}, {VKD3DSIH_ROUND_NI, GLSLstd450Floor}, {VKD3DSIH_ROUND_PI, GLSLstd450Ceil}, {VKD3DSIH_ROUND_Z, GLSLstd450Trunc}, @@ -5932,6 +5933,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_MAD: case VKD3DSIH_MAX: case VKD3DSIH_MIN: + case VKD3DSIH_ROUND_NE: case VKD3DSIH_ROUND_NI: case VKD3DSIH_ROUND_PI: case VKD3DSIH_ROUND_Z:

1 0

Józef Kucia : libs/vkd3d: Add support for more formats.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: vkd3d Branch: master Commit: f883c265244fac840834e4b306d0c355ad5908fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f883c265244fac840834e4b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:33 2018 +0200 libs/vkd3d: Add support for more formats. 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/utils.c | 103 ++++++++++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f883c265244fac84083…

1 0

Józef Kucia : tests: Add test for round_ne instruction.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: vkd3d Branch: master Commit: ae1f96cc1f315b4cc68dae44c5bb9123ea3313d9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ae1f96cc1f315b4cc68dae4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:35 2018 +0200 tests: Add test for round_ne instruction. 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 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 608ff68..83ec6c8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5540,6 +5540,24 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_round = {ps_round_code, sizeof(ps_round_code)}; + static const DWORD ps_round_ne_code[] = + { +#if 0 + float4 src0; + + void main(out float4 dst : SV_Target) + { + dst = round(src0); + } +#endif + 0x43425844, 0xa2be1ad3, 0xf1389007, 0xc8221829, 0xcbef8ed0, 0x00000001, 0x000000bc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x06000040, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_round_ne = {ps_round_ne_code, sizeof(ps_round_ne_code)}; static const DWORD ps_frc_code[] = { #if 0 @@ -6427,6 +6445,16 @@ static void test_shader_instructions(void) {&ps_round, {{ INFINITY}}, {{ INFINITY, INFINITY, INFINITY}}}, {&ps_round, {{-INFINITY}}, {{-INFINITY, -INFINITY, -INFINITY}}}, + {&ps_round_ne, {{ 0.0f, -0.0f, 0.5f, -0.5f}}, {{ 0.0f, -0.0f, 0.0f, -0.0f}}}, + {&ps_round_ne, {{ 2.0f, 3.0f, 4.0f, 5.0f}}, {{ 2.0f, 3.0f, 4.0f, 5.0f}}}, + {&ps_round_ne, {{ 2.4f, 3.4f, 4.4f, 5.4f}}, {{ 2.0f, 3.0f, 4.0f, 5.0f}}}, + {&ps_round_ne, {{ 2.5f, 3.5f, 4.5f, 5.5f}}, {{ 2.0f, 4.0f, 4.0f, 6.0f}}}, + {&ps_round_ne, {{ 2.6f, 3.6f, 4.6f, 5.6f}}, {{ 3.0f, 4.0f, 5.0f, 6.0f}}}, + {&ps_round_ne, {{-2.5f, -3.5f, -4.5f, -5.5f}}, {{-2.0f, -4.0f, -4.0f, -6.0f}}}, + {&ps_round_ne, {{-2.4f, -3.4f, -4.4f, -5.4f}}, {{-2.0f, -3.0f, -4.0f, -5.0f}}}, + {&ps_round_ne, {{ INFINITY}}, {{ INFINITY}}}, + {&ps_round_ne, {{-INFINITY}}, {{-INFINITY}}}, + {&ps_frc, {{ 0.0f}}, {{0.0f, 0.0f}}}, {&ps_frc, {{-0.0f}}, {{0.0f, 0.0f}}}, {&ps_frc, {{ 1.0f}}, {{0.0f, 0.0f}}},

1 0

Józef Kucia : libs/vkd3d-shader: Add support for indexable temporary registers.
by Alexandre Julliard Aug. 14, 2018

Aug. 14, 2018

Module: vkd3d Branch: master Commit: c54b148a2c89fd89c536db552f5260e7c229abe1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c54b148a2c89fd89c536db5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 1 15:34:39 2018 +0200 libs/vkd3d-shader: Add support for indexable temporary registers. 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 | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 797ea1c..26052f2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2195,6 +2195,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_GROUPSHAREDMEM: snprintf(buffer, buffer_size, "g%u", reg->idx[0].offset); break; + case VKD3DSPR_IDXTEMP: + snprintf(buffer, buffer_size, "x%u", idx); + break; default: FIXME("Unhandled register %#x.\n", reg->type); snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type); @@ -2359,6 +2362,10 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp { indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[0]); } + else if (reg->type == VKD3DSPR_IDXTEMP) + { + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); + } else { if (reg->idx[0].rel_addr || reg->idx[1].rel_addr) @@ -2387,6 +2394,7 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * switch (reg->type) { case VKD3DSPR_TEMP: + case VKD3DSPR_IDXTEMP: case VKD3DSPR_INPUT: case VKD3DSPR_OUTPUT: case VKD3DSPR_COLOROUT: @@ -3336,6 +3344,40 @@ static void vkd3d_dxbc_compiler_emit_dcl_temps(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_end_function_stream_insertion(builder); } +static void vkd3d_dxbc_compiler_emit_dcl_indexable_temp(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_indexable_temp *temp = &instruction->declaration.indexable_temp; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + struct vkd3d_shader_register reg; + struct vkd3d_symbol reg_symbol; + uint32_t id; + + if (temp->component_count != 4) + FIXME("Unhandled component count %u.\n", temp->component_count); + + memset(&reg, 0, sizeof(reg)); + reg.type = VKD3DSPR_IDXTEMP; + reg.idx[0].offset = temp->register_idx; + reg.idx[1].offset = ~0u; + + vkd3d_spirv_begin_function_stream_insertion(builder, builder->main_function_location); + + id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->function_stream, + SpvStorageClassFunction, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE, temp->register_size); + + vkd3d_dxbc_compiler_emit_register_debug_name(builder, id, &reg); + + vkd3d_spirv_end_function_stream_insertion(builder); + + vkd3d_symbol_make_register(&reg_symbol, &reg); + reg_symbol.id = id; + reg_symbol.info.reg.storage_class = SpvStorageClassFunction; + reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; + vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); +} + static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_compiler *compiler) { const SpvStorageClass storage_class = SpvStorageClassPushConstant; @@ -5932,6 +5974,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_DCL_TEMPS: vkd3d_dxbc_compiler_emit_dcl_temps(compiler, instruction); break; + case VKD3DSIH_DCL_INDEXABLE_TEMP: + vkd3d_dxbc_compiler_emit_dcl_indexable_temp(compiler, instruction); + break; case VKD3DSIH_DCL_CONSTANT_BUFFER: vkd3d_dxbc_compiler_emit_dcl_constant_buffer(compiler, instruction); break;

1 0