wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Józef Kucia : d3d12: Implement D3D12CreateDevice().
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: ef88037bdaa532e52f46dc4d89143a8621022ff0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef88037bdaa532e52f46dc4d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 21:02:18 2018 +0200 d3d12: Implement D3D12CreateDevice(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/Makefile.in | 1 + dlls/d3d12/d3d12_main.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index 458f3e2..62fb01a 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,5 +1,6 @@ MODULE = d3d12.dll IMPORTLIB = d3d12 +IMPORTS = gdi32 user32 EXTRALIBS = $(VKD3D_LIBS) EXTRAINCL = $(VKD3D_CFLAGS) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index bb17cbc..c1dc8c8 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -26,7 +26,9 @@ #define WINE_VK_ALIGN(x) #include "wine/debug.h" +#include "wine/heap.h" #include "wine/vulkan.h" +#include "wine/vulkan_driver.h" #include "d3d12.h" @@ -41,13 +43,101 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) return E_NOTIMPL; } +static HRESULT d3d12_signal_event(HANDLE event) +{ + return SetEvent(event) ? S_OK : E_FAIL; +} + +struct d3d12_thread_data +{ + PFN_vkd3d_thread main_pfn; + void *data; +}; + +static DWORD WINAPI d3d12_thread_main(void *data) +{ + struct d3d12_thread_data *thread_data = data; + + thread_data->main_pfn(thread_data->data); + heap_free(thread_data); + return 0; +} + +static void *d3d12_create_thread(PFN_vkd3d_thread main_pfn, void *data) +{ + struct d3d12_thread_data *thread_data; + HANDLE thread; + + if (!(thread_data = heap_alloc(sizeof(*thread_data)))) + { + ERR("Failed to allocate thread data.\n"); + return NULL; + } + + thread_data->main_pfn = main_pfn; + thread_data->data = data; + + if (!(thread = CreateThread(NULL, 0, d3d12_thread_main, thread_data, 0, NULL))) + heap_free(thread_data); + + return thread; +} + +static HRESULT d3d12_join_thread(void *handle) +{ + HANDLE thread = handle; + DWORD ret; + + if ((ret = WaitForSingleObject(thread, INFINITE)) != WAIT_OBJECT_0) + ERR("Failed to wait for thread, ret %#x.\n", ret); + CloseHandle(thread); + return ret == WAIT_OBJECT_0 ? S_OK : E_FAIL; +} + +static const struct vulkan_funcs *get_vk_funcs(void) +{ + const struct vulkan_funcs *vk_funcs; + HDC hdc; + + hdc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, hdc); + return vk_funcs; +} + HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { - FIXME("adapter %p, minimum_feature_level %#x, iid %s, device %p stub!\n", + struct vkd3d_instance_create_info instance_create_info; + struct vkd3d_device_create_info device_create_info; + const struct vulkan_funcs *vk_funcs; + + TRACE("adapter %p, minimum_feature_level %#x, iid %s, device %p.\n", adapter, minimum_feature_level, debugstr_guid(iid), device); - return E_NOTIMPL; + if (!(vk_funcs = get_vk_funcs())) + { + ERR("Failed to get Wine Vulkan driver.\n"); + return E_FAIL; + } + + FIXME("Ignoring adapter %p.\n", adapter); + + memset(&instance_create_info, 0, sizeof(instance_create_info)); + instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_create_info.pfn_signal_event = d3d12_signal_event; + instance_create_info.pfn_create_thread = d3d12_create_thread; + instance_create_info.pfn_join_thread = d3d12_join_thread; + instance_create_info.wchar_size = sizeof(WCHAR); + instance_create_info.pfn_vkGetInstanceProcAddr + = (PFN_vkGetInstanceProcAddr)vk_funcs->p_vkGetInstanceProcAddr; + + memset(&device_create_info, 0, sizeof(device_create_info)); + device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.minimum_feature_level = minimum_feature_level; + device_create_info.instance_create_info = &instance_create_info; + + return vkd3d_create_device(&device_create_info, iid, device); } HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size,

1 0

Józef Kucia : d3d12: Implement D3D12SerializeRootSignature().
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 803fa9620538e283c7e101983dd32d1df65c3f71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=803fa9620538e283c7e10198… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 21:02:17 2018 +0200 d3d12: Implement D3D12SerializeRootSignature(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12.spec | 2 +- dlls/d3d12/d3d12_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index b607993..53151bf 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -5,4 +5,4 @@ 104 stub D3D12CoreGetLayeredDeviceSize 105 stub D3D12CoreRegisterLayers 106 stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) -107 stub D3D12SerializeRootSignature +107 stdcall D3D12SerializeRootSignature(ptr long ptr ptr) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index b810dd5..bb17cbc 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -58,3 +58,12 @@ HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T dat return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); } + +HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, + D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) +{ + TRACE("root_signature_desc %p, version %#x, blob %p, error_blob %p.\n", + root_signature_desc, version, blob, error_blob); + + return vkd3d_serialize_root_signature(root_signature_desc, version, blob, error_blob); +}

1 0

Józef Kucia : d3d12: Implement D3D12CreateRootSignatureDeserializer().
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: ee4a02ce77023ecf61c1a521da6c99c97e67c9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee4a02ce77023ecf61c1a521… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 21:02:16 2018 +0200 d3d12: Implement D3D12CreateRootSignatureDeserializer(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/Makefile.in | 2 ++ dlls/d3d12/d3d12.spec | 2 +- dlls/d3d12/d3d12_main.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index d7ee1b5..458f3e2 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,5 +1,7 @@ MODULE = d3d12.dll IMPORTLIB = d3d12 +EXTRALIBS = $(VKD3D_LIBS) +EXTRAINCL = $(VKD3D_CFLAGS) C_SRCS = \ d3d12_main.c diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 613092b..b607993 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -4,5 +4,5 @@ 103 stub D3D12CoreCreateLayeredDevice 104 stub D3D12CoreGetLayeredDeviceSize 105 stub D3D12CoreRegisterLayers -106 stub D3D12CreateRootSignatureDeserializer +106 stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) 107 stub D3D12SerializeRootSignature diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index c1598ca..b810dd5 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -20,9 +20,18 @@ #include "config.h" #include "wine/port.h" +#define VK_NO_PROTOTYPES +#define VKD3D_NO_VULKAN_H +#define VKD3D_NO_WIN32_TYPES +#define WINE_VK_ALIGN(x) + #include "wine/debug.h" +#include "wine/vulkan.h" + #include "d3d12.h" +#include <vkd3d.h> + WINE_DEFAULT_DEBUG_CHANNEL(d3d12); HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) @@ -40,3 +49,12 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe return E_NOTIMPL; } + +HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer) +{ + TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", + data, data_size, debugstr_guid(iid), deserializer); + + return vkd3d_create_root_signature_deserializer(data, data_size, iid, deserializer); +}

1 0

Józef Kucia : configure: Check for libvkd3d.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 281bdcac73ffc4ef5eb795e51d230efe8b436938 URL: https://source.winehq.org/git/wine.git/?a=commit;h=281bdcac73ffc4ef5eb795e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 21:02:15 2018 +0200 configure: Check for libvkd3d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 11 ++++++ include/config.h.in | 3 ++ 3 files changed, 119 insertions(+) diff --git a/configure b/configure index ec15a90..2d526c5 100755 --- a/configure +++ b/configure @@ -636,6 +636,8 @@ UNWINDFLAGS EXCESS_PRECISION_CFLAGS BUILTINFLAG EXTRACFLAGS +VKD3D_LIBS +VKD3D_CFLAGS NETAPI_LIBS NETAPI_CFLAGS PROCSTAT_LIBS @@ -863,6 +865,7 @@ with_sdl with_tiff with_udev with_v4l +with_vkd3d with_vulkan with_xcomposite with_xcursor @@ -1814,6 +1817,8 @@ MPG123_CFLAGS MPG123_LIBS NETAPI_CFLAGS NETAPI_LIBS +VKD3D_CFLAGS +VKD3D_LIBS LDAP_CFLAGS LDAP_LIBS' @@ -2493,6 +2498,7 @@ Optional Packages: --without-tiff do not use TIFF --without-udev do not use udev (plug and play support) --without-v4l do not use v4l1 (v4l support) + --without-vkd3d do not use vkd3d (Direct3D 12 support) --without-vulkan do not use Vulkan --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension @@ -2591,6 +2597,9 @@ Some influential environment variables: NETAPI_CFLAGS C compiler flags for netapi, overriding pkg-config NETAPI_LIBS Linker flags for netapi, overriding pkg-config + VKD3D_CFLAGS + C compiler flags for libvkd3d, overriding pkg-config + VKD3D_LIBS Linker flags for libvkd3d, overriding pkg-config LDAP_CFLAGS C compiler flags for openldap, overriding pkg-config LDAP_LIBS Linker flags for openldap, overriding pkg-config @@ -3814,6 +3823,12 @@ if test "${with_v4l+set}" = set; then : fi +# Check whether --with-vkd3d was given. +if test "${with_vkd3d+set}" = set; then : + withval=$with_vkd3d; +fi + + # Check whether --with-vulkan was given. if test "${with_vulkan+set}" = set; then : withval=$with_vulkan; @@ -14678,6 +14693,94 @@ esac fi +if test "x$with_vkd3d" != "xno" +then + if ${VKD3D_CFLAGS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + VKD3D_CFLAGS=`$PKG_CONFIG --cflags libvkd3d 2>/dev/null` +fi +fi + +if ${VKD3D_LIBS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + VKD3D_LIBS=`$PKG_CONFIG --libs libvkd3d 2>/dev/null` +fi +fi + + +$as_echo "$as_me:${as_lineno-$LINENO}: libvkd3d cflags: $VKD3D_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libvkd3d libs: $VKD3D_LIBS" >&5 +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $VKD3D_CFLAGS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lvkd3d" >&5 +$as_echo_n "checking for -lvkd3d... " >&6; } +if ${ac_cv_lib_soname_vkd3d+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lvkd3d $VKD3D_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char vkd3d_create_device (); +int +main () +{ +return vkd3d_create_device (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ac_cv_lib_soname_vkd3d=`$ac_cv_path_LDD conftest.exe | grep "vkd3d" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_vkd3d=`$OTOOL -L conftest$ac_exeext | grep "libvkd3d\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libvkd3d\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_vkd3d=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libvkd3d\\.$LIBEXT" | sed -e "s/^.*\\[\$libvkd3d\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + if ${ac_cv_lib_soname_vkd3d:+false} :; then : + ac_cv_lib_soname_vkd3d=`$LDD conftest$ac_exeext | grep "libvkd3d\\.$LIBEXT" | sed -e "s/^.*$libvkd3d\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` +fi ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if ${ac_cv_lib_soname_vkd3d:+false} :; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_vkd3d" >&5 +$as_echo "$ac_cv_lib_soname_vkd3d" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBVKD3D "$ac_cv_lib_soname_vkd3d" +_ACEOF + + +fi +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$VKD3D_CFLAGS" || VKD3D_CFLAGS=`echo " $VKD3D_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$VKD3D_LIBS" || VKD3D_LIBS=`echo " $VKD3D_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + +fi +if test "x$ac_cv_lib_soname_vkd3d" = "x"; then : + case "x$with_vkd3d" in + x) as_fn_append wine_notices "|vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported." ;; + xno) ;; + *) as_fn_error $? "vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported. +This is an error since --with-vkd3d was requested." "$LINENO" 5 ;; +esac + +fi +test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no} + EXTRACFLAGS="" @@ -18184,6 +18287,8 @@ KSTAT_LIBS = $KSTAT_LIBS PROCSTAT_LIBS = $PROCSTAT_LIBS NETAPI_CFLAGS = $NETAPI_CFLAGS NETAPI_LIBS = $NETAPI_LIBS +VKD3D_CFLAGS = $VKD3D_CFLAGS +VKD3D_LIBS = $VKD3D_LIBS EXCESS_PRECISION_CFLAGS = $EXCESS_PRECISION_CFLAGS DL_LIBS = $DL_LIBS POLL_LIBS = $POLL_LIBS diff --git a/configure.ac b/configure.ac index 312c235..3a6a3a1 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,7 @@ AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) +AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) @@ -1855,6 +1856,16 @@ fi WINE_NOTICE_WITH(vulkan,[test "x$ac_cv_lib_soname_vulkan" = "x"], [libvulkan ${notice_platform}development files not found, Vulkan won't be supported.]) +dnl **** Check for vkd3d **** +if test "x$with_vkd3d" != "xno" +then + WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,, + [WINE_CHECK_SONAME(vkd3d,vkd3d_create_device,,,[$VKD3D_LIBS])]) +fi +WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"], + [vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported.]) +test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no} + dnl **** Check for gcc specific options **** AC_SUBST(EXTRACFLAGS,"") diff --git a/include/config.h.in b/include/config.h.in index 3346b01..c3247cb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1545,6 +1545,9 @@ /* Define to the soname of the libv4l1 library. */ #undef SONAME_LIBV4L1 +/* Define to the soname of the libvkd3d library. */ +#undef SONAME_LIBVKD3D + /* Define to the soname of the libvulkan library. */ #undef SONAME_LIBVULKAN

1 0

Józef Kucia : libs/vkd3d: Rename default sampler to dummy sampler.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: b5d1dbd1825966e7375c4e9170bb90abcaede8d4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b5d1dbd1825966e7375c4e9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:38 2018 +0200 libs/vkd3d: Rename default sampler to dummy sampler. 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/device.c | 12 ++++++------ libs/vkd3d/state.c | 22 +++++++++++----------- libs/vkd3d/vkd3d_private.h | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 48ad7c5..e4c4d52 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1075,7 +1075,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, return S_OK; } -static HRESULT d3d12_device_create_default_sampler(struct d3d12_device *device) +static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device) { D3D12_STATIC_SAMPLER_DESC sampler_desc; @@ -1084,7 +1084,7 @@ static HRESULT d3d12_device_create_default_sampler(struct d3d12_device *device) sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_default_sampler); + return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_dummy_sampler); } static void d3d12_device_init_pipeline_cache(struct d3d12_device *device) @@ -1273,7 +1273,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); - VK_CALL(vkDestroySampler(device->vk_device, device->vk_default_sampler, NULL)); + VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); if (device->vk_pipeline_cache) VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); d3d12_device_destroy_vkd3d_queues(device); @@ -2222,10 +2222,10 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, return hr; } - if (FAILED(hr = d3d12_device_create_default_sampler(device))) + if (FAILED(hr = d3d12_device_create_dummy_sampler(device))) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - ERR("Failed to create default sampler, hr %#x.\n", hr); + ERR("Failed to create dummy sampler, hr %#x.\n", hr); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); vkd3d_instance_decref(device->vkd3d_instance); return hr; @@ -2234,7 +2234,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VK_CALL(vkDestroySampler(device->vk_device, device->vk_default_sampler, NULL)); + VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); vkd3d_instance_decref(device->vkd3d_instance); return hr; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2e01263..19e6549 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -769,19 +769,19 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign return S_OK; } -static HRESULT d3d12_root_signature_init_default_sampler(struct d3d12_root_signature *root_signature, +static HRESULT d3d12_root_signature_init_dummy_sampler(struct d3d12_root_signature *root_signature, struct d3d12_device *device, struct vkd3d_descriptor_set_context *context) { VkDescriptorSetLayoutBinding *binding = context->current_binding; - root_signature->default_sampler.set = context->set_index; - root_signature->default_sampler.binding = context->descriptor_binding++; + root_signature->dummy_sampler.set = context->set_index; + root_signature->dummy_sampler.binding = context->descriptor_binding++; - binding->binding = root_signature->default_sampler.binding; + binding->binding = root_signature->dummy_sampler.binding; binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; binding->descriptorCount = 1; binding->stageFlags = VK_SHADER_STAGE_ALL; - binding->pImmutableSamplers = &device->vk_default_sampler; + binding->pImmutableSamplers = &device->vk_dummy_sampler; ++context->current_binding; return S_OK; @@ -877,7 +877,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa VkDescriptorSetLayoutBinding *binding_desc; struct d3d12_root_signature_info info; VkDescriptorSetLayout set_layouts[2]; - bool needs_default_sampler; + bool needs_dummy_sampler; HRESULT hr; memset(&context, 0, sizeof(context)); @@ -917,8 +917,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->root_descriptor_count = info.root_descriptor_count; /* An additional sampler is created for SpvOpImageFetch. */ - needs_default_sampler = info.srv_count || info.buffer_srv_count; - if (needs_default_sampler) + needs_dummy_sampler = info.srv_count || info.buffer_srv_count; + if (needs_dummy_sampler) { ++info.sampler_count; ++info.descriptor_count; @@ -970,7 +970,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; if (FAILED(hr = d3d12_root_signature_init_static_samplers(root_signature, device, desc, &context))) goto fail; - if (needs_default_sampler && FAILED(hr = d3d12_root_signature_init_default_sampler(root_signature, + if (needs_dummy_sampler && FAILED(hr = d3d12_root_signature_init_dummy_sampler(root_signature, device, &context))) goto fail; @@ -1429,7 +1429,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; - shader_interface.dummy_sampler = root_signature->default_sampler; + shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -1945,7 +1945,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; - shader_interface.dummy_sampler = root_signature->default_sampler; + shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4a359db..7506471 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -426,7 +426,7 @@ struct d3d12_root_signature unsigned int descriptor_count; struct vkd3d_shader_resource_binding *descriptor_mapping; - struct vkd3d_shader_descriptor_binding default_sampler; + struct vkd3d_shader_descriptor_binding dummy_sampler; unsigned int root_constant_count; struct vkd3d_shader_push_constant_buffer *root_constants; @@ -664,7 +664,7 @@ struct d3d12_device VkPipelineCache vk_pipeline_cache; /* A sampler used for SpvOpImageFetch. */ - VkSampler vk_default_sampler; + VkSampler vk_dummy_sampler; VkPhysicalDeviceMemoryProperties memory_properties;

1 0

Józef Kucia : libs/vkd3d-shader: Rename default sampler to dummy sampler.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: a87b3f3fb267e9059658039ae61d395bef4a2245 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a87b3f3fb267e9059658039… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:37 2018 +0200 libs/vkd3d-shader: Rename default sampler to dummy sampler. 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> --- include/private/vkd3d_shader.h | 2 +- libs/vkd3d-shader/spirv.c | 26 +++++++++++++------------- libs/vkd3d/state.c | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index 1f8fa39..61789d6 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -119,7 +119,7 @@ struct vkd3d_shader_interface * * In Vulkan OpImageFetch must be used with a sampled image. */ - struct vkd3d_shader_descriptor_binding default_sampler; + struct vkd3d_shader_descriptor_binding dummy_sampler; const struct vkd3d_shader_uav_counter_binding *uav_counters; unsigned int uav_counter_count; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4b2b46c..f4c9421 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1851,7 +1851,7 @@ struct vkd3d_dxbc_compiler } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t output_setup_function_id; - uint32_t default_sampler_id; + uint32_t dummy_sampler_id; uint32_t binding_idx; @@ -3340,15 +3340,15 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } -static uint32_t vkd3d_dxbc_compiler_get_default_sampler_id(struct vkd3d_dxbc_compiler *compiler) +static uint32_t vkd3d_dxbc_compiler_get_dummy_sampler_id(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, var_id; - if (compiler->default_sampler_id) - return compiler->default_sampler_id; + if (compiler->dummy_sampler_id) + return compiler->dummy_sampler_id; type_id = vkd3d_spirv_get_op_type_sampler(builder); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); @@ -3356,14 +3356,14 @@ static uint32_t vkd3d_dxbc_compiler_get_default_sampler_id(struct vkd3d_dxbc_com ptr_type_id, storage_class, 0); vkd3d_spirv_build_op_decorate1(builder, var_id, - SpvDecorationDescriptorSet, shader_interface->default_sampler.set); + SpvDecorationDescriptorSet, shader_interface->dummy_sampler.set); vkd3d_spirv_build_op_decorate1(builder, var_id, - SpvDecorationBinding, shader_interface->default_sampler.binding); + SpvDecorationBinding, shader_interface->dummy_sampler.binding); - vkd3d_spirv_build_op_name(builder, var_id, "default_sampler"); + vkd3d_spirv_build_op_name(builder, var_id, "dummy_sampler"); - compiler->default_sampler_id = var_id; - return compiler->default_sampler_id; + compiler->dummy_sampler_id = var_id; + return compiler->dummy_sampler_id; } static const struct vkd3d_spirv_resource_type *vkd3d_dxbc_compiler_enable_resource_type( @@ -4781,11 +4781,11 @@ static void vkd3d_dxbc_compiler_prepare_sampled_image_for_sampler(struct vkd3d_d sampled_image_type_id, image->image_id, image->sampler_id); } -static void vkd3d_dxbc_compiler_prepare_default_sampled_image(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_prepare_dummy_sampled_image(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_image *image, const struct vkd3d_shader_register *resource_reg) { vkd3d_dxbc_compiler_prepare_sampled_image_for_sampler(compiler, image, resource_reg, - vkd3d_dxbc_compiler_get_default_sampler_id(compiler), false); + vkd3d_dxbc_compiler_get_dummy_sampler_id(compiler), false); } static void vkd3d_dxbc_compiler_prepare_sampled_image(struct vkd3d_dxbc_compiler *compiler, @@ -4813,7 +4813,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, FIXME("Texel offset not supported.\n"); /* OpImageFetch must be used with a sampled image. */ - vkd3d_dxbc_compiler_prepare_default_sampled_image(compiler, &image, &src[1].reg); + vkd3d_dxbc_compiler_prepare_dummy_sampled_image(compiler, &image, &src[1].reg); image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); @@ -5023,7 +5023,7 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc { /* OpImageFetch must be used with a sampled image. */ op = SpvOpImageFetch; - vkd3d_dxbc_compiler_prepare_default_sampled_image(compiler, &image, &resource->reg); + vkd3d_dxbc_compiler_prepare_dummy_sampled_image(compiler, &image, &resource->reg); image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); } else diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9129d12..2e01263 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1429,7 +1429,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; - shader_interface.default_sampler = root_signature->default_sampler; + shader_interface.dummy_sampler = root_signature->default_sampler; shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -1945,7 +1945,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; shader_interface.push_constant_buffer_count = root_signature->root_constant_count; - shader_interface.default_sampler = root_signature->default_sampler; + shader_interface.dummy_sampler = root_signature->default_sampler; shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0;

1 0

Józef Kucia : libs/vkd3d: Fix rendering to DXGI_FORMAT_A8_UNORM.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: 78c952ee5ff0b7159af9b629fcb823140eaa9b85 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=78c952ee5ff0b7159af9b62… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:36 2018 +0200 libs/vkd3d: Fix rendering to DXGI_FORMAT_A8_UNORM. In Direct3D alpha is taken from the .r component. 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/state.c | 30 ++++++++++++++++++++++++++---- tests/d3d12.c | 2 +- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 826d68f..9129d12 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1263,7 +1263,8 @@ static void dump_shader_stage(VkShaderStageFlagBits stage, const void *data, siz static HRESULT create_shader_stage(struct d3d12_device *device, struct VkPipelineShaderStageCreateInfo *stage_desc, enum VkShaderStageFlagBits stage, - const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface *shader_interface) + const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface *shader_interface, + const struct vkd3d_shader_compile_arguments *compile_args) { struct vkd3d_shader_code dxbc = {code->pShaderBytecode, code->BytecodeLength}; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1284,7 +1285,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, shader_desc.flags = 0; dump_shader_stage(stage, code->pShaderBytecode, code->BytecodeLength); - if ((ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, shader_interface, NULL)) < 0) + if ((ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, 0, shader_interface, compile_args)) < 0) { WARN("Failed to compile shader, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); @@ -1436,7 +1437,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st pipeline_info.pNext = NULL; pipeline_info.flags = 0; if (FAILED(hr = create_shader_stage(device, &pipeline_info.stage, - VK_SHADER_STAGE_COMPUTE_BIT, &desc->CS, &shader_interface))) + VK_SHADER_STAGE_COMPUTE_BIT, &desc->CS, &shader_interface, NULL))) { if (state->vk_set_layout) VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); @@ -1789,12 +1790,23 @@ static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input return S_OK; } +static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *format) +{ + if (format->dxgi_format == DXGI_FORMAT_A8_UNORM) + return VKD3D_SWIZZLE(VKD3D_SWIZZLE_W, VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_Y, VKD3D_SWIZZLE_Z); + + return VKD3D_NO_SWIZZLE; +} + static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *state, struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc) { + unsigned int ps_output_swizzle[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const struct vkd3d_shader_compile_arguments *compile_args; uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; + struct vkd3d_shader_compile_arguments ps_compile_args; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_interface shader_interface; struct vkd3d_shader_signature input_signature; @@ -1907,6 +1919,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); + graphics->attachments[idx].flags = 0; graphics->attachments[idx].format = format->vk_format; graphics->attachments[idx].samples = VK_SAMPLE_COUNT_1_BIT; @@ -1924,6 +1938,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } graphics->attachment_count = graphics->rt_idx + rt_count; + ps_compile_args.output_swizzles = ps_output_swizzle; + ps_compile_args.output_swizzle_count = rt_count; + shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; @@ -1952,8 +1969,13 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (shader_info.uav_counter_mask) FIXME("UAV counters not implemented for graphics pipelines.\n"); + if (shader_stages[i].stage == VK_SHADER_STAGE_FRAGMENT_BIT) + compile_args = &ps_compile_args; + else + compile_args = NULL; + if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], - shader_stages[i].stage, b, &shader_interface))) + shader_stages[i].stage, b, &shader_interface, compile_args))) goto fail; if (shader_stages[i].stage == VK_SHADER_STAGE_VERTEX_BIT diff --git a/tests/d3d12.c b/tests/d3d12.c index c7303f8..0e35fc8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -694,7 +694,7 @@ static void check_readback_data_uint8_(unsigned int line, struct resource_readba if (!all_match) break; } - todo_(line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u).\n", got, expected, x, y); + ok_(line)(all_match, "Got 0x%02x, expected 0x%02x at (%u, %u).\n", got, expected, x, y); } #define check_sub_resource_uint8(a, b, c, d, e, f) check_sub_resource_uint8_(__LINE__, a, b, c, d, e, f)

1 0

Józef Kucia : libs/vkd3d-shader: Implement swizzling for shader outputs.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: 40ee9fa0e9204c7891670a8393312a7b85314906 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=40ee9fa0e9204c7891670a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:35 2018 +0200 libs/vkd3d-shader: Implement swizzling for shader outputs. 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> --- include/private/vkd3d_shader.h | 23 ++++++++++++++++++++++- libs/vkd3d-shader/spirv.c | 25 ++++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 9 +++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 13 +------------ libs/vkd3d/state.c | 2 +- programs/vkd3d-compiler/main.c | 2 +- 6 files changed, 52 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=40ee9fa0e9204c78916…

1 0

Józef Kucia : libs/vkd3d-shader: Rework swizzle macros.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: 926f844ead86849c27cdb875dd5cd83fe918b368 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=926f844ead86849c27cdb87… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:34 2018 +0200 libs/vkd3d-shader: Rework swizzle macros. 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/dxbc.c | 4 ++-- libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 17 +++++++++++++---- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5f87eae..87b2d71 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1521,7 +1521,7 @@ static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * if (src_param->reg.type == VKD3DSPR_IMMCONST) { - src_param->swizzle = VKD3DSP_NOSWIZZLE; + src_param->swizzle = VKD3D_NO_SWIZZLE; } else { @@ -1531,7 +1531,7 @@ static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * switch (swizzle_type) { case VKD3D_SM4_SWIZZLE_NONE: - src_param->swizzle = VKD3DSP_NOSWIZZLE; + src_param->swizzle = VKD3D_NO_SWIZZLE; break; case VKD3D_SM4_SWIZZLE_SCALAR: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f646d54..53ddd44 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2349,7 +2349,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle(struct vkd3d_dxbc_compiler *com unsigned int i, component_idx, component_count; uint32_t type_id, components[VKD3D_VEC4_SIZE]; - if (swizzle == VKD3DSP_NOSWIZZLE && write_mask == VKD3DSP_WRITEMASK_ALL) + if (swizzle == VKD3D_NO_SWIZZLE && write_mask == VKD3DSP_WRITEMASK_ALL) return val_id; component_count = vkd3d_write_mask_component_count(write_mask); @@ -2972,7 +2972,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (val_id && input_component_count != component_count) val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, VKD3D_TYPE_FLOAT, VKD3DSP_NOSWIZZLE, dst->write_mask); + val_id, VKD3D_TYPE_FLOAT, VKD3D_NO_SWIZZLE, dst->write_mask); vkd3d_symbol_make_register(&reg_symbol, reg); @@ -4601,7 +4601,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ assert(compiler->control_flow_depth); assert(cf_info->current_block == VKD3D_BLOCK_SWITCH); - assert(src->swizzle == VKD3DSP_NOSWIZZLE && src->reg.type == VKD3DSPR_IMMCONST); + assert(src->swizzle == VKD3D_NO_SWIZZLE && src->reg.type == VKD3DSPR_IMMCONST); value = *src->reg.u.immconst_data; if (!vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, @@ -5946,7 +5946,7 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com write_mask = signature->elements[i].mask & 0xff; val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - param_id[variable_idx], VKD3D_TYPE_FLOAT, VKD3DSP_NOSWIZZLE, write_mask); + param_id[variable_idx], VKD3D_TYPE_FLOAT, VKD3D_NO_SWIZZLE, write_mask); if (compiler->output_info[i].component_type != VKD3D_TYPE_FLOAT) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 09c2e1d..45af2db 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -390,8 +390,6 @@ enum vkd3d_immconst_type VKD3D_IMMCONST_VEC4, }; -#define VKD3DSP_NOSWIZZLE (0u | (1u << 2) | (2u << 4) | (3u << 6)) - enum vkd3d_shader_src_modifier { VKD3DSPSM_NONE = 0, @@ -852,11 +850,22 @@ static inline unsigned int vkd3d_write_mask_component_count(DWORD write_mask) return count; } +/* swizzle bits fields: wwzzyyxx */ +#define VKD3D_SWIZZLE_X (0u) +#define VKD3D_SWIZZLE_Y (1u) +#define VKD3D_SWIZZLE_Z (2u) +#define VKD3D_SWIZZLE_W (3u) +#define VKD3D_SWIZZLE_MASK (0x3u) +#define VKD3D_SWIZZLE_SHIFT(idx) (2u * (idx)) +#define VKD3D_NO_SWIZZLE ((VKD3D_SWIZZLE_X << VKD3D_SWIZZLE_SHIFT(0)) \ + | (VKD3D_SWIZZLE_Y << VKD3D_SWIZZLE_SHIFT(1)) \ + | (VKD3D_SWIZZLE_Z << VKD3D_SWIZZLE_SHIFT(2)) \ + | (VKD3D_SWIZZLE_W << VKD3D_SWIZZLE_SHIFT(3))) + static inline unsigned int vkd3d_swizzle_get_component(DWORD swizzle, unsigned int idx) { - /* swizzle bits fields: wwzzyyxx */ - return (swizzle >> (2 * idx)) & 0x3; + return (swizzle >> VKD3D_SWIZZLE_SHIFT(idx)) & VKD3D_SWIZZLE_MASK; } #define VKD3D_DXBC_MAX_SOURCE_COUNT 6

1 0

Józef Kucia : libs/vkd3d: Process render target formats before shaders.
by Alexandre Julliard 24 May '18

24 May '18

Module: vkd3d Branch: master Commit: 3198cab3ed7670a7853aad4e9e68dc96f06b4b2f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3198cab3ed7670a7853aad4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 24 13:08:33 2018 +0200 libs/vkd3d: Process render target formats before shaders. We may need to swizzle components in pixel shader based on render target formats because Vulkan doesn't support swizzles for framebuffer attachment image views. 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/state.c | 174 ++++++++++++++++++++++++++--------------------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b89f854..4841b0d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1837,6 +1837,93 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s return E_INVALIDARG; } + rt_count = desc->NumRenderTargets; + if (rt_count > ARRAY_SIZE(graphics->attachments) - 1) + { + FIXME("NumRenderTargets %zu > %zu, ignoring extra formats.\n", + rt_count, ARRAY_SIZE(graphics->attachments) - 1); + rt_count = ARRAY_SIZE(graphics->attachments) - 1; + } + + graphics->rt_idx = 0; + if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) + { + const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; + VkImageLayout depth_layout; + + if (!(format = vkd3d_get_format(desc->DSVFormat, true))) + { + WARN("Invalid DXGI format %#x.\n", desc->DSVFormat); + hr = E_FAIL; + goto fail; + } + + if ((ds_desc->DepthEnable && ds_desc->DepthWriteMask) + || (ds_desc->StencilEnable && ds_desc->StencilWriteMask)) + depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + else + depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; + + graphics->attachments[0].flags = 0; + graphics->attachments[0].format = format->vk_format; + graphics->attachments[0].samples = VK_SAMPLE_COUNT_1_BIT; + if (desc->DepthStencilState.DepthEnable) + { + graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE; + } + else + { + graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + } + if (desc->DepthStencilState.StencilEnable) + { + graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; + } + else + { + graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + } + graphics->attachments[0].initialLayout = depth_layout; + graphics->attachments[0].finalLayout = depth_layout; + + graphics->attachment_references[0].attachment = 0; + graphics->attachment_references[0].layout = depth_layout; + ++graphics->rt_idx; + } + + for (i = 0; i < rt_count; ++i) + { + unsigned int blend_idx = desc->BlendState.IndependentBlendEnable ? i : 0; + size_t idx = graphics->rt_idx + i; + + if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) + { + WARN("Invalid DXGI format %#x.\n", desc->RTVFormats[i]); + hr = E_FAIL; + goto fail; + } + + graphics->attachments[idx].flags = 0; + graphics->attachments[idx].format = format->vk_format; + graphics->attachments[idx].samples = VK_SAMPLE_COUNT_1_BIT; + graphics->attachments[idx].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + graphics->attachments[idx].storeOp = VK_ATTACHMENT_STORE_OP_STORE; + graphics->attachments[idx].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + graphics->attachments[idx].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + graphics->attachments[idx].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + graphics->attachments[idx].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + graphics->attachment_references[idx].attachment = idx; + graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + blend_attachment_from_d3d12(&graphics->blend_attachments[i], &desc->BlendState.RenderTarget[blend_idx]); + } + graphics->attachment_count = graphics->rt_idx + rt_count; + shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; @@ -1956,93 +2043,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attribute_count = j; vkd3d_shader_free_shader_signature(&input_signature); - rt_count = desc->NumRenderTargets; - if (rt_count > ARRAY_SIZE(graphics->attachments) - 1) - { - FIXME("NumRenderTargets %zu > %zu, ignoring extra formats.\n", - rt_count, ARRAY_SIZE(graphics->attachments) - 1); - rt_count = ARRAY_SIZE(graphics->attachments) - 1; - } - - graphics->rt_idx = 0; - if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) - { - const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; - VkImageLayout depth_layout; - - if (!(format = vkd3d_get_format(desc->DSVFormat, true))) - { - WARN("Invalid DXGI format %#x.\n", desc->DSVFormat); - hr = E_FAIL; - goto fail; - } - - if ((ds_desc->DepthEnable && ds_desc->DepthWriteMask) - || (ds_desc->StencilEnable && ds_desc->StencilWriteMask)) - depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - else - depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; - - graphics->attachments[0].flags = 0; - graphics->attachments[0].format = format->vk_format; - graphics->attachments[0].samples = VK_SAMPLE_COUNT_1_BIT; - if (desc->DepthStencilState.DepthEnable) - { - graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - } - else - { - graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - } - if (desc->DepthStencilState.StencilEnable) - { - graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; - } - else - { - graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - } - graphics->attachments[0].initialLayout = depth_layout; - graphics->attachments[0].finalLayout = depth_layout; - - graphics->attachment_references[0].attachment = 0; - graphics->attachment_references[0].layout = depth_layout; - ++graphics->rt_idx; - } - - for (i = 0; i < rt_count; ++i) - { - unsigned int blend_idx = desc->BlendState.IndependentBlendEnable ? i : 0; - size_t idx = graphics->rt_idx + i; - - if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) - { - WARN("Invalid DXGI format %#x.\n", desc->RTVFormats[i]); - hr = E_FAIL; - goto fail; - } - - graphics->attachments[idx].flags = 0; - graphics->attachments[idx].format = format->vk_format; - graphics->attachments[idx].samples = VK_SAMPLE_COUNT_1_BIT; - graphics->attachments[idx].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[idx].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - graphics->attachments[idx].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[idx].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - graphics->attachments[idx].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - graphics->attachments[idx].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - - graphics->attachment_references[idx].attachment = idx; - graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - - blend_attachment_from_d3d12(&graphics->blend_attachments[i], &desc->BlendState.RenderTarget[blend_idx]); - } - graphics->attachment_count = graphics->rt_idx + rt_count; - sub_pass_desc.flags = 0; sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; sub_pass_desc.inputAttachmentCount = 0;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018