wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Matteo Bruni : d3dx9: Add a trace to D3DXCreateBuffer.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: a172aead8d542b92709545d8bcd992f03ee19d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a172aead8d542b92709545d8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 30 23:11:13 2019 +0200 d3dx9: Add a trace to D3DXCreateBuffer. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 75a0e84772..4c8070711c 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -129,6 +129,8 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD size, ID3DXBuffer **buffer) struct ID3DXBufferImpl *object; HRESULT hr; + TRACE("size %u, buffer %p.\n", size, buffer); + if (!buffer) { WARN("Invalid buffer specified.\n");

1 0

Matteo Bruni : d3dx9: WARN when the file doesn't exist in D3DXCreateTextureFromFileExW().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 81ababa864229a7e81abca76ef7e6a12fe5b256f URL: https://source.winehq.org/git/wine.git/?a=commit;h=81ababa864229a7e81abca76… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 30 23:11:12 2019 +0200 d3dx9: WARN when the file doesn't exist in D3DXCreateTextureFromFileExW(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 022b32bcd8..8708ed702f 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -773,7 +773,10 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(struct IDirect3DDevice9 *device, con hr = map_view_of_file(srcfile, &buffer, &size); if (FAILED(hr)) + { + WARN("Failed to open file.\n"); return D3DXERR_INVALIDDATA; + } hr = D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture);

1 0

Henri Verbeet : build: Enable -Wpointer-arith.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: vkd3d Branch: master Commit: 26a82afbc40ee317b3b4ad0be087625ed800ca17 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=26a82afbc40ee317b3b4ad0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 20:40:53 2019 +0330 build: Enable -Wpointer-arith. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 7b72d3e..819e768 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) + VKD3D_CHECK_CFLAGS([-Wpointer-arith]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) dnl Check for cross compilers

1 0

Henri Verbeet : vkd3d-shader: Always emit the invocation count for geometry shaders.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: vkd3d Branch: master Commit: a6f6d4fbb160df2db8ec3bc2a476c86ac69066ce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a6f6d4fbb160df2db8ec3bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 1 20:40:52 2019 +0330 vkd3d-shader: Always emit the invocation count for geometry shaders. Even if the shader doesn't explicitly declare it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 580230f..75a3a4f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -268,6 +268,7 @@ struct vkd3d_spirv_builder uint64_t capability_draw_parameters : 1; uint64_t capability_demote_to_helper_invocation : 1; uint32_t ext_instr_set_glsl_450; + uint32_t invocation_count; SpvExecutionModel execution_model; uint32_t current_id; @@ -1731,6 +1732,9 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, "main", builder->iface, builder->iface_element_count); /* execution mode declarations */ + if (builder->invocation_count) + vkd3d_spirv_build_op_execution_mode(&builder->execution_mode_stream, + builder->main_function_id, SpvExecutionModeInvocations, &builder->invocation_count, 1); vkd3d_spirv_stream_append(&stream, &builder->execution_mode_stream); vkd3d_spirv_stream_append(&stream, &builder->debug_stream); @@ -4643,6 +4647,7 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp break; case VKD3D_SHADER_TYPE_GEOMETRY: vkd3d_spirv_set_execution_model(builder, SpvExecutionModelGeometry); + builder->invocation_count = 1; break; case VKD3D_SHADER_TYPE_PIXEL: vkd3d_spirv_set_execution_model(builder, SpvExecutionModelFragment); @@ -5421,8 +5426,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_output_topology(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_dcl_gs_instances(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - vkd3d_dxbc_compiler_emit_execution_mode1(compiler, - SpvExecutionModeInvocations, instruction->declaration.count); + compiler->spirv_builder.invocation_count = instruction->declaration.count; } static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_compiler *compiler,

1 0

Hans-Kristian Arntzen : vkd3d: Fix MSVC build in tests/d3d12.c.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: vkd3d Branch: master Commit: 6b6bcaf1a3d9fca2cd2d6c863236570da97547c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b6bcaf1a3d9fca2cd2d6c8… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 16:20:26 2019 +0200 vkd3d: Fix MSVC build in tests/d3d12.c. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7d38123..ffefbac 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16,6 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifdef _MSC_VER +/* Used for M_PI */ +#define _USE_MATH_DEFINES +#endif + #include "d3d12_crosstest.h" static PFN_D3D12_CREATE_VERSIONED_ROOT_SIGNATURE_DESERIALIZER pfn_D3D12CreateVersionedRootSignatureDeserializer; @@ -585,7 +590,7 @@ static void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *texture, struct resource_readback rb; unsigned int x = 0, y; bool all_match = true; - struct vec4 got = {}; + struct vec4 got = {0}; get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); for (y = 0; y < rb.height; ++y) @@ -614,7 +619,7 @@ static void check_sub_resource_uvec4_(unsigned int line, ID3D12Resource *texture const struct uvec4 *expected_value) { struct resource_readback rb; - struct uvec4 value = {}; + struct uvec4 value = {0}; unsigned int x = 0, y; bool all_match = true; @@ -6365,7 +6370,7 @@ static void test_draw_uav_only(void) 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004001, 0x00000001, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; - static const float zero[4] = {}; + static const float zero[4] = {0}; memset(&desc, 0, sizeof(desc)); desc.no_render_target = true; @@ -8728,11 +8733,11 @@ static void test_shader_instructions(void) {&ps_loop_ret, {{2.0f, 1.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, {&ps_loop_ret, {{8.0f, 7.0f}}, {{1.0f, 1.0f, 1.0f, 1.0f}}}, - {&ps_breakc_nz, {}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, - {&ps_breakc_z, {}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_breakc_nz, {{0}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, + {&ps_breakc_z, {{0}}, {{0.0f, 1.0f, 0.0f, 1.0f}}}, - {&ps_continue, {}, {{254.0f}}, true}, - {&ps_continuec_nz, {}, {{509.0f}}}, + {&ps_continue, {{0}}, {{254.0f}}, true}, + {&ps_continuec_nz, {{0}}, {{509.0f}}}, {&ps_retc_nz, {{ 0.0f}}, {{1.0f}}}, {&ps_retc_nz, {{ 10.0f}}, {{1.0f}}}, @@ -9608,9 +9613,9 @@ static void test_compute_shader_instructions(void) {&cs_atomic_iadd_tgsm_raw, {0xffffffff}, {-1}, {1, 1}, {0, 0}}, {&cs_atomic_iadd_tgsm_raw, {0xffffffff}, {-1}, {4, 4}, {3, 3}}, - {&cs_atomic_iadd_const, {}, {}, {0x00000000, 0x00000000}, {0xffffffff, 0xffffffff}}, - {&cs_atomic_iadd_const, {}, {}, {0x00000001, 0x00000001}, {0x00000000, 0x00000000}}, - {&cs_atomic_iadd_const, {}, {}, {0xffffffff, 0xffffffff}, {0xfffffffe, 0xfffffffe}}, + {&cs_atomic_iadd_const, {0}, {0}, {0x00000000, 0x00000000}, {0xffffffff, 0xffffffff}}, + {&cs_atomic_iadd_const, {0}, {0}, {0x00000001, 0x00000001}, {0x00000000, 0x00000000}}, + {&cs_atomic_iadd_const, {0}, {0}, {0xffffffff, 0xffffffff}, {0xfffffffe, 0xfffffffe}}, }; if (!init_compute_test_context(&context)) @@ -11692,7 +11697,7 @@ static void test_immediate_constant_buffer(void) ID3D12GraphicsCommandList *command_list; struct test_context_desc desc; struct test_context context; - unsigned int index[4] = {}; + unsigned int index[4] = {0}; ID3D12CommandQueue *queue; ID3D12Resource *cb; unsigned int i; @@ -20914,7 +20919,7 @@ static void test_cs_uav_store(void) 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x01000016, 0x0100003e, }; static const D3D12_SHADER_BYTECODE cs_group_index = {cs_group_index_code, sizeof(cs_group_index_code)}; - static const float zero[4] = {}; + static const float zero[4] = {0}; static const struct { const D3D12_SHADER_BYTECODE *shader;

1 0

Hans-Kristian Arntzen : vkd3d: Add MSVC path for atomic_add_fetch.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: vkd3d Branch: master Commit: f180e95e2fabb1a4f99202dc4041b4d37d578035 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f180e95e2fabb1a4f99202d… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 16:07:45 2019 +0200 vkd3d: Add MSVC path for atomic_add_fetch. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d8fb361..ac217e9 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -164,6 +164,9 @@ static inline LONG InterlockedDecrement(LONG volatile *x) #if HAVE_SYNC_ADD_AND_FETCH # define atomic_add_fetch(ptr, val) __sync_add_and_fetch(ptr, val) +#elif defined(_MSC_VER) +/* InterlockedAdd returns value after increment, like add_and_fetch. */ +# define atomic_add_fetch(ptr, val) InterlockedAdd(ptr, val) #else # error "atomic_add_fetch() not implemented for this platform" #endif /* HAVE_SYNC_ADD_AND_FETCH */

1 0

Hans-Kristian Arntzen : vkd3d: Do not use RESET_COMMAND_BUFFERS_BIT.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: vkd3d Branch: master Commit: a0ebcce39863a9d72930d0ecffa783782375c8a7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a0ebcce39863a9d72930d0e… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 16:01:55 2019 +0200 vkd3d: Do not use RESET_COMMAND_BUFFERS_BIT. By setting this flag, command pools cannot efficiently pool allocations. This flag should be set to 0 so only the VkCommandPool may be reset. This matches D3D12 API. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2d6d02d..d420863 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1723,7 +1723,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo command_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; command_pool_info.pNext = NULL; - command_pool_info.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT; + /* Do not use RESET_COMMAND_BUFFER_BIT. This allows the CommandPool to be a D3D12-style command pool. + * Memory is owned by the pool and CommandBuffers become lightweight handles, + * assuming a half-decent driver implementation. */ + command_pool_info.flags = 0; command_pool_info.queueFamilyIndex = queue->vk_family_index; if ((vr = VK_CALL(vkCreateCommandPool(device->vk_device, &command_pool_info, NULL,

1 0

Hans-Kristian Arntzen : vkd3d: Do not release resources in vkResetCommandPool.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: vkd3d Branch: master Commit: 3c86b2341caabd6302b83efd0562910bd5b85d56 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3c86b2341caabd6302b83ef… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 16:01:54 2019 +0200 vkd3d: Do not release resources in vkResetCommandPool. D3D12 command allocators are intended to recycle memory across resets, so we should do the same thing in vkd3d. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ae88910..2d6d02d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1648,8 +1648,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_Reset(ID3D12CommandAllo allocator->command_buffer_count = 0; } - if ((vr = VK_CALL(vkResetCommandPool(device->vk_device, allocator->vk_command_pool, - VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT)))) + /* The intent here is to recycle memory, so do not use RELEASE_RESOURCES_BIT here. */ + if ((vr = VK_CALL(vkResetCommandPool(device->vk_device, allocator->vk_command_pool, 0)))) { WARN("Resetting command pool failed, vr %d.\n", vr); return hresult_from_vk_result(vr);

1 0

Hans-Kristian Arntzen : vkd3d: Add test case for undisclosed CPU VA in Map.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: vkd3d Branch: master Commit: 3f1a1ffc4dacbdfb27a10c808f46d7bb4b9ffe59 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3f1a1ffc4dacbdfb27a10c8… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 15:53:36 2019 +0200 vkd3d: Add test case for undisclosed CPU VA in Map. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c747779..7d38123 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6708,6 +6708,11 @@ static void test_map_resource(void) ID3D12Resource_Unmap(resource, 1, NULL); ID3D12Resource_Unmap(resource, 0, NULL); + /* Passing NULL to Map should map, but not disclose the CPU VA to caller. */ + hr = ID3D12Resource_Map(resource, 0, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12Resource_Unmap(resource, 0, NULL); + ID3D12Resource_Release(resource); refcount = ID3D12Device_Release(device);

1 0

Hans-Kristian Arntzen : vkd3d: Deal with Map out parameter being NULL.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: vkd3d Branch: master Commit: 19b673923bd75b642c4eea5eac6f37460202bc66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=19b673923bd75b642c4eea5… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Tue Oct 1 15:53:35 2019 +0200 vkd3d: Deal with Map out parameter being NULL. It is possible to map a resource, but not disclose the VA to caller. This is used for WriteToSubresource. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 88f184d..f9738f3 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -423,7 +423,8 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, if ((rc = pthread_mutex_lock(&heap->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); - *data = NULL; + if (data) + *data = NULL; return hresult_from_errno(rc); } @@ -456,13 +457,15 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, if (hr == S_OK) { assert(heap->map_ptr); - *data = (BYTE *)heap->map_ptr + offset; + if (data) + *data = (BYTE *)heap->map_ptr + offset; ++resource->map_count; } else { assert(!heap->map_ptr); - *data = NULL; + if (data) + *data = NULL; } pthread_mutex_unlock(&heap->mutex); @@ -1235,7 +1238,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT if (FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, resource, data))) WARN("Failed to map resource %p, hr %#x.\n", resource, hr); - TRACE("Returning pointer %p.\n", *data); + if (data) + TRACE("Returning pointer %p.\n", *data); return hr; }

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