wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Alexandre Julliard : makefiles: Pass --subsystem to the linker also.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 3d7471570eb2a6d57701a45dc86685c109620e24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d7471570eb2a6d57701a45d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 19 15:25:19 2019 +0100 makefiles: Pass --subsystem to the linker also. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/ndis.sys/Makefile.in | 2 +- dlls/scsiport.sys/Makefile.in | 2 +- dlls/tdi.sys/Makefile.in | 2 +- dlls/usbd.sys/Makefile.in | 2 +- dlls/winebus.sys/Makefile.in | 2 +- dlls/winehid.sys/Makefile.in | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/fltmgr.sys/Makefile.in b/dlls/fltmgr.sys/Makefile.in index 3fefde7..ba106a4 100644 --- a/dlls/fltmgr.sys/Makefile.in +++ b/dlls/fltmgr.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = fltmgr.sys -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ main.c diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index bd1c2ee..511484b 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -1,7 +1,7 @@ MODULE = mountmgr.sys IMPORTS = uuid advapi32 ntoskrnl DELAYIMPORTS = user32 -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS) EXTRALIBS = $(DISKARBITRATION_LIBS) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index 33b1843..3b466ad 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = ndis.sys -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ main.c diff --git a/dlls/scsiport.sys/Makefile.in b/dlls/scsiport.sys/Makefile.in index 5219c3e..ed9113a 100644 --- a/dlls/scsiport.sys/Makefile.in +++ b/dlls/scsiport.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = scsiport.sys IMPORTS = ntoskrnl -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ scsiport.c diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in index 1b5f5f3..d414ff7 100644 --- a/dlls/tdi.sys/Makefile.in +++ b/dlls/tdi.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = tdi.sys -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ main.c diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in index 32e7e71..d4e47a9 100644 --- a/dlls/usbd.sys/Makefile.in +++ b/dlls/usbd.sys/Makefile.in @@ -1,7 +1,7 @@ MODULE = usbd.sys IMPORTLIB = usbd IMPORTS = ntoskrnl -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ usbd.c diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index d3421b4..eda3c26 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -2,7 +2,7 @@ MODULE = winebus.sys IMPORTS = ntoskrnl setupapi EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ bus_iohid.c \ diff --git a/dlls/winehid.sys/Makefile.in b/dlls/winehid.sys/Makefile.in index 8db0f0e..db2feb9 100644 --- a/dlls/winehid.sys/Makefile.in +++ b/dlls/winehid.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = winehid.sys IMPORTS = hidclass ntoskrnl -EXTRADLLFLAGS = -Wb,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ main.c

1 0

Alexandre Julliard : winebuild: Use proper RVAs for the export table on Windows.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 265366c1e71de93fb23e6048288c87b9135e95b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=265366c1e71de93fb23e6048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 19 10:02:02 2019 +0100 winebuild: Use proper RVAs for the export table on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 65c8d14..b4512f6 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -380,6 +380,7 @@ void output_exports( DLLSPEC *spec ) { int i, fwd_size = 0; int nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0; + const char *func_ptr = (target_platform == PLATFORM_WINDOWS) ? ".rva" : get_asm_ptr_keyword(); if (!nr_exports) return; @@ -415,7 +416,8 @@ void output_exports( DLLSPEC *spec ) for (i = spec->base; i <= spec->limit; i++) { ORDDEF *odp = spec->ordinals[i]; - if (!odp) output( "\t%s 0\n", get_asm_ptr_keyword() ); + if (!odp) output( "\t%s 0\n", + (target_platform == PLATFORM_WINDOWS) ? ".long" : get_asm_ptr_keyword() ); else switch(odp->type) { case TYPE_EXTERN: @@ -424,22 +426,20 @@ void output_exports( DLLSPEC *spec ) case TYPE_CDECL: if (odp->flags & FLAG_FORWARD) { - output( "\t%s .L__wine_spec_forwards+%u\n", get_asm_ptr_keyword(), fwd_size ); + output( "\t%s .L__wine_spec_forwards+%u\n", func_ptr, fwd_size ); fwd_size += strlen(odp->link_name) + 1; } else if (odp->flags & FLAG_EXT_LINK) { - output( "\t%s %s_%s\n", - get_asm_ptr_keyword(), asm_name("__wine_spec_ext_link"), odp->link_name ); + output( "\t%s %s_%s\n", func_ptr, asm_name("__wine_spec_ext_link"), odp->link_name ); } else { - output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( odp ))); + output( "\t%s %s\n", func_ptr, asm_name( get_link_name( odp ))); } break; case TYPE_STUB: - output( "\t%s %s\n", get_asm_ptr_keyword(), - asm_name( get_stub_name( odp, spec )) ); + output( "\t%s %s\n", func_ptr, asm_name( get_stub_name( odp, spec )) ); break; default: assert(0);

1 0

Akihiro Sagawa : imm32: Correctly return the size of the required output buffer.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: d233a782950f41e80e68d2da2d1af3818e86e653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d233a782950f41e80e68d2da… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Mar 17 23:29:29 2019 +0900 imm32: Correctly return the size of the required output buffer. This fixes a regression introduced by fd7cda93a33c9f65a6c1d1d530738c9fe4b9edf4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46851 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 9 +++++++-- dlls/imm32/tests/imm32.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index b462141..b2ac662 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1224,8 +1224,13 @@ static INT CopyCompStringIMEtoClient(const InputContextData *data, const void *s } else { - ret = min(src_len * char_size, dst_len); - memcpy(dst, src, ret); + if (dst_len) + { + ret = min(src_len * char_size, dst_len); + memcpy(dst, src, ret); + } + else + ret = src_len * char_size; } return ret; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d15fa9c..040a43f 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -473,6 +473,18 @@ static void test_ImmGetCompositionString(void) len = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, wlen - 1); ok(len == wlen - 1, "Unexpected length %d.\n", len); ok(!memcmp(wstring, string, wlen - 1), "Unexpected buffer contents.\n"); + + /* Get the size of the required output buffer. */ + memset(wstring, 0x1a, sizeof(wstring)); + memset(cstring, 0x1a, sizeof(cstring)); + + len = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 0); + ok(len == alen, "Unexpected length %d.\n", len); + ok(cstring[0] == 0x1a, "Unexpected buffer contents %s.\n", cstring); + + len = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, 0); + ok(len == wlen, "Unexpected length %d.\n", len); + ok(wstring[0] == 0x1a1a, "Unexpected buffer contents.\n"); } else win_skip("Composition string isn't available\n");

1 0

Józef Kucia : build: Simplify DL_LIBS handling.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: vkd3d Branch: master Commit: 574cacdf1510c373f81b8f07d0fd7a75fd7316f6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=574cacdf1510c373f81b8f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 14:41:05 2019 +0100 build: Simplify DL_LIBS handling. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6d2e128..4d7b83a 100644 --- a/configure.ac +++ b/configure.ac @@ -74,9 +74,9 @@ m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config aut AC_CHECK_LIB([m], [ceilf]) -AC_ARG_VAR([DL_LIBS], [linker flags for dl]) +AC_SUBST([DL_LIBS]) AC_CHECK_LIB([dl], [dlopen], - [AC_SUBST([DL_LIBS], ["-ldl"])], + [DL_LIBS="-ldl"], [AS_IF([test "$ac_cv_header_dlfnc_h" = "xyes"], [AC_MSG_ERROR([libdl not found.])])]) AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])

1 0

Józef Kucia : build: Fix pthread tests.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: vkd3d Branch: master Commit: fa5a15c961407f333c3bfc6283ac3551c38dc9f8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fa5a15c961407f333c3bfc6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 14:41:04 2019 +0100 build: Fix pthread tests. 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 | 4 +--- m4/check-pthread.m4 | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index bfaa8f2..6d2e128 100644 --- a/configure.ac +++ b/configure.ac @@ -80,9 +80,7 @@ AC_CHECK_LIB([dl], [dlopen], [AS_IF([test "$ac_cv_header_dlfnc_h" = "xyes"], [AC_MSG_ERROR([libdl not found.])])]) AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) -AC_CHECK_LIB([pthread], [pthread_create], - [AC_SUBST([PTHREAD_LIBS], ["-lpthread"])], - [AC_MSG_ERROR([libpthread not found.])]) +VKD3D_CHECK_PTHREAD AC_SUBST([VULKAN_LIBS]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], diff --git a/m4/check-pthread.m4 b/m4/check-pthread.m4 new file mode 100644 index 0000000..5fa82ec --- /dev/null +++ b/m4/check-pthread.m4 @@ -0,0 +1,21 @@ +dnl VKD3D_CHECK_PTHREAD +AC_DEFUN([VKD3D_CHECK_PTHREAD], +[vkd3d_pthread_found=no + +AS_IF([test "x$PTHREAD_LIBS" != x], +[vkd3d_libs_saved="$LIBS" +LIBS="$LIBS $PTHREAD_LIBS" + +AC_MSG_CHECKING([checking for pthread_create in $PTHREAD_LIBS]) +AC_TRY_LINK_FUNC([pthread_create], [vkd3d_pthread_found=yes]) +AC_MSG_RESULT([$vkd3d_pthread_found]) + +AS_IF([test "x$vkd3d_pthread_found" = "xno"], [PTHREAD_LIBS=""]) + +LIBS="$vkd3d_libs_saved"]) + +AS_IF([test "x$vkd3d_pthread_found" != "xyes"], +AC_CHECK_LIB([pthread], [pthread_create], + [PTHREAD_LIBS="-lpthread"], + [AC_MSG_ERROR([libpthread not found.])])) +])

1 0

Józef Kucia : vkd3d: Do not require dlfcn.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: vkd3d Branch: master Commit: 4cdbcbd85f09c333043987c1c27c94c56227560b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4cdbcbd85f09c333043987c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 14:41:03 2019 +0100 vkd3d: Do not require dlfcn. For Windows builds. 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 | 5 +++-- libs/vkd3d/device.c | 63 ++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 37e1edd..bfaa8f2 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,8 @@ VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no]) VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no]) dnl Check for headers -AC_CHECK_HEADERS([pthread.h vulkan/vulkan.h \ +AC_CHECK_HEADERS([dlfcn.h pthread.h \ + vulkan/vulkan.h \ vulkan/spirv.h vulkan/GLSL.std.450.h \ spirv/unified1/spirv.h spirv/unified1/GLSL.std.450.h]) AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])]) @@ -76,7 +77,7 @@ AC_CHECK_LIB([m], [ceilf]) AC_ARG_VAR([DL_LIBS], [linker flags for dl]) AC_CHECK_LIB([dl], [dlopen], [AC_SUBST([DL_LIBS], ["-ldl"])], - [AC_MSG_ERROR([libdl not found.])]) + [AS_IF([test "$ac_cv_header_dlfnc_h" = "xyes"], [AC_MSG_ERROR([libdl not found.])])]) AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) AC_CHECK_LIB([pthread], [pthread_create], diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index f809a00..8b35f40 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -18,8 +18,51 @@ #include "vkd3d_private.h" +#ifdef HAVE_DLFCN_H #include <dlfcn.h> +static void *vkd3d_dlopen(const char *name) +{ + return dlopen(name, RTLD_NOW); +} + +static void *vkd3d_dlsym(void *handle, const char *symbol) +{ + return dlsym(handle, symbol); +} + +static int vkd3d_dlclose(void *handle) +{ + return dlclose(handle); +} + +static const char *vkd3d_dlerror(void) +{ + return dlerror(); +} +#else +static void *vkd3d_dlopen(const char *name) +{ + FIXME("Not implemented for this platform.\n"); + return NULL; +} + +static void *vkd3d_dlsym(void *handle, const char *symbol) +{ + return NULL; +} + +static int vkd3d_dlclose(void *handle) +{ + return 0; +} + +static const char *vkd3d_dlerror(void) +{ + return "Not implemented for this platform.\n"; +} +#endif + struct vkd3d_struct { enum vkd3d_structure_type type; @@ -321,16 +364,16 @@ static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, if (!vkGetInstanceProcAddr) { - if (!(instance->libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) + if (!(instance->libvulkan = vkd3d_dlopen(SONAME_LIBVULKAN))) { - ERR("Failed to load libvulkan: %s.\n", dlerror()); + ERR("Failed to load libvulkan: %s.\n", vkd3d_dlerror()); return E_FAIL; } - if (!(vkGetInstanceProcAddr = dlsym(instance->libvulkan, "vkGetInstanceProcAddr"))) + if (!(vkGetInstanceProcAddr = vkd3d_dlsym(instance->libvulkan, "vkGetInstanceProcAddr"))) { ERR("Could not load function pointer for vkGetInstanceProcAddr().\n"); - dlclose(instance->libvulkan); + vkd3d_dlclose(instance->libvulkan); instance->libvulkan = NULL; return E_FAIL; } @@ -343,7 +386,7 @@ static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, if (FAILED(hr = vkd3d_load_vk_global_procs(&instance->vk_global_procs, vkGetInstanceProcAddr))) { if (instance->libvulkan) - dlclose(instance->libvulkan); + vkd3d_dlclose(instance->libvulkan); instance->libvulkan = NULL; return hr; } @@ -428,7 +471,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, &extension_count, &user_extension_supported))) { if (instance->libvulkan) - dlclose(instance->libvulkan); + vkd3d_dlclose(instance->libvulkan); return hr; } @@ -443,7 +486,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { if (instance->libvulkan) - dlclose(instance->libvulkan); + vkd3d_dlclose(instance->libvulkan); vkd3d_free(user_extension_supported); return E_OUTOFMEMORY; } @@ -471,7 +514,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, { ERR("Failed to create Vulkan instance, vr %d.\n", vr); if (instance->libvulkan) - dlclose(instance->libvulkan); + vkd3d_dlclose(instance->libvulkan); return hresult_from_vk_result(vr); } @@ -481,7 +524,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, if (instance->vk_procs.vkDestroyInstance) instance->vk_procs.vkDestroyInstance(vk_instance, NULL); if (instance->libvulkan) - dlclose(instance->libvulkan); + vkd3d_dlclose(instance->libvulkan); return hr; } @@ -541,7 +584,7 @@ static void vkd3d_destroy_instance(struct vkd3d_instance *instance) VK_CALL(vkDestroyInstance(vk_instance, NULL)); if (instance->libvulkan) - dlclose(instance->libvulkan); + vkd3d_dlclose(instance->libvulkan); vkd3d_free(instance); }

1 0

Józef Kucia : tests: Add tests for copying block-compressed texture regions of smallest miplevels.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: vkd3d Branch: master Commit: 143f25b12e00a4e7befe824cd48478978acbc0de URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=143f25b12e00a4e7befe824… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 14:41:02 2019 +0100 tests: Add tests for copying block-compressed texture regions of smallest miplevels. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 40 ++++++++++++++++++- tests/d3d12_invalid_usage.c | 95 +++++++++++++++++++++++++-------------------- tests/d3d12_test_utils.h | 2 + 3 files changed, 92 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=143f25b12e00a4e7bef…

1 0

Józef Kucia : vkd3d-shader: Do not enable SpvCapabilityUniformBufferArrayDynamicIndexing.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: vkd3d Branch: master Commit: bcd60c21caa0300e41ad2267ad8abee82ee82434 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bcd60c21caa0300e41ad226… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 14:41:01 2019 +0100 vkd3d-shader: Do not enable SpvCapabilityUniformBufferArrayDynamicIndexing. This capability is for dynamic indexing *arrays* of uniform buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0aa220f..f8ba598 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4480,9 +4480,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi assert(!(instruction->flags & ~VKD3DSI_INDEXED_DYNAMIC)); - if (instruction->flags & VKD3DSI_INDEXED_DYNAMIC) - vkd3d_spirv_enable_capability(builder, SpvCapabilityUniformBufferArrayDynamicIndexing); - cb_size = reg->idx[1].offset; if ((push_cb = vkd3d_dxbc_compiler_find_push_constant_buffer(compiler, reg)))

1 0

Józef Kucia : vkd3d-shader: Check shader visibility for combined samplers.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: vkd3d Branch: master Commit: 27b4779930d05e308989cb12a5f48a62521e74f0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=27b4779930d05e308989cb1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 14:41:00 2019 +0100 vkd3d-shader: Check shader visibility for combined samplers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e13d730..0aa220f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2135,7 +2135,7 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_ return NULL; } -static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_compiler *compiler, +static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; @@ -2152,6 +2152,9 @@ static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_co { combined_sampler = &shader_interface->combined_samplers[i]; + if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) + continue; + if ((!resource || combined_sampler->resource_index == resource->idx[0].offset) && (!sampler || combined_sampler->sampler_index == sampler->idx[0].offset)) return true; @@ -4562,7 +4565,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com uint32_t type_id, ptr_type_id, var_id; struct vkd3d_symbol reg_symbol; - if (vkd3d_dxbc_compiler_have_combined_sampler(compiler, NULL, reg)) + if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, reg)) return; type_id = vkd3d_spirv_get_op_type_sampler(builder); @@ -4750,7 +4753,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp sampled_type = vkd3d_component_type_from_data_type(resource_data_type); - if (vkd3d_dxbc_compiler_have_combined_sampler(compiler, reg, NULL)) + if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, reg, NULL)) { vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, resource_type, sampled_type, structure_stride, raw, resource_type_info);

1 0

Józef Kucia : vkd3d: Ignore redundant SetPipelineState() calls.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: vkd3d Branch: master Commit: 3a3bc772b1c7c16ebad89c81fdb9e66b68d501e7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a3bc772b1c7c16ebad89c8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 14:40:59 2019 +0100 vkd3d: Ignore redundant SetPipelineState() calls. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 40c48cd..3b479a2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3110,6 +3110,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); + if (list->state == state) + return; + vk_procs = &list->device->vk_procs; d3d12_command_list_invalidate_bindings(list, state);

1 0

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 March 2019