March 2021 - Wine-Commits - list.winehq.org

Matteo Bruni : build: Move Vulkan library detection to m4/check-vulkan.m4.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 0e504e974a737cf2b5616b9368f1c11e2a0f926c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0e504e974a737cf2b5616b9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Mar 21 21:44:39 2021 +0100 build: Move Vulkan library detection to m4/check-vulkan.m4. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 14 +------------- m4/check-vulkan.m4 | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 5f2f719..275bca2 100644 --- a/configure.ac +++ b/configure.ac @@ -106,19 +106,7 @@ AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) VKD3D_CHECK_PTHREAD AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) -VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"], - [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], - [VULKAN_LIBS="$VULKAN_LIBS -lvulkan-1" - AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], - [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], - [VULKAN_LIBS="$VULKAN_LIBS -lMoltenVK" - AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], - ["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], - [$VULKAN_LIBS])], - [$VULKAN_LIBS])], - [$VULKAN_LIBS]) +VKD3D_CHECK_VULKAN AS_IF([test "x$with_ncurses" != "xno"], [PKG_CHECK_MODULES([NCURSES], [ncurses], diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4 new file mode 100644 index 0000000..756f61a --- /dev/null +++ b/m4/check-vulkan.m4 @@ -0,0 +1,16 @@ +dnl VKD3D_CHECK_VULKAN +AC_DEFUN([VKD3D_CHECK_VULKAN],[ +VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], + [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"], + [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], + [VULKAN_LIBS="$VULKAN_LIBS -lvulkan-1" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], + [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], + [VULKAN_LIBS="$VULKAN_LIBS -lMoltenVK" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], + ["$ac_cv_lib_soname_MoltenVK"])], + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS]) +])

1 0

Henri Verbeet : vkd3d-shader: Set correct dcl masks in vkd3d_dxbc_compiler_emit_hull_shader_inputs().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 9007df1067685bc03c07a04715ea510d5aa6ed6e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9007df1067685bc03c07a04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:09 2021 +0100 vkd3d-shader: Set correct dcl masks in vkd3d_dxbc_compiler_emit_hull_shader_inputs(). Avoiding some duplicate input declarations. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 64d4e8a..0e75b0a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9023,10 +9023,15 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_inputs(struct vkd3d_dxbc_compil symbol.key.reg.idx = register_idx; if ((entry = rb_get(&compiler->symbol_table, &symbol))) + { + struct vkd3d_symbol *s = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + s->info.reg.dcl_mask |= signature->elements[i].mask; continue; + } vkd3d_symbol_set_register_info(&symbol, vicp_id, SpvStorageClassPrivate, VKD3D_SHADER_COMPONENT_FLOAT, VKD3DSP_WRITEMASK_ALL); + symbol.info.reg.dcl_mask = signature->elements[i].mask; symbol.info.reg.is_aggregate = true; vkd3d_dxbc_compiler_put_symbol(compiler, &symbol); }

1 0

Henri Verbeet : vkd3d-shader: Avoid redeclaring inputs in vkd3d_dxbc_compiler_emit_default_control_point_phase().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: f59e9dfeee63b0f98e05f18e23a382babd349291 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f59e9dfeee63b0f98e05f18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:08 2021 +0100 vkd3d-shader: Avoid redeclaring inputs in vkd3d_dxbc_compiler_emit_default_control_point_phase(). We've already set these up in vkd3d_dxbc_compiler_emit_hull_shader_inputs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 57 ++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 03a6f59..64d4e8a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6207,16 +6207,32 @@ static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dx const struct vkd3d_shader_signature *output_signature = compiler->output_signature; const struct vkd3d_shader_signature *input_signature = compiler->input_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, input_ptr_type_id, output_ptr_type_id; - const struct vkd3d_spirv_builtin *input_builtin; enum vkd3d_shader_component_type component_type; uint32_t input_id, output_id, dst_id, src_id; + struct vkd3d_shader_src_param invocation; + struct vkd3d_shader_register input_reg; + uint32_t type_id, output_ptr_type_id; unsigned int component_count; uint32_t invocation_id; unsigned int i; invocation_id = vkd3d_dxbc_compiler_emit_load_invocation_id(compiler); + memset(&invocation, 0, sizeof(invocation)); + invocation.reg.type = VKD3DSPR_OUTPOINTID; + invocation.reg.data_type = VKD3D_DATA_INT; + invocation.reg.idx[0].offset = ~0u; + invocation.reg.idx[1].offset = ~0u; + invocation.reg.idx[2].offset = ~0u; + invocation.swizzle = VKD3D_SHADER_NO_SWIZZLE; + + memset(&input_reg, 0, sizeof(input_reg)); + input_reg.type = VKD3DSPR_INPUT; + input_reg.data_type = VKD3D_DATA_FLOAT; + input_reg.idx[0].rel_addr = &invocation; + input_reg.idx[2].offset = ~0u; + input_id = vkd3d_dxbc_compiler_get_register_id(compiler, &input_reg); + assert(input_signature->element_count == output_signature->element_count); for (i = 0; i < output_signature->element_count; ++i) { @@ -6226,31 +6242,13 @@ static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dx assert(input->mask == output->mask); assert(input->component_type == output->component_type); - if ((input_builtin = get_spirv_builtin_for_sysval(compiler, vkd3d_siv_from_sysval(input->sysval_semantic)))) - { - component_type = input_builtin->component_type; - component_count = input_builtin->component_count; - } - else - { - component_type = input->component_type; - component_count = vkd3d_write_mask_component_count(input->mask); - } - - if (input_builtin) - { - input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, - input_builtin, SpvStorageClassInput, compiler->input_control_point_count); - } - else - { - input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassInput, component_type, component_count, compiler->input_control_point_count); - vkd3d_spirv_add_iface_variable(builder, input_id); - vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, input->register_index); - } - vkd3d_spirv_build_op_name(builder, input_id, "vicp%u", input->register_index); + input_reg.idx[1].offset = input->register_index; + input_id = vkd3d_dxbc_compiler_get_register_id(compiler, &input_reg); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 4); + src_id = vkd3d_spirv_build_op_load(builder, type_id, input_id, SpvMemoryAccessMaskNone); + component_type = output->component_type; + component_count = vkd3d_write_mask_component_count(output->mask); output_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, component_type, component_count, compiler->output_control_point_count); vkd3d_spirv_add_iface_variable(builder, output_id); @@ -6259,11 +6257,10 @@ static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dx type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); output_ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); - input_ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, type_id); - dst_id = vkd3d_spirv_build_op_access_chain1(builder, output_ptr_type_id, output_id, invocation_id); - src_id = vkd3d_spirv_build_op_access_chain1(builder, input_ptr_type_id, input_id, invocation_id); - vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + + vkd3d_dxbc_compiler_emit_store(compiler, dst_id, output->mask, + component_type, SpvStorageClassOutput, VKD3DSP_WRITEMASK_ALL, src_id); } }

1 0

Henri Verbeet : vkd3d-shader: Export patch constants at the end of tessellation control shaders.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 1f92c1dd5334d8f9b72008046cd39542befdc4a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1f92c1dd5334d8f9b720080… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:07 2021 +0100 vkd3d-shader: Export patch constants at the end of tessellation control shaders. As opposed to at the end of each fork/join phase. This eliminates a bunch of redundant SPIR-V, since it's not uncommon for fork/join phases to only write to individual output components. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 94 ++++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a6e5e22..03a6f59 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6074,12 +6074,6 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c vkd3d_spirv_build_op_function_end(builder); - if (compiler->epilogue_function_id) - { - vkd3d_dxbc_compiler_emit_shader_phase_name(compiler, compiler->epilogue_function_id, phase, "_epilogue"); - vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); - } - compiler->temp_id = 0; compiler->temp_count = 0; @@ -6090,6 +6084,12 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c */ if (is_control_point_phase(phase)) { + if (compiler->epilogue_function_id) + { + vkd3d_dxbc_compiler_emit_shader_phase_name(compiler, compiler->epilogue_function_id, phase, "_epilogue"); + vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); + } + memset(&reg, 0, sizeof(reg)); reg.idx[1].offset = ~0u; @@ -6382,6 +6382,45 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd } } +static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t void_id, type_id, ptr_type_id, function_id; + uint32_t arguments[MAX_REG_OUTPUT]; + unsigned int i, count; + + if ((function_id = compiler->epilogue_function_id)) + { + void_id = vkd3d_spirv_get_op_type_void(builder); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 4); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); + for (i = 0, count = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) + { + if (compiler->private_output_variable[i]) + { + uint32_t argument_id = compiler->private_output_variable[i]; + unsigned int argument_idx = count++; + + if (compiler->private_output_variable_array_idx[i]) + { + uint32_t tmp_id; + + tmp_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, + argument_id, compiler->private_output_variable_array_idx[i]); + tmp_id = vkd3d_spirv_build_op_load(builder, type_id, tmp_id, SpvMemoryAccessMaskNone); + argument_id = vkd3d_spirv_build_op_variable(builder, + &builder->global_stream, ptr_type_id, SpvStorageClassPrivate, 0); + vkd3d_spirv_build_op_store(builder, argument_id, tmp_id, SpvMemoryAccessMaskNone); + } + + arguments[argument_idx] = argument_id; + } + } + + vkd3d_spirv_build_op_function_call(builder, void_id, function_id, arguments, count); + } +} + static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -6425,6 +6464,7 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler } } + vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_return(builder); vkd3d_spirv_build_op_function_end(builder); } @@ -7068,51 +7108,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_conditional_branch(struct vkd3d_dxbc_co return merge_block_id; } -static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxbc_compiler *compiler) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t void_id, type_id, ptr_type_id, function_id; - uint32_t arguments[MAX_REG_OUTPUT]; - unsigned int i, count; - - if ((function_id = compiler->epilogue_function_id)) - { - void_id = vkd3d_spirv_get_op_type_void(builder); - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 4); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); - for (i = 0, count = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) - { - if (compiler->private_output_variable[i]) - { - uint32_t argument_id = compiler->private_output_variable[i]; - unsigned int argument_idx = count++; - - if (compiler->private_output_variable_array_idx[i]) - { - uint32_t tmp_id; - - tmp_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, - argument_id, compiler->private_output_variable_array_idx[i]); - tmp_id = vkd3d_spirv_build_op_load(builder, type_id, tmp_id, SpvMemoryAccessMaskNone); - argument_id = vkd3d_spirv_build_op_variable(builder, - &builder->global_stream, ptr_type_id, SpvStorageClassPrivate, 0); - vkd3d_spirv_build_op_store(builder, argument_id, tmp_id, SpvMemoryAccessMaskNone); - } - - arguments[argument_idx] = argument_id; - } - } - - vkd3d_spirv_build_op_function_call(builder, void_id, function_id, arguments, count); - } -} - static void vkd3d_dxbc_compiler_emit_return(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + const struct vkd3d_shader_phase *phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler); struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) + if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY && (!phase || is_control_point_phase(phase))) vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_return(builder);

1 0

Matteo Bruni : configure: Use VULKAN_LIBS when looking for the Vulkan library.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 8c01e98650e529c25c7812a508d604774a51f3ab URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8c01e98650e529c25c7812a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Mar 21 21:44:38 2021 +0100 configure: Use VULKAN_LIBS when looking for the Vulkan library. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2005c76..5f2f719 100644 --- a/configure.ac +++ b/configure.ac @@ -105,17 +105,20 @@ AC_CHECK_LIB([dl], [dlopen], AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) VKD3D_CHECK_PTHREAD -AC_SUBST([VULKAN_LIBS]) +AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lvulkan"], + [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"], [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lvulkan-1" + [VULKAN_LIBS="$VULKAN_LIBS -lvulkan-1" AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lMoltenVK" + [VULKAN_LIBS="$VULKAN_LIBS -lMoltenVK" AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])])]) + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS]) AS_IF([test "x$with_ncurses" != "xno"], [PKG_CHECK_MODULES([NCURSES], [ncurses],

1 0

Henri Verbeet : vkd3d-shader: Support patch constant inputs in tessellation control shader join phases.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 851afc6229ab4e2eeb5e0257dd430eb9912aa401 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=851afc6229ab4e2eeb5e025… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:06 2021 +0100 vkd3d-shader: Support patch constant inputs in tessellation control shader join phases. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 38 +++++++++++++++++++++++++++++++++----- tests/d3d12.c | 2 +- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a639f7e..a6e5e22 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4252,7 +4252,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } if (!(use_private_var = builtin && builtin->fixup_pfn) - && needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask)) + && needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask) + && (compiler->shader_type != VKD3D_SHADER_TYPE_HULL + || (reg->type != VKD3DSPR_INCONTROLPOINT && reg->type != VKD3DSPR_PATCHCONST))) use_private_var = true; else component_idx = vkd3d_write_mask_get_component_idx(write_mask); @@ -4266,20 +4268,45 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); input_id = symbol->id; } - else if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && reg->type == VKD3DSPR_INCONTROLPOINT) - { + else if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL + && (reg->type == VKD3DSPR_INCONTROLPOINT || reg->type == VKD3DSPR_PATCHCONST)) + { + /* Input/output registers from one phase can be used as inputs in + * subsequent phases. Specifically: + * + * - Control phase inputs are available as "vicp" in fork and join + * phases. + * - Control phase outputs are available as "vocp" in fork and join + * phases. + * - Fork phase patch constants are available as "vpc" in join + * phases. + * + * We handle "vicp" and "vpc" here by creating aliases to the shader's + * global inputs and outputs. We handle "vocp" in + * vkd3d_dxbc_compiler_leave_shader_phase(). */ + tmp_symbol = reg_symbol; - tmp_symbol.key.reg.type = VKD3DSPR_INPUT; + if (reg->type == VKD3DSPR_PATCHCONST) + tmp_symbol.key.reg.type = VKD3DSPR_OUTPUT; + else + tmp_symbol.key.reg.type = VKD3DSPR_INPUT; if ((entry = rb_get(&compiler->symbol_table, &tmp_symbol))) { symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); tmp_symbol = *symbol; - tmp_symbol.key.reg.type = VKD3DSPR_INCONTROLPOINT; + tmp_symbol.key.reg.type = reg->type; vkd3d_dxbc_compiler_put_symbol(compiler, &tmp_symbol); input_id = symbol->id; } + else + { + if (reg->type == VKD3DSPR_PATCHCONST) + ERR("Patch constant register %u was not declared in a previous phase.\n", reg_idx); + else + ERR("Input control point register %u was not declared in a previous phase.\n", reg_idx); + } } if (!symbol || ~symbol->info.reg.dcl_mask & write_mask) @@ -4418,6 +4445,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil { case VKD3DSPR_INPUT: case VKD3DSPR_INCONTROLPOINT: + case VKD3DSPR_PATCHCONST: vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); return; case VKD3DSPR_PRIMID: diff --git a/tests/d3d12.c b/tests/d3d12.c index dfdbefa..f289a10 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33809,7 +33809,7 @@ static void test_hull_shader_patch_constant_inputs(void) transition_resource_state(command_list, so_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - todo check_triangles(&rb, &expected_triangle, 1); + check_triangles(&rb, &expected_triangle, 1); release_resource_readback(&rb); ID3D12Resource_Release(so_buffer);

1 0

Zebediah Figura : vkd3d-shader: Factor out hlsl_new_load().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 6d10d887d004362990dde8867b7c13fceacaebe6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6d10d887d004362990dde88… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 18 00:22:20 2021 -0500 vkd3d-shader: Factor out hlsl_new_load(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 11 +++++++++-- libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 5 +---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index cb13e8f..85859ad 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -497,17 +497,24 @@ struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shad return iff; } -struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct vkd3d_shader_location loc) +struct hlsl_ir_load *hlsl_new_load(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, + struct hlsl_type *type, const struct vkd3d_shader_location loc) { struct hlsl_ir_load *load; if (!(load = vkd3d_calloc(1, sizeof(*load)))) return NULL; - init_node(&load->node, HLSL_IR_LOAD, var->data_type, loc); + init_node(&load->node, HLSL_IR_LOAD, type, loc); load->src.var = var; + hlsl_src_from_node(&load->src.offset, offset); return load; } +struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct vkd3d_shader_location loc) +{ + return hlsl_new_load(var, NULL, var->data_type, loc); +} + struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components, struct hlsl_ir_node *val, struct vkd3d_shader_location *loc) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c15a8d9..819b882 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -530,6 +530,8 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_load *hlsl_new_load(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, struct hlsl_type *type, + struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_loop *hlsl_new_loop(struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index af6c397..c12b4e9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -610,11 +610,8 @@ static struct hlsl_ir_load *add_load(struct hlsl_ctx *ctx, struct list *instrs, list_add_tail(instrs, &assign->node.entry); } - if (!(load = vkd3d_malloc(sizeof(*load)))) + if (!(load = hlsl_new_load(var, offset, data_type, loc))) return NULL; - init_node(&load->node, HLSL_IR_LOAD, data_type, loc); - load->src.var = var; - hlsl_src_from_node(&load->src.offset, offset); list_add_tail(instrs, &load->node.entry); return load; }

1 0

Henri Verbeet : tests: Add a test for patch constant inputs in tessellation control shader join phases.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 6f12553731fe6ce2509f19fbaae81c33f3964b61 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6f12553731fe6ce2509f19f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:05 2021 +0100 tests: Add a test for patch constant inputs in tessellation control shader join phases. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=6f12553731fe6ce2509…

1 0

Henri Verbeet : vkd3d-shader: Properly handle coalesced outputs in vkd3d_dxbc_compiler_emit_store_shader_output().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: b584668a81806c4b51953f621b36a3d023fb70ed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b584668a81806c4b51953f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 22 13:20:02 2021 +0100 vkd3d-shader: Properly handle coalesced outputs in vkd3d_dxbc_compiler_emit_store_shader_output(). Multiple patch constant or output signature elements may be coalesced into a single output register by needs_private_io_variable() in vkd3d_dxbc_compiler_emit_output(). When this happens, only the original element will have a corresponding variable ID assigned in output_info[]. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a7361aa..4598ffa 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4852,19 +4852,33 @@ static uint32_t vkd3d_dxbc_compiler_get_output_array_index(struct vkd3d_dxbc_com } static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_signature_element *output, + const struct vkd3d_shader_signature *signature, const struct vkd3d_shader_signature_element *output, const struct vkd3d_shader_output_info *output_info, uint32_t output_index_id, uint32_t val_id, unsigned int write_mask) { unsigned int dst_write_mask, use_mask, uninit_mask, swizzle, mask; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; + const struct vkd3d_shader_signature_element *element; unsigned int i, index, array_idx; uint32_t output_id; dst_write_mask = output->mask; - write_mask &= dst_write_mask; use_mask = output->used_mask; + if (!output->sysval_semantic) + { + for (i = 0; i < signature->element_count; ++i) + { + element = &signature->elements[i]; + if (element->register_index != output->register_index) + continue; + if (element->sysval_semantic) + continue; + dst_write_mask |= element->mask; + use_mask |= element->used_mask; + } + } + write_mask &= dst_write_mask; if (!write_mask) return; @@ -4985,13 +4999,15 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ for (i = 0; i < signature->element_count; ++i) { + if (!compiler->output_info[i].id) + continue; + variable_idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, signature->elements[i].register_index); - if (!param_id[variable_idx]) continue; - vkd3d_dxbc_compiler_emit_store_shader_output(compiler, + vkd3d_dxbc_compiler_emit_store_shader_output(compiler, signature, &signature->elements[i], &compiler->output_info[i], output_index_id, param_id[variable_idx], compiler->private_output_variable_write_mask[variable_idx]); }

1 0

Zebediah Figura : vkd3d-shader: Allow static const variables to lack an initializer.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: vkd3d Branch: master Commit: 0c1c916ad7a64ecb97bab7645c841f4729f7feef URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c1c916ad7a64ecb97bab76… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 18 00:22:23 2021 -0500 vkd3d-shader: Allow static const variables to lack an initializer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 3 ++- tests/hlsl-invalid.shader_test | 7 +++++++ tests/hlsl-static-initializer.shader_test | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c12b4e9..45767de 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1472,7 +1472,8 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t local = false; } - if (type->modifiers & HLSL_MODIFIER_CONST && !(var->modifiers & HLSL_STORAGE_UNIFORM) && !v->initializer.args_count) + if ((type->modifiers & HLSL_MODIFIER_CONST) && !v->initializer.args_count + && !(var->modifiers & (HLSL_STORAGE_STATIC | HLSL_STORAGE_UNIFORM))) { hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); diff --git a/tests/hlsl-invalid.shader_test b/tests/hlsl-invalid.shader_test index 16e75d0..370d84d 100644 --- a/tests/hlsl-invalid.shader_test +++ b/tests/hlsl-invalid.shader_test @@ -115,3 +115,10 @@ float4 main() : sv_target { return 0; } + +[pixel shader fail] +float4 main() : sv_target +{ + const float4 x; + return x; +} diff --git a/tests/hlsl-static-initializer.shader_test b/tests/hlsl-static-initializer.shader_test index 9b9d000..9c48651 100644 --- a/tests/hlsl-static-initializer.shader_test +++ b/tests/hlsl-static-initializer.shader_test @@ -5,9 +5,10 @@ float myfunc() } static float a = myfunc() + 0.2; static float b; +static const float c; float4 main() : sv_target { - return float4(a, b, 0, 0); + return float4(a, b, c, 0); } [test]

1 0