wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Zhiyi Zhang : include: Add missing notification codes.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: e93dcf5ca050653079d257eb255c581c216d91c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93dcf5ca050653079d257eb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 16 11:57:02 2018 +0800 include: Add missing notification codes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 4 ++++ include/richedit.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index b9e3ae6..c01d7c2 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1034,6 +1034,7 @@ static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; #define BCN_HOTITEMCHANGE (BCN_FIRST + 1) #define BCN_DROPDOWN (BCN_FIRST + 2) +#define NM_GETCUSTOMSPLITRECT (BCN_FIRST + 3) #define BCM_FIRST 0x1600 #define BCM_GETIDEALSIZE (BCM_FIRST + 1) @@ -1796,6 +1797,7 @@ static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_', #define TTN_GETDISPINFO WINELIB_NAME_AW(TTN_GETDISPINFO) #define TTN_SHOW (TTN_FIRST-1) #define TTN_POP (TTN_FIRST-2) +#define TTN_LINKCLICK (TTN_FIRST-3) #define TTN_NEEDTEXT TTN_GETDISPINFO #define TTN_NEEDTEXTA TTN_GETDISPINFOA @@ -2289,6 +2291,7 @@ static const WCHAR WC_PAGESCROLLERW[] = { 'S','y','s','P','a','g','e','r',0 }; #define PGN_LAST (0U-950U) #define PGN_SCROLL (PGN_FIRST-1) #define PGN_CALCSIZE (PGN_FIRST-2) +#define PGN_HOTITEMCHANGE (PGN_FIRST-3) #include <pshpack1.h> @@ -4723,6 +4726,7 @@ static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s', /* Notifications */ +#define MCN_VIEWCHANGE MCN_FIRST #define MCN_SELCHANGE (MCN_FIRST + 1) #define MCN_GETDAYSTATE (MCN_FIRST + 3) #define MCN_SELECT (MCN_FIRST + 4) diff --git a/include/richedit.h b/include/richedit.h index 63221e2..c224843 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -205,6 +205,9 @@ static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2',' #define EN_LOWFIRTF 0x070f #define EN_ALIGNLTR 0x0710 #define EN_ALIGNRTL 0x0711 +#define EN_CLIPFORMAT 0x0712 +#define EN_STARTCOMPOSITION 0x0713 +#define EN_ENDCOMPOSITION 0x0714 typedef DWORD (CALLBACK * EDITSTREAMCALLBACK)( DWORD_PTR, LPBYTE, LONG, LONG * );

1 0

Zebediah Figura : kernel32: Don' t clear WINEDEBUG in the debugger process if +winedbg is set.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: a1d12ad5c68de7f3cbe0e34baa83dd8eedaab64f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d12ad5c68de7f3cbe0e34b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 15 20:34:00 2018 -0500 kernel32: Don't clear WINEDEBUG in the debugger process if +winedbg is set. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/except.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index de244fc..c4f7faf 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -54,6 +54,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(winedbg); static PTOP_LEVEL_EXCEPTION_FILTER top_filter; @@ -289,15 +290,18 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) /* make WINEDEBUG empty in the environment */ env = GetEnvironmentStringsA(); - for (p = env; *p; p += strlen(p) + 1) + if (!TRACE_ON(winedbg)) { - if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 )) + for (p = env; *p; p += strlen(p) + 1) { - char *next = p + strlen(p); - char *end = next + 1; - while (*end) end += strlen(end) + 1; - memmove( p + sizeof("WINEDEBUG=") - 1, next, end + 1 - next ); - break; + if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 )) + { + char *next = p + strlen(p); + char *end = next + 1; + while (*end) end += strlen(end) + 1; + memmove( p + sizeof("WINEDEBUG=") - 1, next, end + 1 - next ); + break; + } } }

1 0

Alistair Leslie-Hughes : odbccp32: Correcly lookup driver in load_config_driver.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 7973699a8b13893818cbc37444d562a1e6669593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7973699a8b13893818cbc374… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 16 01:26:21 2018 +0000 odbccp32: Correcly lookup driver in load_config_driver. RegGetValueW doesn't return ERROR_MORE_DATA when the buffer parameter is NULL, unlike other Reg functions. This also passes the correct parameter(reg_driver) on the second call to RegGetValueW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 08645eb..a253035 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -259,19 +259,25 @@ static HMODULE load_config_driver(const WCHAR *driver) if ((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) { ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, NULL, &size); - if(ret == ERROR_MORE_DATA) + if(ret != ERROR_SUCCESS || type != REG_SZ) { - filename = HeapAlloc(GetProcessHeap(), 0, size); - if(!filename) - { - RegCloseKey(hkeydriver); - RegCloseKey(hkey); - push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); - return NULL; - } - ret = RegGetValueW(hkeydriver, NULL, driver, RRF_RT_REG_SZ, &type, filename, &size); + return NULL; + } + + filename = HeapAlloc(GetProcessHeap(), 0, size); + if(!filename) + { + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + return NULL; } + ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, filename, &size); RegCloseKey(hkeydriver); }

1 0

Alistair Leslie-Hughes : odbccp32: Handle NULL parameter in SQLWritePrivateProfileStringW.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 410610b55324da36146974128f89915577d1dfa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=410610b55324da3614697412… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 16 01:26:22 2018 +0000 odbccp32: Handle NULL parameter in SQLWritePrivateProfileStringW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 6 +++++- dlls/odbccp32/tests/misc.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 9420dce..08645eb 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1561,6 +1561,7 @@ BOOL WINAPI SQLWriteFileDSN(LPCSTR lpszFileName, LPCSTR lpszAppName, BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, LPCWSTR lpszString, LPCWSTR lpszFilename) { + static const WCHAR empty[] = {0}; LONG ret; HKEY hkey; @@ -1584,7 +1585,10 @@ BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry if ((ret = RegCreateKeyW(hkeyfilename, lpszSection, &hkey_section)) == ERROR_SUCCESS) { - ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)lpszString, (lstrlenW(lpszString)+1)*sizeof(WCHAR)); + if(lpszString) + ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)lpszString, (lstrlenW(lpszString)+1)*sizeof(WCHAR)); + else + ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)empty, sizeof(empty)); RegCloseKey(hkey_section); } diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 8a16a9e..be3873ac 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -171,6 +171,9 @@ static void test_SQLWritePrivateProfileString(void) { HKEY hkey; + ret = SQLWritePrivateProfileString("wineodbc", "testing" , NULL, "odbc.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, odbc_key, 0, KEY_READ, &hkey); ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); if(reg_ret == ERROR_SUCCESS)

1 0

Michael Stefaniuc : winemac.drv: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: d94de38f459fdccc9d52641abfd21144d7d88f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94de38f459fdccc9d52641a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 15 23:26:24 2018 +0200 winemac.drv: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 12 ++++---- dlls/winemac.drv/display.c | 8 ++--- dlls/winemac.drv/gdi.c | 3 +- dlls/winemac.drv/keyboard.c | 70 ++++++++++++++++++++---------------------- dlls/winemac.drv/macdrv_main.c | 4 +-- dlls/winemac.drv/mouse.c | 10 +++--- dlls/winemac.drv/opengl.c | 30 +++++++++--------- dlls/winemac.drv/systray.c | 2 +- dlls/winemac.drv/window.c | 2 +- 9 files changed, 69 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d94de38f459fdccc9d52…

1 0

Józef Kucia : build: Check how many arguments pthread_setname_np() takes.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: vkd3d Branch: master Commit: d9858b63b9579efba625d6a591ca8b0249c6e541 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d9858b63b9579efba625d6a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 18:13:32 2018 +0200 build: Check how many arguments pthread_setname_np() takes. Based on a patch by Chip Davis. 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> --- configure.ac | 2 +- libs/vkd3d/command.c | 4 +--- libs/vkd3d/vkd3d_private.h | 9 +++++++++ m4/check-functions.m4 | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index a610449..d437e1b 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popco VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) -VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +VKD3D_CHECK_PTHREAD_SETNAME_NP AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ce5f60f..9aba589 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -200,9 +200,7 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; -#ifdef HAVE_PTHREAD_SETNAME_NP - pthread_setname_np(pthread_self(), "vkd3d_worker"); -#endif + vkd3d_set_thread_name("vkd3d_worker"); for (;;) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f9a2f5a..278f4f6 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -826,4 +826,13 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, extern const char vkd3d_build[]; +static inline void vkd3d_set_thread_name(const char *name) +{ +#if defined(HAVE_PTHREAD_SETNAME_NP_2) + pthread_setname_np(pthread_self(), name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_1) + pthread_setname_np(name); +#endif +} + #endif /* __VKD3D_PRIVATE_H */ diff --git a/m4/check-functions.m4 b/m4/check-functions.m4 index 17082a1..4d018d6 100644 --- a/m4/check-functions.m4 +++ b/m4/check-functions.m4 @@ -14,3 +14,42 @@ AC_DEFUN([VKD3D_CHECK_LIB_FUNCS], LIBS="$LIBS $2" AC_CHECK_FUNCS([$1], [$3], [$4]) LIBS="$vkd3d_libs_saved"]) + +dnl VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP +AC_DEFUN([VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP], + [AC_MSG_CHECKING([how many arguments pthread_set_np() takes]) + AC_CACHE_VAL([vkd3d_cv_which_pthread_set_np], [ + +vkd3d_cv_which_pthread_set_np=unknown + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], + [pthread_setname_np(pthread_self(), "conftest")])], + [vkd3d_cv_which_pthread_set_np=two]) + +AS_IF([test "$vkd3d_cv_which_pthread_set_np" = "unknown"], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], + [pthread_setname_np("conftest")])], + [vkd3d_cv_which_pthread_set_np=one])]) + +]) dnl AC_CACHE_VAL + +AS_CASE(["$vkd3d_cv_which_pthread_set_np"], + [one], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_1], [1], + [Define to 1 if you have the one-argument variant of pthread_setname_np().]) + AC_MSG_RESULT([one])], + + [two], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_2], [1], + [Define to 1 if you have the two-argument variant of pthread_setname_np().]) + AC_MSG_RESULT([two])], + + [AC_MSG_RESULT([unknown])]) + +]) dnl AC_DEFUN + +dnl VKD3D_CHECK_PTHREAD_SETNAME_NP +AC_DEFUN([VKD3D_CHECK_PTHREAD_SETNAME_NP], + [VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) + AS_IF([test "x$ac_cv_func_pthread_setname_np" = "xyes"], + [VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP])])

1 0

Józef Kucia : build: Disable demos by default.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: vkd3d Branch: master Commit: aa12c0a7510bd807e7a7ca9df8c44f7791ce4bed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aa12c0a7510bd807e7a7ca9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 18:13:31 2018 +0200 build: Disable demos by default. 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> --- Makefile.am | 5 ++++- configure.ac | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index b066d0c..79e3155 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,16 +132,19 @@ TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ +if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ noinst_PROGRAMS += $(vkd3d_demos) -EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) demos_gears_CFLAGS = $(DEMOS_CFLAGS) demos_gears_LDADD = $(DEMOS_LDADD) -lm demos_triangle_CFLAGS = $(DEMOS_CFLAGS) demos_triangle_LDADD = $(DEMOS_LDADD) +endif + +EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) VKD3D_V_WIDL = $(vkd3d_v_widl_@AM_V@) vkd3d_v_widl_ = $(vkd3d_v_widl_@AM_DEFAULT_V@) diff --git a/configure.ac b/configure.ac index 2773a15..a610449 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,7 @@ AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) +AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) AC_USE_SYSTEM_EXTENSIONS @@ -95,6 +96,7 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"])

1 0

Józef Kucia : vkd3d: Try to keep current render pass as long as possible.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: vkd3d Branch: master Commit: c9380f8f7fa930ba16e59c6c23ba6ffcad0a5789 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c9380f8f7fa930ba16e59c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:58:00 2018 +0200 vkd3d: Try to keep current render pass as long as possible. A lot of Vulkan commands must be recorded outside a render pass. 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/command.c | 64 +++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 56 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c9380f8f7fa930ba16e…

1 0

Józef Kucia : vkd3d: Avoid invalidating current framebuffer needlessly.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: vkd3d Branch: master Commit: ffebe4524df09aa41792a8ed3115e98b6521aa88 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ffebe4524df09aa41792a8e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:59 2018 +0200 vkd3d: Avoid invalidating current framebuffer needlessly. 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/command.c | 10 +++++++--- libs/vkd3d/state.c | 34 ++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3d57545..7989401 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2835,22 +2835,26 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics { struct d3d12_pipeline_state *state = unsafe_impl_from_ID3D12PipelineState(pipeline_state); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); - list->state = state; d3d12_command_list_invalidate_bindings(list, state); if (d3d12_pipeline_state_is_compute(state)) { - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, state->vk_bind_point, state->u.compute.vk_pipeline)); } else { - d3d12_command_list_invalidate_current_framebuffer(list); + if (!d3d12_pipeline_state_is_render_pass_compatible(list->state, state)) + { + d3d12_command_list_invalidate_current_framebuffer(list); + } d3d12_command_list_invalidate_current_pipeline(list); } + + list->state = state; } static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 8b10a62..43b1c15 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1798,6 +1798,40 @@ static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *forma return VKD3D_NO_SWIZZLE; } +/* + * This must return results in accordance with render passes created by + * d3d12_pipeline_state_init_graphics(). + */ +bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, + const struct d3d12_pipeline_state *state_b) +{ + const struct d3d12_graphics_pipeline_state *a = &state_a->u.graphics; + const struct d3d12_graphics_pipeline_state *b = &state_b->u.graphics; + unsigned int i; + + if (!state_a != !state_b) + return false; + if (!state_a && !state_b) + return true; + + if (state_a->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS + || state_b->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) + return false; + + if (a->rt_idx != b->rt_idx) + return false; + if (a->attachment_count != b->attachment_count) + return false; + + for (i = 0; i < a->attachment_count; ++i) + { + if (a->attachments[i].format != b->attachments[i].format) + return false; + } + + return true; +} + static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *state, struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 5974168..9fa29fb 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -525,6 +525,8 @@ HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; +bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, + const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; struct vkd3d_buffer

1 0

Józef Kucia : vkd3d: Avoid invalidating graphics pipeline and framebuffer.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: vkd3d Branch: master Commit: 35748f9228ffc7d2923469893d5e75c54b834ad0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=35748f9228ffc7d29234698… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 15 13:57:58 2018 +0200 vkd3d: Avoid invalidating graphics pipeline and framebuffer. Do not invalidate the current graphics pipeline and the current framebuffer when a compute pipeline is bound. 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/command.c | 9 ++++++--- libs/vkd3d/vkd3d_private.h | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9455898..3d57545 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2839,15 +2839,18 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); list->state = state; - d3d12_command_list_invalidate_current_framebuffer(list); - d3d12_command_list_invalidate_current_pipeline(list); d3d12_command_list_invalidate_bindings(list, state); - if (state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE) + if (d3d12_pipeline_state_is_compute(state)) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, state->vk_bind_point, state->u.compute.vk_pipeline)); } + else + { + d3d12_command_list_invalidate_current_framebuffer(list); + d3d12_command_list_invalidate_current_pipeline(list); + } } static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb930..5974168 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -516,6 +516,11 @@ struct d3d12_pipeline_state struct d3d12_device *device; }; +static inline bool d3d12_pipeline_state_is_compute(const struct d3d12_pipeline_state *state) +{ + return state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE; +} + HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device,

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
62
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 August 2018