wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Józef Kucia : vkd3d-utils: Detect surface extensions at runtime.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: vkd3d Branch: master Commit: ccdb69274115fbbdf8508613e0e6766c63fca7d1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ccdb69274115fbbdf850861… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 18:08:06 2018 +0200 vkd3d-utils: Detect surface extensions at runtime. 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 | 1 - libs/vkd3d-utils/vkd3d_utils_main.c | 16 ++++++++++++---- libs/vkd3d-utils/vkd3d_utils_private.h | 9 +++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 79e3155..3ee2f13 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,6 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_CFLAGS = @XCB_CFLAGS@ libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 8c25037..fa6e5f8 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -28,15 +28,18 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { + struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, -#ifdef HAVE_XCB - VK_KHR_XCB_SURFACE_EXTENSION_NAME, -#endif + }; + static const char * const optional_instance_extensions[] = + { + "VK_KHR_xcb_surface", + "VK_MVK_macos_surface", }; static const char * const device_extensions[] = { @@ -49,9 +52,14 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, if (adapter) FIXME("Ignoring adapter %p.\n", adapter); + memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - instance_create_info.next = NULL; + instance_create_info.next = &optional_extensions_info; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 55d5300..6b5851e 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,19 +19,16 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H -#include "vkd3d_memory.h" -#include <vkd3d_utils.h> - #define COBJMACROS #define NONAMELESSUNION #define VK_NO_PROTOTYPES -#ifdef HAVE_XCB -# define VK_USE_PLATFORM_XCB_KHR -#endif #include <pthread.h> #include <vkd3d.h> +#include "vkd3d_memory.h" +#include <vkd3d_utils.h> + struct vkd3d_event { pthread_mutex_t mutex;

1 0

Chip Davis : build: Add support for MoltenVK.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: vkd3d Branch: master Commit: dc2dbffc2c567b97644850b421556d905b73dcc2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dc2dbffc2c567b97644850b… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Aug 21 18:08:05 2018 +0200 build: Add support for MoltenVK. 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 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 90557ee..ada7e9a 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,10 @@ AC_CHECK_LIB([pthread], [pthread_create], AC_SUBST([VULKAN_LIBS]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) + [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lMoltenVK" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$ac_cv_lib_soname_MoltenVK"])], + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared],

1 0

Chip Davis : build: Detect soname of libvulkan at configure time.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: vkd3d Branch: master Commit: 61697e092a1c9bd43d6cc92046550af7f53bce3f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=61697e092a1c9bd43d6cc92… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Tue Aug 21 18:08:04 2018 +0200 build: Detect soname of libvulkan at configure time. 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 | 6 +++--- libs/vkd3d/device.c | 4 ++-- m4/check-soname.m4 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index b5123b8..90557ee 100644 --- a/configure.ac +++ b/configure.ac @@ -77,9 +77,9 @@ AC_CHECK_LIB([pthread], [pthread_create], [AC_MSG_ERROR([libpthread not found.])]) AC_SUBST([VULKAN_LIBS]) -AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) +VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lvulkan"], + [AC_MSG_ERROR([libvulkan not found.])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8280fd5..c11f474 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -283,9 +283,9 @@ static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, if (!vkGetInstanceProcAddr) { - if (!(instance->libvulkan = dlopen("libvulkan.so.1", RTLD_NOW))) + if (!(instance->libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) { - ERR("Failed to load libvulkan.\n"); + ERR("Failed to load libvulkan: %s.\n", dlerror()); return E_FAIL; } diff --git a/m4/check-soname.m4 b/m4/check-soname.m4 new file mode 100644 index 0000000..f195341 --- /dev/null +++ b/m4/check-soname.m4 @@ -0,0 +1,54 @@ +dnl +dnl Copyright 2002 Alexandre Julliard +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +dnl +dnl As a special exception to the GNU Lesser General Public License, +dnl if you distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it +dnl under the same distribution terms that you use for the rest of +dnl that program. + +dnl VKD3D_PATH_SONAME_TOOLS +AC_DEFUN([VKD3D_PATH_SONAME_TOOLS], +[AC_PATH_PROG(LDD,ldd,true,/sbin:/usr/sbin:$PATH) +AC_CHECK_TOOL(OTOOL,otool,otool) +AC_CHECK_TOOL(READELF,[readelf],true)]) + +dnl VKD3D_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) +AC_DEFUN([VKD3D_CHECK_SONAME], +[AC_REQUIRE([VKD3D_PATH_SONAME_TOOLS])dnl +AS_VAR_PUSHDEF([ac_Lib],[ac_cv_lib_soname_$1])dnl +m4_pushdef([ac_lib_pattern],m4_default([$6],[lib$1]))dnl +AC_MSG_CHECKING([for -l$1]) +AC_CACHE_VAL(ac_Lib, +[ac_check_soname_save_LIBS=$LIBS + LIBS="-l$1 $5 $LIBS" + AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], + [AS_CASE(["$host_os"], + [darwin*|macosx*], [AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "]ac_lib_pattern[\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/$]ac_lib_pattern[\.[[0-9A-Za-z.]]*dylib$.*$/\1/"';2,$d'`])], + [AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*]ac_lib_pattern[" | sed -e "s/^.*\\m4_dquote(\$]ac_lib_pattern[[[^ ]]*\$\\).*$/\1/"';2,$d'`]) + AS_VAR_IF([ac_Lib],[], + [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "]ac_lib_pattern[" | sed -e "s/^.*$]ac_lib_pattern[[[^ ]]*$.*$/\1/"';2,$d'`])])])]) + LIBS=$ac_check_soname_save_LIBS])dnl +AS_VAR_IF([ac_Lib],[], + [AC_MSG_RESULT([not found]) + $4], + [AC_MSG_RESULT(AS_VAR_GET(ac_Lib)) + AC_DEFINE_UNQUOTED(AS_TR_CPP(SONAME_LIB$1),["]AS_VAR_GET(ac_Lib)["], + [Define to the soname of the lib$1 library.]) + $3])dnl +m4_popdef([ac_lib_pattern])dnl +AS_VAR_POPDEF([ac_Lib])])

1 0

Józef Kucia : build: Make libxcb optional.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: vkd3d Branch: master Commit: 94f85114c5f24910e551620a4f461d18b502b917 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=94f85114c5f24910e551620… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 18:08:03 2018 +0200 build: Make libxcb optional. 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 | 19 ++++++++++++++----- libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d-utils/vkd3d_utils_private.h | 14 ++++++++------ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index ddc6c97..b5123b8 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(include/config.h) AC_ARG_VAR([WIDL], [widl IDL compiler]) AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) +AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) 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)])) @@ -80,13 +81,17 @@ AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [AC_MSG_ERROR([libvulkan not found.])]) -HAVE_SPIRV_TOOLS=no AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], - [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.]) - HAVE_SPIRV_TOOLS=yes])]) + [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.])])], + [with_spirv_tools=no]) -PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms]) +HAVE_XCB=no +AS_IF([test "x$with_xcb" != "xno"], + [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], + [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.]) + HAVE_XCB=yes], + [HAVE_XCB=no])]) dnl Check for functions VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) @@ -96,7 +101,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP +dnl Makefiles AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) +AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], + [AC_MSG_ERROR([libxcb is required for demos.])]) 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"]) @@ -112,7 +120,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], AS_ECHO([" Configuration summary for $PACKAGE $VERSION - Have SPIRV-Tools: ${HAVE_SPIRV_TOOLS} + Have XCB: ${HAVE_XCB} + Have SPIRV-Tools: ${with_spirv_tools} Building demos: ${enable_demos} diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 2c4d89a..8c25037 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -34,7 +34,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, +#ifdef HAVE_XCB VK_KHR_XCB_SURFACE_EXTENSION_NAME, +#endif }; static const char * const device_extensions[] = { diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 6aa0df6..55d5300 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,17 +19,19 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H +#include "vkd3d_memory.h" +#include <vkd3d_utils.h> + +#define COBJMACROS +#define NONAMELESSUNION #define VK_NO_PROTOTYPES -#define VK_USE_PLATFORM_XCB_KHR +#ifdef HAVE_XCB +# define VK_USE_PLATFORM_XCB_KHR +#endif #include <pthread.h> #include <vkd3d.h> -#define COBJMACROS -#define NONAMELESSUNION -#include "vkd3d_memory.h" -#include "vkd3d_utils.h" - struct vkd3d_event { pthread_mutex_t mutex;

1 0

Józef Kucia : tests: Add test for CPU descriptors lifetime.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: vkd3d Branch: master Commit: 98f8e12ae6be21fa8b75f5295551a7933f430e30 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=98f8e12ae6be21fa8b75f52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 18:08:02 2018 +0200 tests: Add test for CPU descriptors lifetime. 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 | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f340d09..cf51ab9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18077,6 +18077,133 @@ static void test_render_a8(void) destroy_test_context(&context); } +static void test_cpu_descriptors_lifetime(void) +{ + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + ID3D12Resource *red_resource, *blue_resource; + ID3D12GraphicsCommandList *command_list; + D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + ID3D12DescriptorHeap *rtv_heap; + D3D12_CLEAR_VALUE clear_value; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + HRESULT hr; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1); + rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 32; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + clear_value.Color[0] = 1.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 0.0f; + clear_value.Color[3] = 1.0f; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&red_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + clear_value.Color[0] = 0.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 1.0f; + clear_value.Color[3] = 1.0f; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&blue_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, red, 0, NULL); + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, blue_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, blue, 0, NULL); + + /* Destroy the CPU descriptor heap. */ + ID3D12DescriptorHeap_Release(rtv_heap); + + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(red_resource, 0, queue, command_list, 0xff0000ff, 0); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(blue_resource, 0, queue, command_list, 0xffff0000, 0); + + rtv_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1); + rtv_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(rtv_heap); + + /* Try again with OMSetRenderTargets(). */ + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, red, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handle, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, blue_resource, NULL, rtv_handle); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, blue, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv_handle, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + /* Destroy the previous RTV and create a new one in its place. */ + ID3D12Device_CreateRenderTargetView(device, red_resource, NULL, rtv_handle); + + /* Destroy the CPU descriptor heap. */ + ID3D12DescriptorHeap_Release(rtv_heap); + + transition_resource_state(command_list, red_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, blue_resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(red_resource, 0, queue, command_list, 0xff00ff00, 0); + reset_command_list(command_list, context.allocator); + check_sub_resource_uint(blue_resource, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12Resource_Release(blue_resource); + ID3D12Resource_Release(red_resource); + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -18189,4 +18316,5 @@ START_TEST(d3d12) run_test(test_geometry_shader); run_test(test_layered_rendering); run_test(test_render_a8); + run_test(test_cpu_descriptors_lifetime); }

1 0

Józef Kucia : vkd3d: Reference count CPU descriptors.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: vkd3d Branch: master Commit: d074fab10ba4da1d879354aea43a3cf59e037e03 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d074fab10ba4da1d879354a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 18:08:01 2018 +0200 vkd3d: Reference count CPU descriptors. We have to keep all image views referenced by all used VkFramebuffers. 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 | 57 ++++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/resource.c | 46 +++++++++++++++++++++++++------------ libs/vkd3d/vkd3d_private.h | 11 +++++++-- 3 files changed, 91 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=d074fab10ba4da1d879…

1 0

Józef Kucia : tests: Test vertex buffer views with NULL buffer location.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: vkd3d Branch: master Commit: 3bf9d1bc67514d71217e57cd264ac1af7574b056 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3bf9d1bc67514d71217e57c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 18:08:00 2018 +0200 tests: Test vertex buffer views with NULL buffer location. 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 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7d28661..f340d09 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3711,7 +3711,7 @@ static void test_append_aligned_element(void) { ID3D12GraphicsCommandList *command_list; D3D12_INPUT_LAYOUT_DESC input_layout; - D3D12_VERTEX_BUFFER_VIEW vbv[3]; + D3D12_VERTEX_BUFFER_VIEW vbv[6]; struct test_context_desc desc; struct test_context context; struct resource_readback rb; @@ -3724,11 +3724,11 @@ static void test_append_aligned_element(void) { {"CoLoR", 2, DXGI_FORMAT_R32G32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, - {"ColoR", 3, DXGI_FORMAT_R32G32_FLOAT, 2, D3D12_APPEND_ALIGNED_ELEMENT, + {"ColoR", 3, DXGI_FORMAT_R32G32_FLOAT, 5, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, - {"ColoR", 0, DXGI_FORMAT_R32G32_FLOAT, 2, D3D12_APPEND_ALIGNED_ELEMENT, + {"ColoR", 0, DXGI_FORMAT_R32G32_FLOAT, 5, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, {"cOLOr", 1, DXGI_FORMAT_R32G32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1}, @@ -3860,6 +3860,7 @@ static void test_append_aligned_element(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + memset(vbv, 0, sizeof(vbv)); vb[0] = create_upload_buffer(context.device, sizeof(stream0), stream0); vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); vbv[0].StrideInBytes = sizeof(*stream0); @@ -3871,9 +3872,9 @@ static void test_append_aligned_element(void) vbv[1].SizeInBytes = sizeof(stream1); vb[2] = create_upload_buffer(context.device, sizeof(stream2), stream2); - vbv[2].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[2]); - vbv[2].StrideInBytes = sizeof(*stream2); - vbv[2].SizeInBytes = sizeof(stream2); + vbv[5].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[2]); + vbv[5].StrideInBytes = sizeof(*stream2); + vbv[5].SizeInBytes = sizeof(stream2); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL);

1 0

Józef Kucia : vkd3d: Allow IASetVertexBuffers() with NULL buffer locations.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: vkd3d Branch: master Commit: 90617d967db2daefbaeacc3a765f77146243d1a2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=90617d967db2daefbaeacc3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 21 18:07:59 2018 +0200 vkd3d: Allow IASetVertexBuffers() with NULL buffer locations. 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 | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9aba589..8fb6b62 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1738,6 +1738,10 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list b->binding = binding; b->stride = list->strides[binding]; b->inputRate = state->input_rates[binding]; + + if (!b->stride) + FIXME("Invalid stride for input slot %u.\n", binding); + ++binding_count; } @@ -3430,15 +3434,17 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi UINT start_slot, UINT view_count, const D3D12_VERTEX_BUFFER_VIEW *views) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + struct vkd3d_gpu_va_allocator *gpu_va_allocator; VkDeviceSize offsets[ARRAY_SIZE(list->strides)]; const struct vkd3d_vk_device_procs *vk_procs; VkBuffer buffers[ARRAY_SIZE(list->strides)]; + unsigned int i, first, count, stride; struct d3d12_resource *resource; - unsigned int i; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); vk_procs = &list->device->vk_procs; + gpu_va_allocator = &list->device->gpu_va_allocator; if (start_slot >= ARRAY_SIZE(list->strides) || view_count > ARRAY_SIZE(list->strides) - start_slot) { @@ -3446,15 +3452,34 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi return; } - for (i = 0; i < view_count; ++i) + first = start_slot; + for (i = 0, count = 0; i < view_count; ++i) { - resource = vkd3d_gpu_va_allocator_dereference(&list->device->gpu_va_allocator, views[i].BufferLocation); - offsets[i] = views[i].BufferLocation - resource->gpu_address; - buffers[i] = resource->u.vk_buffer; - list->strides[start_slot + i] = views[i].StrideInBytes; + if (views[i].BufferLocation) + { + resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferLocation); + buffers[count] = resource->u.vk_buffer; + offsets[count] = views[i].BufferLocation - resource->gpu_address; + stride = views[i].StrideInBytes; + ++count; + } + else + { + if (count) + VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); + + stride = 0; + ++count; + + first += count; + count = 0; + } + + list->strides[start_slot + i] = stride; } - VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, start_slot, view_count, buffers, offsets)); + if (count) + VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); d3d12_command_list_invalidate_current_pipeline(list); }

1 0

Alexandre Julliard : shell32: Move image resources to a resources subdirectory.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: 8204d04b7fd416c1b6296708937e3c06e058809b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8204d04b7fd416c1b6296708… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 19:54:48 2018 +0200 shell32: Move image resources to a resources subdirectory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 42 +++---- dlls/shell32/{ => resources}/cdrom.ico | Bin dlls/shell32/{ => resources}/cdrom.svg | 0 dlls/shell32/{ => resources}/control.ico | Bin dlls/shell32/{ => resources}/control.svg | 0 dlls/shell32/{ => resources}/delete.ico | Bin dlls/shell32/{ => resources}/delete.svg | 0 dlls/shell32/{ => resources}/desktop.ico | Bin dlls/shell32/{ => resources}/desktop.svg | 0 dlls/shell32/{ => resources}/document.ico | Bin dlls/shell32/{ => resources}/document.svg | 0 dlls/shell32/{ => resources}/drive.ico | Bin dlls/shell32/{ => resources}/drive.svg | 0 dlls/shell32/{ => resources}/floppy.ico | Bin dlls/shell32/{ => resources}/floppy.svg | 0 dlls/shell32/{ => resources}/folder.ico | Bin dlls/shell32/{ => resources}/folder.svg | 0 dlls/shell32/{ => resources}/folder_open.ico | Bin dlls/shell32/{ => resources}/folder_open.svg | 0 dlls/shell32/{ => resources}/idb_tb_large.bmp | Bin dlls/shell32/{ => resources}/idb_tb_small.bmp | Bin dlls/shell32/{ => resources}/internet.ico | Bin dlls/shell32/{ => resources}/internet.svg | 0 dlls/shell32/{ => resources}/mycomputer.ico | Bin dlls/shell32/{ => resources}/mycomputer.svg | 0 dlls/shell32/{ => resources}/mydocs.ico | Bin dlls/shell32/{ => resources}/mydocs.svg | 0 dlls/shell32/{ => resources}/netdrive.ico | Bin dlls/shell32/{ => resources}/netdrive.svg | 0 dlls/shell32/{ => resources}/netdrive2.ico | Bin dlls/shell32/{ => resources}/netdrive2.svg | 0 dlls/shell32/{ => resources}/network.ico | Bin dlls/shell32/{ => resources}/network.svg | 0 dlls/shell32/{ => resources}/printer.ico | Bin dlls/shell32/{ => resources}/printer.svg | 0 dlls/shell32/{ => resources}/ramdisk.ico | Bin dlls/shell32/{ => resources}/ramdisk.svg | 0 dlls/shell32/{ => resources}/recent.ico | Bin dlls/shell32/{ => resources}/recent.svg | 0 dlls/shell32/{ => resources}/searching.avi | Bin dlls/shell32/{ => resources}/shortcut.ico | Bin dlls/shell32/{ => resources}/shortcut.svg | 0 dlls/shell32/{ => resources}/trash_file.ico | Bin dlls/shell32/{ => resources}/trash_file.svg | 0 dlls/shell32/{ => resources}/window.ico | Bin dlls/shell32/{ => resources}/window.svg | 0 dlls/shell32/shell32.rc | 172 +++++++++++++------------- 47 files changed, 107 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8204d04b7fd416c1b629…

1 0

Alex Henrie : shell32: Add settings icon.
by Alexandre Julliard 20 Aug '18

20 Aug '18

Module: wine Branch: master Commit: b9a6f75349dc94dda72c0fdf51b666af209587e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a6f75349dc94dda72c0fdf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:58 2018 -0600 shell32: Add settings icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 7f1f2f3..c2eb205 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -489,6 +489,9 @@ IDI_SHELL_COMPUTERS_NEAR_ME ICON network.ico /* @makedep: recent.ico */ IDI_SHELL_RECENT_DOCUMENTS ICON recent.ico +/* @makedep: control.ico */ +IDI_SHELL_SETTINGS ICON control.ico + /* @makedep: shortcut.ico */ IDI_SHELL_SHORTCUT ICON shortcut.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 8696041..d352d7c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -190,6 +190,7 @@ #define IDI_SHELL_COMPUTERS_NEAR_ME 19 #define IDI_SHELL_FOLDER_SMALL_XP 20 #define IDI_SHELL_RECENT_DOCUMENTS 21 +#define IDI_SHELL_SETTINGS 22 #define IDI_SHELL_SEARCH 23 #define IDI_SHELL_HELP 24 #define IDI_SHELL_FOLDER_OPEN_LARGE 29

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
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