April 2024 - Wine-commits - list.winehq.org

Giovanni Mascellani : include: Document struct vkd3d_structure_type.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: vkd3d Branch: master Commit: a1ebb3925bbeb37cae1aa22d426c13d7db0969fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a1ebb3925bbeb37cae1aa22d426c1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Apr 20 23:36:17 2024 +0200 include: Document struct vkd3d_structure_type. --- include/vkd3d.h | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index c2b6877c..d72a7b38 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -46,21 +46,37 @@ extern "C" { * \since 1.0 */ +/** The type of a chained structure. */ enum vkd3d_structure_type { - /* 1.0 */ + /** The structure is a vkd3d_instance_create_info structure. */ VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, + /** The structure is a vkd3d_device_create_info structure. */ VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, + /** The structure is a vkd3d_image_resource_create_info structure. */ VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO, - /* 1.1 */ + /** + * The structure is a vkd3d_optional_instance_extensions_info structure. + * \since 1.1 + */ VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO, - /* 1.2 */ + /** + * The structure is a vkd3d_optional_device_extensions_info structure. + * \since 1.2 + */ VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, + /** + * The structure is a vkd3d_application_info structure. + * \since 1.2 + */ VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, - /* 1.3 */ + /** + * The structure is a vkd3d_host_time_domain_info structure. + * \since 1.3 + */ VKD3D_STRUCTURE_TYPE_HOST_TIME_DOMAIN_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE),

1 0

Giovanni Mascellani : include: Document struct vkd3d_optional_instance_extensions_info.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: vkd3d Branch: master Commit: d27bbce0e11d2a2d71cbbd4a7166ea76d31cb947 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d27bbce0e11d2a2d71cbbd4a7166e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Apr 20 23:40:44 2024 +0200 include: Document struct vkd3d_optional_instance_extensions_info. --- include/vkd3d.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index d72a7b38..6e0c82f8 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -151,13 +151,26 @@ struct vkd3d_instance_create_info uint32_t instance_extension_count; }; -/* Extends vkd3d_instance_create_info. Available since 1.1. */ +/** + * A chained structure to specify optional instance extensions. + * + * This structure extends vkd3d_instance_create_info. + * + * \since 1.1 + */ struct vkd3d_optional_instance_extensions_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** + * A list of optional Vulkan instance extensions to request. Instance creation does not fail if + * they are not available. + */ const char * const *extensions; + /** The number of elements in the extensions array. */ uint32_t extension_count; };

1 0

Giovanni Mascellani : include: Document structure vkd3d_application_info.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: vkd3d Branch: master Commit: d2d4ed9f630080664e013ebbba86846f4b4b8d2c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d2d4ed9f630080664e013ebbba868… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Apr 21 00:00:29 2024 +0200 include: Document structure vkd3d_application_info. --- include/vkd3d.h | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 6e0c82f8..46867d73 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -174,18 +174,43 @@ struct vkd3d_optional_instance_extensions_info uint32_t extension_count; }; -/* Extends vkd3d_instance_create_info. Available since 1.2. */ +/** + * A chained structure to specify application information. + * + * This structure extends vkd3d_instance_create_info. + * + * \since 1.2 + */ struct vkd3d_application_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_APPLICATION_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** + * The application's name, to be passed to the Vulkan implementation. If it is NULL, a name is + * computed from the process executable filename. If that cannot be done, the empty string is + * used. + */ const char *application_name; + /** The application's version, to be passed to the Vulkan implementation. */ uint32_t application_version; - const char *engine_name; /* "vkd3d" if NULL */ - uint32_t engine_version; /* vkd3d version if engine_name is NULL */ + /** + * The engine name, to be passed to the Vulkan implementation. If it is NULL, "vkd3d" is used. + */ + const char *engine_name; + /** + * The engine version, to be passed to the Vulkan implementation. If it is 0, the version is + * computed from the vkd3d library version. + */ + uint32_t engine_version; + /** + * The vkd3d API version to use, to guarantee backward compatibility of the shared library. If + * this chained structure is not used then VKD3D_API_VERSION_1_0 is used. + */ enum vkd3d_api_version api_version; };

1 0

Giovanni Mascellani : include: Document structure vkd3d_host_time_domain_info.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: vkd3d Branch: master Commit: 7fbd753cf7f4585d14d144b2dcf03892855c2687 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7fbd753cf7f4585d14d144b2dcf03… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Apr 21 00:01:03 2024 +0200 include: Document structure vkd3d_host_time_domain_info. --- include/vkd3d.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 46867d73..c350c5ea 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -214,12 +214,26 @@ struct vkd3d_application_info enum vkd3d_api_version api_version; }; -/* Extends vkd3d_instance_create_info. Available since 1.3. */ +/** + * A chained structure to specify the host time domain. + * + * This structure extends vkd3d_instance_create_info. + * + * \since 1.3 + */ struct vkd3d_host_time_domain_info { + /** Must be set to VKD3D_STRUCTURE_TYPE_HOST_TIME_DOMAIN_INFO. */ enum vkd3d_structure_type type; + /** Optional pointer to a structure containing further parameters. */ const void *next; + /** + * The number of clock ticks per second, used for GetClockCalibration(). It should normally + * match the expected result of QueryPerformanceFrequency(). If this chained structure is not + * used then 10 millions is used, which means that each tick is a tenth of microsecond, or + * equivalently 100 nanoseconds. + */ uint64_t ticks_per_second; };

1 0

Henri Verbeet : tests/shader_runner: Pass only valid stages to vkCreateGraphicsPipelines().
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: vkd3d Branch: master Commit: 037e8436c9aa07a89619535c966a900591091ed6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/037e8436c9aa07a89619535c966a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 21 17:29:29 2024 +0200 tests/shader_runner: Pass only valid stages to vkCreateGraphicsPipelines(). The first thing that's broken is that the "sType" field isn't VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, but we're also passing invalid "module" handles. --- tests/shader_runner_vulkan.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index d9f06980..68a71c01 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -731,19 +731,24 @@ static VkPipeline create_graphics_pipeline(struct vulkan_shader_runner *runner, VkPipelineShaderStageCreateInfo stage_desc[4]; struct vkd3d_shader_code vs_dxbc; VkDevice device = runner->device; + unsigned int stage_count = 0; VkPipeline pipeline; unsigned int i, j; VkResult vr; int ret; memset(stage_desc, 0, sizeof(stage_desc)); - ret = create_shader_stage(runner, &stage_desc[0], "vs", VK_SHADER_STAGE_VERTEX_BIT, runner->r.vs_source, &vs_dxbc) - && create_shader_stage(runner, &stage_desc[1], "ps", VK_SHADER_STAGE_FRAGMENT_BIT, runner->r.ps_source, NULL); + ret = create_shader_stage(runner, &stage_desc[stage_count++], "vs", + VK_SHADER_STAGE_VERTEX_BIT, runner->r.vs_source, &vs_dxbc); + ret &= create_shader_stage(runner, &stage_desc[stage_count++], "ps", + VK_SHADER_STAGE_FRAGMENT_BIT, runner->r.ps_source, NULL); if (runner->r.hs_source) { - ret &= create_shader_stage(runner, &stage_desc[1], "hs", VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, runner->r.hs_source, NULL); - ret &= create_shader_stage(runner, &stage_desc[2], "ds", VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT, runner->r.ds_source, NULL); + ret &= create_shader_stage(runner, &stage_desc[stage_count++], "hs", + VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, runner->r.hs_source, NULL); + ret &= create_shader_stage(runner, &stage_desc[stage_count++], "ds", + VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT, runner->r.ds_source, NULL); } todo_if (runner->r.is_todo) ok(ret, "Failed to compile shaders.\n"); if (!ret) @@ -842,7 +847,7 @@ static VkPipeline create_graphics_pipeline(struct vulkan_shader_runner *runner, ms_desc.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - pipeline_desc.stageCount = ARRAY_SIZE(stage_desc); + pipeline_desc.stageCount = stage_count; pipeline_desc.pStages = stage_desc; pipeline_desc.pVertexInputState = &input_desc; pipeline_desc.pInputAssemblyState = &ia_desc;

1 0

Henri Verbeet : vkd3d-shader/glsl: Implement VKD3DSIH_NOP.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: vkd3d Branch: master Commit: 8345b9b6f53646e98d5975c75cf796bb0b9fac88 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8345b9b6f53646e98d5975c75cf79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Feb 24 16:28:41 2024 +0100 vkd3d-shader/glsl: Implement VKD3DSIH_NOP. --- libs/vkd3d-shader/glsl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 3e8dd2c4..3e482a5f 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -79,6 +79,7 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator case VKD3DSIH_DCL_INPUT: case VKD3DSIH_DCL_OUTPUT: case VKD3DSIH_DCL_OUTPUT_SIV: + case VKD3DSIH_NOP: break; case VKD3DSIH_RET: shader_glsl_ret(generator, instruction);

1 0

Henri Verbeet : vkd3d: Move the vkd3d_cond implementation to vkd3d-common.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: vkd3d Branch: master Commit: 7b4a1fdfbc192cfd02ffb6cf18c0a86b2f6eaeb4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b4a1fdfbc192cfd02ffb6cf18c0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 17 18:52:05 2024 +0200 vkd3d: Move the vkd3d_cond implementation to vkd3d-common. Much like the vkd3d_mutex implementation. --- Makefile.am | 3 +- configure.ac | 2 +- include/private/vkd3d_common.h | 70 +++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 84 ------------------------------------------ 4 files changed, 73 insertions(+), 86 deletions(-) diff --git a/Makefile.am b/Makefile.am index b901ff6e..564b9644 100644 --- a/Makefile.am +++ b/Makefile.am @@ -519,7 +519,8 @@ dummy-vkd3d-version: ## Cross-compile tests cross_implibs = crosslibs/d3d12 CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include -I$(builddir)/tests -CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 -DVKD3D_CROSSTEST=1 +CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} \ + -D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=0 -DVKD3D_CROSSTEST=1 EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) EXTRA_DIST += tests/driver.c tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c diff --git a/configure.ac b/configure.ac index ce263543..10dd7157 100644 --- a/configure.ac +++ b/configure.ac @@ -55,7 +55,7 @@ gl_LD_VERSION_SCRIPT dnl Check compiler specific flags AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], - [VKD3D_CFLAGS="-Wall -pipe" + [VKD3D_CFLAGS="-Wall -pipe -D_WIN32_WINNT=0x0600" VKD3D_CHECK_CFLAGS([-std=c99]) VKD3D_CHECK_CFLAGS([-fvisibility=hidden]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 10e2afd5..c03ac72e 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -492,6 +492,76 @@ static inline void vkd3d_mutex_destroy(struct vkd3d_mutex *lock) #endif } +struct vkd3d_cond +{ +#ifdef _WIN32 + CONDITION_VARIABLE cond; +#else + pthread_cond_t cond; +#endif +}; + +static inline void vkd3d_cond_init(struct vkd3d_cond *cond) +{ +#ifdef _WIN32 + InitializeConditionVariable(&cond->cond); +#else + int ret; + + if ((ret = pthread_cond_init(&cond->cond, NULL))) + ERR("Failed to initialise the condition variable, ret %d.\n", ret); +#endif +} + +static inline void vkd3d_cond_signal(struct vkd3d_cond *cond) +{ +#ifdef _WIN32 + WakeConditionVariable(&cond->cond); +#else + int ret; + + if ((ret = pthread_cond_signal(&cond->cond))) + ERR("Failed to signal the condition variable, ret %d.\n", ret); +#endif +} + +static inline void vkd3d_cond_broadcast(struct vkd3d_cond *cond) +{ +#ifdef _WIN32 + WakeAllConditionVariable(&cond->cond); +#else + int ret; + + if ((ret = pthread_cond_broadcast(&cond->cond))) + ERR("Failed to broadcast the condition variable, ret %d.\n", ret); +#endif +} + +static inline void vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock) +{ +#ifdef _WIN32 + if (!SleepConditionVariableCS(&cond->cond, &lock->lock, INFINITE)) + ERR("Failed to wait on the condition variable, error %lu.\n", GetLastError()); +#else + int ret; + + if ((ret = pthread_cond_wait(&cond->cond, &lock->lock))) + ERR("Failed to wait on the condition variable, ret %d.\n", ret); +#endif +} + +static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond) +{ +#ifdef _WIN32 + /* Nothing to do. */ +#else + int ret; + + if ((ret = pthread_cond_destroy(&cond->cond))) + ERR("Failed to destroy the condition variable, ret %d.\n", ret); +#endif +} + static inline void vkd3d_parse_version(const char *version, int *major, int *minor) { *major = atoi(version); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9e7d70c3..fa9e1f05 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -24,10 +24,6 @@ #define VK_NO_PROTOTYPES #define CONST_VTABLE -#ifdef _WIN32 -# define _WIN32_WINNT 0x0600 /* for condition variables */ -#endif - #include "vkd3d_common.h" #include "vkd3d_blob.h" #include "vkd3d_memory.h" @@ -205,36 +201,6 @@ union vkd3d_thread_handle void *handle; }; -struct vkd3d_cond -{ - CONDITION_VARIABLE cond; -}; - -static inline void vkd3d_cond_init(struct vkd3d_cond *cond) -{ - InitializeConditionVariable(&cond->cond); -} - -static inline void vkd3d_cond_signal(struct vkd3d_cond *cond) -{ - WakeConditionVariable(&cond->cond); -} - -static inline void vkd3d_cond_broadcast(struct vkd3d_cond *cond) -{ - WakeAllConditionVariable(&cond->cond); -} - -static inline void vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock) -{ - if (!SleepConditionVariableCS(&cond->cond, &lock->lock, INFINITE)) - ERR("Could not sleep on the condition variable, error %lu.\n", GetLastError()); -} - -static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond) -{ -} - static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) { return InterlockedCompareExchange((LONG volatile *)x, xchg, cmp) == cmp; @@ -265,56 +231,6 @@ union vkd3d_thread_handle void *handle; }; -struct vkd3d_cond -{ - pthread_cond_t cond; -}; - -static inline void vkd3d_cond_init(struct vkd3d_cond *cond) -{ - int ret; - - ret = pthread_cond_init(&cond->cond, NULL); - if (ret) - ERR("Could not initialize the condition variable, error %d.\n", ret); -} - -static inline void vkd3d_cond_signal(struct vkd3d_cond *cond) -{ - int ret; - - ret = pthread_cond_signal(&cond->cond); - if (ret) - ERR("Could not signal the condition variable, error %d.\n", ret); -} - -static inline void vkd3d_cond_broadcast(struct vkd3d_cond *cond) -{ - int ret; - - ret = pthread_cond_broadcast(&cond->cond); - if (ret) - ERR("Could not broadcast the condition variable, error %d.\n", ret); -} - -static inline void vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock) -{ - int ret; - - ret = pthread_cond_wait(&cond->cond, &lock->lock); - if (ret) - ERR("Could not wait on the condition variable, error %d.\n", ret); -} - -static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond) -{ - int ret; - - ret = pthread_cond_destroy(&cond->cond); - if (ret) - ERR("Could not destroy the condition variable, error %d.\n", ret); -} - # if HAVE_SYNC_BOOL_COMPARE_AND_SWAP static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) {

1 0

Conor McCarthy : tests/hlsl: Add wave op tests.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: vkd3d Branch: master Commit: d5c6e12dd32892aa445e9d47c6622321d50d7182 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d5c6e12dd32892aa445e9d47c6622… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 16 14:30:12 2024 +1000 tests/hlsl: Add wave op tests. --- Makefile.am | 2 + tests/hlsl/wave-ops-float.shader_test | 459 ++++++++++++++++++++++++++++++++++ tests/hlsl/wave-ops-int.shader_test | 55 ++++ tests/hlsl/wave-ops-uint.shader_test | 304 ++++++++++++++++++++++ 4 files changed, 820 insertions(+)

1 0

Conor McCarthy : vkd3d-shader/dxil: Support patch constant functions and signatures.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: vkd3d Branch: master Commit: 4457181b2a9ffdb889bb33322c9fd60f9b602f80 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4457181b2a9ffdb889bb33322c9fd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 14:31:16 2023 +1000 vkd3d-shader/dxil: Support patch constant functions and signatures. --- libs/vkd3d-shader/dxil.c | 114 ++++++++++++++++++++++++++----- libs/vkd3d-shader/ir.c | 14 +++- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++ 3 files changed, 114 insertions(+), 18 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics LoadOutputControlPoint and LoadPatchConstant.
by Alexandre Julliard 22 Apr '24

22 Apr '24

Module: vkd3d Branch: master Commit: 34799629834e20e890435e3e13d554932749107e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/34799629834e20e890435e3e13d55… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 14:47:37 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsics LoadOutputControlPoint and LoadPatchConstant. --- libs/vkd3d-shader/dxil.c | 47 +++++++++++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0e3ce50c..3e3a320b 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -419,6 +419,8 @@ enum dx_intrinsic_opcode DX_FLATTENED_THREAD_ID_IN_GROUP = 96, DX_MAKE_DOUBLE = 101, DX_SPLIT_DOUBLE = 102, + DX_LOAD_OUTPUT_CONTROL_POINT = 103, + DX_LOAD_PATCH_CONSTANT = 104, DX_PRIMITIVE_ID = 108, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, @@ -2434,10 +2436,12 @@ static void register_index_address_init(struct vkd3d_shader_register_index *idx, if (sm6_value_is_constant(address)) { idx->offset = sm6_value_get_constant_uint(address); + idx->rel_addr = NULL; } else if (sm6_value_is_undef(address)) { idx->offset = 0; + idx->rel_addr = NULL; } else { @@ -5032,18 +5036,43 @@ static void sm6_parser_emit_dx_tertiary(struct sm6_parser *sm6, enum dx_intrinsi static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { + bool is_control_point = op == DX_LOAD_OUTPUT_CONTROL_POINT; + bool is_patch_constant = op == DX_LOAD_PATCH_CONSTANT; struct vkd3d_shader_instruction *ins = state->ins; + unsigned int count, row_index, column_index; + const struct vkd3d_shader_dst_param *params; struct vkd3d_shader_src_param *src_param; const struct shader_signature *signature; - unsigned int row_index, column_index; const struct signature_element *e; row_index = sm6_value_get_constant_uint(operands[0]); column_index = sm6_value_get_constant_uint(operands[2]); + if (is_control_point && operands[3]->is_undefined) + { + /* dxcompiler will compile source which does this, so let it pass. */ + WARN("Control point id is undefined.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_UNDEFINED_OPERAND, + "The index for a control point load is undefined."); + } + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); - signature = &sm6->p.program.input_signature; + if (is_patch_constant) + { + signature = &sm6->p.program.patch_constant_signature; + params = sm6->patch_constant_params; + } + else if (is_control_point) + { + signature = &sm6->p.program.output_signature; + params = sm6->output_params; + } + else + { + signature = &sm6->p.program.input_signature; + params = sm6->input_params; + } if (row_index >= signature->element_count) { WARN("Invalid row index %u.\n", row_index); @@ -5055,10 +5084,18 @@ static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, enum dx_intrin if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) return; - src_param->reg = sm6->input_params[row_index].reg; + src_param->reg = params[row_index].reg; src_param_init_scalar(src_param, column_index); + count = 0; + if (e->register_count > 1) - register_index_address_init(&src_param->reg.idx[0], operands[1], sm6); + register_index_address_init(&src_param->reg.idx[count++], operands[1], sm6); + + if (!is_patch_constant && !operands[3]->is_undefined) + { + assert(src_param->reg.idx_count > count); + register_index_address_init(&src_param->reg.idx[count], operands[3], sm6); + } instruction_dst_param_init_ssa_scalar(ins, sm6); } @@ -5808,6 +5845,8 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_LEGACY_F16TOF32 ] = {"f", "i", sm6_parser_emit_dx_unary}, [DX_LEGACY_F32TOF16 ] = {"i", "f", sm6_parser_emit_dx_unary}, [DX_LOAD_INPUT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input}, + [DX_LOAD_OUTPUT_CONTROL_POINT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input}, + [DX_LOAD_PATCH_CONSTANT ] = {"o", "ii8", sm6_parser_emit_dx_load_input}, [DX_LOG ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_MAKE_DOUBLE ] = {"d", "ii", sm6_parser_emit_dx_make_double}, [DX_PRIMITIVE_ID ] = {"i", "", sm6_parser_emit_dx_primitive_id}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 447f4ebb..1b60d96e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -202,6 +202,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_DXIL_INVALID_MASK = 8307, VKD3D_SHADER_WARNING_DXIL_INVALID_OPERATION = 8308, VKD3D_SHADER_WARNING_DXIL_IGNORING_ATTACHMENT = 8309, + VKD3D_SHADER_WARNING_DXIL_UNDEFINED_OPERAND = 8310, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED = 9000, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER = 9001,

1 0