March 2019 - Wine-commits - list.winehq.org

Michael Stefaniuc : d3dx9: Don' t expose struct d3dx9_base_effect outside effect.c.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: baf4aaa359c75715e7840b4c045fdb22adf2bc8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf4aaa359c75715e7840b4c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 19 08:51:29 2019 +0100 d3dx9: Don't expose struct d3dx9_base_effect outside effect.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 6 +++--- dlls/d3dx9_36/effect.c | 33 +++++++++++++++------------------ dlls/d3dx9_36/preshader.c | 18 +++++++++--------- 3 files changed, 27 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=baf4aaa359c75715e784…

1 0

Nikolay Sivov : mfreadwrite: Subscribe to source events on reader creation.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: 13e7887162212c6c3f0be69319600290c4bbad55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e7887162212c6c3f0be693… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:30 2019 +0300 mfreadwrite: Subscribe to source events on reader creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 87 ++++++++++++++++++++++++++++++++++++++++- dlls/mfreadwrite/tests/mfplat.c | 3 +- 2 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index df8f89a..86a92b0 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -74,6 +74,7 @@ HRESULT WINAPI DllUnregisterServer(void) typedef struct source_reader { IMFSourceReader IMFSourceReader_iface; + IMFAsyncCallback source_events_callback; LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; @@ -90,11 +91,88 @@ static inline srcreader *impl_from_IMFSourceReader(IMFSourceReader *iface) return CONTAINING_RECORD(iface, srcreader, IMFSourceReader_iface); } +static struct source_reader *impl_from_source_callback_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct source_reader, source_events_callback); +} + static inline struct sink_writer *impl_from_IMFSinkWriter(IMFSinkWriter *iface) { return CONTAINING_RECORD(iface, struct sink_writer, IMFSinkWriter_iface); } +static HRESULT WINAPI source_reader_source_events_callback_QueryInterface(IMFAsyncCallback *iface, + REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI source_reader_source_events_callback_AddRef(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); +} + +static ULONG WINAPI source_reader_source_events_callback_Release(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + return IMFSourceReader_Release(&reader->IMFSourceReader_iface); +} + +static HRESULT WINAPI source_reader_source_events_callback_GetParameters(IMFAsyncCallback *iface, + DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + MediaEventType event_type; + IMFMediaSource *source; + IMFMediaEvent *event; + HRESULT hr; + + TRACE("%p, %p.\n", iface, result); + + source = (IMFMediaSource *)IMFAsyncResult_GetStateNoAddRef(result); + + if (FAILED(hr = IMFMediaSource_EndGetEvent(source, result, &event))) + return hr; + + IMFMediaEvent_GetType(event, &event_type); + + TRACE("Got event %u.\n", event_type); + + IMFMediaEvent_Release(event); + + IMFMediaSource_BeginGetEvent(source, &reader->source_events_callback, + (IUnknown *)source); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl source_events_callback_vtbl = +{ + source_reader_source_events_callback_QueryInterface, + source_reader_source_events_callback_AddRef, + source_reader_source_events_callback_Release, + source_reader_source_events_callback_GetParameters, + source_reader_source_events_callback_Invoke, +}; + static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID riid, void **out) { srcreader *This = impl_from_IMFSourceReader(iface); @@ -273,11 +351,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri srcreader *object; HRESULT hr; - object = heap_alloc(sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; + object->source_events_callback.lpVtbl = &source_events_callback_vtbl; object->refcount = 1; object->source = source; IMFMediaSource_AddRef(object->source); @@ -285,6 +364,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) goto failed; + if (FAILED(hr = IMFMediaSource_BeginGetEvent(object->source, &object->source_events_callback, + (IUnknown *)object->source))) + { + goto failed; + } + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); failed: diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 609510d..5f664b3 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -48,7 +48,7 @@ static void init_functions(void) static void test_MFCreateSourceReaderFromByteStream(void) { static const WCHAR audio[] = {'A','u','d','i','o',0}; - IMFSourceReader *source; + IMFSourceReader *source = NULL; IMFAttributes *attributes; IMFByteStream *bytestream = NULL; IStream *stream = NULL; @@ -76,6 +76,7 @@ static void test_MFCreateSourceReaderFromByteStream(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = MFCreateSourceReaderFromByteStream(bytestream, attributes, &source); +todo_wine ok(hr == S_OK || hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); if(stream)

1 0

Nikolay Sivov : mfreadwrite: Shut down source on reader destruction.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: wine Branch: master Commit: ff9a6e69dde202d29f95c6116ad3da2684affefd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff9a6e69dde202d29f95c611… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 19 11:17:31 2019 +0300 mfreadwrite: Shut down source on reader destruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 86a92b0..eca6075 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -214,6 +214,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) if (!refcount) { + IMFMediaSource_Shutdown(reader->source); if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); IMFMediaSource_Release(reader->source);

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: 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 : 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 : 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 : vkd3d: Ignore redundant IASetPrimitiveTopology() calls.
by Alexandre Julliard 19 Mar '19

19 Mar '19

Module: vkd3d Branch: master Commit: f3c9229cc342c4d9c10f52a61dde1fff48a74a93 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f3c9229cc342c4d9c10f52a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 14:40:58 2019 +0100 vkd3d: Ignore redundant IASetPrimitiveTopology() 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 33dfcaf..40c48cd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3008,6 +3008,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr return; } + if (list->primitive_topology == topology) + return; + list->primitive_topology = topology; d3d12_command_list_invalidate_current_pipeline(list); }

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

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