wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_bind().
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 1381d179f972cfd8c5d86f392a0e366b9783aec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1381d179f972cfd8c5d86f39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jun 22 03:49:18 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_bind(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8e1ac48..b664214 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -133,10 +133,8 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc } /* Context activation is done by the caller. */ -static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) +static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); } @@ -200,6 +198,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu /* Context activation is done by the caller. */ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; @@ -228,7 +227,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf goto fail; } - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -541,10 +540,11 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_map_range *range; - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--) { @@ -645,6 +645,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); const struct wined3d_gl_info *gl_info = context->gl_info; @@ -680,7 +681,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); @@ -1011,6 +1012,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, unsigned int offset, unsigned int size, BYTE **data, DWORD flags) { struct wined3d_device *device = buffer_gl->b.resource.device; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; LONG count; BYTE *base; @@ -1052,6 +1054,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, const struct wined3d_gl_info *gl_info; context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (flags & WINED3D_MAP_DISCARD) @@ -1070,7 +1073,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (count == 1) { - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 * multitexture fill rate test seems to depend on this. When @@ -1168,12 +1171,14 @@ static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) { struct wined3d_device *device = buffer_gl->b.resource.device; const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; - wined3d_buffer_gl_bind(buffer_gl, context); + wined3d_buffer_gl_bind(buffer_gl, context_gl); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) {

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_arb_vs_compile_args().
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 8c231b018b58d6b6276bea7ac0d3b9371d21dc91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c231b018b58d6b6276bea7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jun 22 03:49:17 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_arb_vs_compile_args(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7b06d64..c07b23a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4470,18 +4470,17 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, } static void find_arb_vs_compile_args(const struct wined3d_state *state, - const struct wined3d_context *context, const struct wined3d_shader *shader, + const struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct arb_vs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_device *device = shader->device; const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; int i; WORD int_skip; - find_vs_compile_args(state, shader, context->stream_info.swizzle_map, &args->super, context); + find_vs_compile_args(state, shader, context_gl->c.stream_info.swizzle_map, &args->super, &context_gl->c); args->clip.boolclip_compare = 0; if (use_ps(state)) @@ -4496,7 +4495,7 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, { args->ps_signature = ~0; if (!d3d_info->vs_clipping && adapter->fragment_pipe == &arbfp_fragment_pipeline) - args->clip.boolclip.clip_texcoord = ffp_clip_emul(context) ? d3d_info->limits.ffp_blend_stages : 0; + args->clip.boolclip.clip_texcoord = ffp_clip_emul(&context_gl->c) ? d3d_info->limits.ffp_blend_stages : 0; /* Otherwise: Setting boolclip_compare set clip_texcoord to 0 */ } @@ -4632,7 +4631,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context const struct wined3d_shader_signature *ps_input_sig; TRACE("Using vertex shader %p\n", vs); - find_arb_vs_compile_args(state, context, vs, &compile_args); + find_arb_vs_compile_args(state, context_gl, vs, &compile_args); /* Instead of searching for the signature in the signature list, read the one from the * current pixel shader. It's maybe not the shader where the signature came from, but it

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_arb_ps_compile_args().
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 620bb8455186dfedcccb6c0bd652c00b728ada34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=620bb8455186dfedcccb6c0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Jun 22 03:49:16 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_arb_ps_compile_args(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 273c4f3..7b06d64 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4414,15 +4414,15 @@ static struct arb_vs_compiled_shader *find_arb_vshader(struct wined3d_shader *sh } static void find_arb_ps_compile_args(const struct wined3d_state *state, - const struct wined3d_context *context, const struct wined3d_shader *shader, + const struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct arb_ps_compile_args *args) { - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; int i; WORD int_skip; - find_ps_compile_args(state, shader, context->stream_info.position_transformed, &args->super, context); + find_ps_compile_args(state, shader, context_gl->c.stream_info.position_transformed, &args->super, &context_gl->c); /* This forces all local boolean constants to 1 to make them stateblock independent */ args->bools = shader->reg_maps.local_bool_consts; @@ -4564,7 +4564,7 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context struct arb_ps_compiled_shader *compiled; TRACE("Using pixel shader %p.\n", ps); - find_arb_ps_compile_args(state, context, ps, &compile_args); + find_arb_ps_compile_args(state, context_gl, ps, &compile_args); compiled = find_arb_pshader(context_gl, ps, &compile_args); priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled;

1 0

Józef Kucia : vkd3d: Make resource mapping thread-safe.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: vkd3d Branch: master Commit: dc074af2a0a634a8c02ccb2ce89fb081a1e3bc78 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dc074af2a0a634a8c02ccb2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 20 21:08:09 2019 +0200 vkd3d: Make resource mapping thread-safe. VkDeviceMemory must be externally synchronized. 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/resource.c | 105 ++++++++++++++++++++++----------------------- libs/vkd3d/vkd3d_private.h | 1 - 2 files changed, 52 insertions(+), 54 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 0e13cc5..f0864ab 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -411,7 +411,8 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) return impl_from_ID3D12Heap(iface); } -static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, void **data) +static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, + struct d3d12_resource *resource, void **data) { struct d3d12_device *device = heap->device; HRESULT hr = S_OK; @@ -425,29 +426,41 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, void **d return hresult_from_errno(rc); } - if (!heap->map_ptr) + assert(!resource->map_count || heap->map_ptr); + + if (!resource->map_count) { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + if (!heap->map_ptr) + { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - TRACE("Mapping heap %p.\n", heap); + TRACE("Mapping heap %p.\n", heap); - if ((vr = VK_CALL(vkMapMemory(device->vk_device, heap->vk_memory, - 0, VK_WHOLE_SIZE, 0, &heap->map_ptr))) < 0) - { - WARN("Failed to map device memory, vr %d.\n", vr); - heap->map_ptr = NULL; + assert(!heap->map_count); + + if ((vr = VK_CALL(vkMapMemory(device->vk_device, heap->vk_memory, + 0, VK_WHOLE_SIZE, 0, &heap->map_ptr))) < 0) + { + WARN("Failed to map device memory, vr %d.\n", vr); + heap->map_ptr = NULL; + } + + hr = hresult_from_vk_result(vr); } - hr = hresult_from_vk_result(vr); + if (heap->map_ptr) + ++heap->map_count; } - if (heap->map_ptr) + if (hr == S_OK) { + assert(heap->map_ptr); *data = (BYTE *)heap->map_ptr + offset; - ++heap->map_count; + ++resource->map_count; } else { + assert(!heap->map_ptr); *data = NULL; } @@ -456,7 +469,7 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, uint64_t offset, void **d return hr; } -static void d3d12_heap_unmap(struct d3d12_heap *heap) +static void d3d12_heap_unmap(struct d3d12_heap *heap, struct d3d12_resource *resource) { struct d3d12_device *device = heap->device; int rc; @@ -467,24 +480,34 @@ static void d3d12_heap_unmap(struct d3d12_heap *heap) return; } - if (heap->map_count) + if (!resource->map_count) { - --heap->map_count; - if (!heap->map_count) - { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + WARN("Resource %p is not mapped.\n", resource); + goto done; + } - TRACE("Unmapping heap %p.\n", heap); + --resource->map_count; + if (resource->map_count) + goto done; - VK_CALL(vkUnmapMemory(device->vk_device, heap->vk_memory)); - heap->map_ptr = NULL; - } + if (!heap->map_count) + { + ERR("Heap %p is not mapped.\n", heap); + goto done; } - else + + --heap->map_count; + if (!heap->map_count) { - WARN("Heap %p is not mapped.\n", heap); + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + TRACE("Unmapping heap %p, ptr %p.\n", heap, heap->map_ptr); + + VK_CALL(vkUnmapMemory(device->vk_device, heap->vk_memory)); + heap->map_ptr = NULL; } +done: pthread_mutex_unlock(&heap->mutex); } @@ -1087,7 +1110,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); unsigned int sub_resource_count; - HRESULT hr = S_OK; + HRESULT hr; TRACE("iface %p, sub_resource %u, read_range %p, data %p.\n", iface, sub_resource, read_range, data); @@ -1120,20 +1143,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT WARN("Ignoring read range %p.\n", read_range); - if (!resource->map_count) - { - if FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_ptr)) - { - WARN("Failed to map resource, hr %#x.\n", hr); - resource->map_ptr = NULL; - } - } + if (FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, resource, data))) + WARN("Failed to map resource %p, hr %#x.\n", resource, hr); - if (resource->map_ptr) - { - *data = resource->map_ptr; - ++resource->map_count; - } + TRACE("Returning pointer %p.\n", *data); return hr; } @@ -1154,22 +1167,9 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s return; } - if (!resource->map_count) - { - WARN("Resource %p is not mapped.\n", resource); - return; - } - WARN("Ignoring written range %p.\n", written_range); - --resource->map_count; - if (!resource->map_count) - { - resource->map_ptr = NULL; - - assert(resource->heap); - d3d12_heap_unmap(resource->heap); - } + d3d12_heap_unmap(resource->heap, resource); } static D3D12_RESOURCE_DESC * STDMETHODCALLTYPE d3d12_resource_GetDesc(ID3D12Resource *iface, @@ -1445,7 +1445,6 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 } resource->map_count = 0; - resource->map_ptr = NULL; resource->initial_state = initial_state; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 34df976..d23b278 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -391,7 +391,6 @@ struct d3d12_resource unsigned int flags; unsigned int map_count; - void *map_ptr; struct d3d12_heap *heap; uint64_t heap_offset;

1 0

Józef Kucia : vkd3d: Create private heap objects for committed resources.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: vkd3d Branch: master Commit: fb8f0dc5b3cb6c7f1bda8065c4f164181df349c6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fb8f0dc5b3cb6c7f1bda806… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 20 21:08:08 2019 +0200 vkd3d: Create private heap objects for committed resources. 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/device.c | 2 +- libs/vkd3d/resource.c | 201 ++++++++++++++++++++++++--------------------- libs/vkd3d/vkd3d_private.h | 12 +-- 3 files changed, 113 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=fb8f0dc5b3cb6c7f1bd…

1 0

Józef Kucia : vkd3d: Return more information from device memory allocation functions.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: vkd3d Branch: master Commit: dc2ae75461054321389e3bd885943286d2b8782c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dc2ae75461054321389e3bd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 20 21:08:07 2019 +0200 vkd3d: Return more information from device memory allocation functions. 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 | 2 +- libs/vkd3d/resource.c | 26 ++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 64c4bd6..eeae9cf 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3177,7 +3177,7 @@ static HRESULT d3d12_command_list_allocate_transfer_buffer(struct d3d12_command_ &buffer_desc, &buffer->vk_buffer))) return hr; if (FAILED(hr = vkd3d_allocate_buffer_memory(device, buffer->vk_buffer, - &heap_properties, D3D12_HEAP_FLAG_NONE, &buffer->vk_memory))) + &heap_properties, D3D12_HEAP_FLAG_NONE, &buffer->vk_memory, NULL, NULL))) { VK_CALL(vkDestroyBuffer(device->vk_device, buffer->vk_buffer, NULL)); return hr; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index fdf6836..f1cbff1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -130,7 +130,7 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory) + VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; @@ -174,7 +174,7 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu } if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - memory_requirements, dedicated_allocation, vk_memory, NULL))) + memory_requirements, dedicated_allocation, vk_memory, vk_memory_type))) return hr; if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0) @@ -184,12 +184,15 @@ HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_bu *vk_memory = VK_NULL_HANDLE; } + if (vk_memory_size) + *vk_memory_size = memory_requirements->size; + return hresult_from_vk_result(vr); } static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage vk_image, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory) + VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; @@ -233,7 +236,7 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage } if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - memory_requirements, dedicated_allocation, vk_memory, NULL))) + memory_requirements, dedicated_allocation, vk_memory, vk_memory_type))) return hr; if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0) @@ -244,6 +247,9 @@ static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage return hresult_from_vk_result(vr); } + if (vk_memory_size) + *vk_memory_size = memory_requirements->size; + return S_OK; } @@ -1474,12 +1480,12 @@ static HRESULT vkd3d_allocate_resource_memory( if (d3d12_resource_is_buffer(resource)) { return vkd3d_allocate_buffer_memory(device, resource->u.vk_buffer, - heap_properties, heap_flags, &resource->vk_memory); + heap_properties, heap_flags, &resource->vk_memory, NULL, NULL); } else { return vkd3d_allocate_image_memory(device, resource->u.vk_image, - heap_properties, heap_flags, &resource->vk_memory); + heap_properties, heap_flags, &resource->vk_memory, NULL, NULL); } } @@ -3591,7 +3597,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &resource_desc, &null_resources->vk_buffer))) goto fail; if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_buffer, - &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_buffer_memory))) + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_buffer_memory, NULL, NULL))) goto fail; /* buffer UAV */ @@ -3601,7 +3607,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &resource_desc, &null_resources->vk_storage_buffer))) goto fail; if (!use_sparse_resources && FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_storage_buffer, - &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_storage_buffer_memory))) + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_storage_buffer_memory, NULL, NULL))) goto fail; /* 2D SRV */ @@ -3621,7 +3627,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &resource_desc, &null_resources->vk_2d_image))) goto fail; if (FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_image, - &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_image_memory))) + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_image_memory, NULL, NULL))) goto fail; /* 2D UAV */ @@ -3642,7 +3648,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, &resource_desc, &null_resources->vk_2d_storage_image))) goto fail; if (!use_sparse_resources && FAILED(hr = vkd3d_allocate_image_memory(device, null_resources->vk_2d_storage_image, - &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_storage_image_memory))) + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_2d_storage_image_memory, NULL, NULL))) goto fail; /* set Vulkan object names */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c86370a..caaaa24 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -431,7 +431,7 @@ struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) DE HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory) DECLSPEC_HIDDEN; + VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size) DECLSPEC_HIDDEN; HRESULT vkd3d_create_buffer(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, VkBuffer *vk_buffer) DECLSPEC_HIDDEN;

1 0

Józef Kucia : vkd3d: Introduce d3d12_resource_is_cpu_accessible() helper.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: vkd3d Branch: master Commit: 110830aca0437d7fd65362f1202986d8bc65609a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=110830aca0437d7fd65362f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 20 21:08:06 2019 +0200 vkd3d: Introduce d3d12_resource_is_cpu_accessible() helper. The condition in d3d12_resource_is_cpu_accessible() is going to be changed in the following commits. 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 | 2 +- libs/vkd3d/resource.c | 19 ++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 13 +------------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 47f7a13..64c4bd6 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2090,7 +2090,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 /* vkQueueSubmit() defines a memory dependency with prior host writes. */ src_stage_mask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; barrier.srcAccessMask = 0; - barrier.oldLayout = is_cpu_accessible_heap(&resource->heap_properties) ? + barrier.oldLayout = d3d12_resource_is_cpu_accessible(resource) ? VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 824698a..fdf6836 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -23,6 +23,18 @@ #define VKD3D_HEAP_TYPE_INVALID ((D3D12_HEAP_TYPE)~0u) +static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *properties) +{ + if (properties->Type == D3D12_HEAP_TYPE_DEFAULT) + return false; + if (properties->Type == D3D12_HEAP_TYPE_CUSTOM) + { + return properties->CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE + || properties->CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; + } + return true; +} + static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { @@ -894,6 +906,11 @@ static ULONG d3d12_resource_decref(struct d3d12_resource *resource) return refcount; } +bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) +{ + return is_cpu_accessible_heap(&resource->heap_properties); +} + /* ID3D12Resource */ static inline struct d3d12_resource *impl_from_ID3D12Resource(ID3D12Resource *iface) { @@ -1034,7 +1051,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT device = resource->device; - if (!is_cpu_accessible_heap(&resource->heap_properties)) + if (!d3d12_resource_is_cpu_accessible(resource)) { WARN("Resource is not CPU accessible.\n"); return E_INVALIDARG; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 7cbf0d8..c86370a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -414,6 +414,7 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour return resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER; } +bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource) DECLSPEC_HIDDEN; HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) DECLSPEC_HIDDEN; HRESULT d3d12_committed_resource_create(struct d3d12_device *device, @@ -1165,18 +1166,6 @@ bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN; bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; -static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *properties) -{ - if (properties->Type == D3D12_HEAP_TYPE_DEFAULT) - return false; - if (properties->Type == D3D12_HEAP_TYPE_CUSTOM) - { - return properties->CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE - || properties->CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; - } - return true; -} - HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object) DECLSPEC_HIDDEN;

1 0

Józef Kucia : vkd3d: Move resource memory allocation functions.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: vkd3d Branch: master Commit: 8d242b32ac6a731a7737a151c435a470c97cf15d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d242b32ac6a731a7737a15… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 20 21:08:05 2019 +0200 vkd3d: Move resource memory allocation functions. 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/resource.c | 238 +++++++++++++++++++++++++------------------------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index bcf523e..824698a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -116,6 +116,125 @@ static HRESULT vkd3d_allocate_device_memory(struct d3d12_device *device, return S_OK; } +HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + VkDeviceMemory *vk_memory) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; + VkMemoryDedicatedRequirements dedicated_requirements; + VkMemoryDedicatedAllocateInfo dedicated_info; + VkMemoryRequirements2 memory_requirements2; + VkMemoryRequirements *memory_requirements; + VkBufferMemoryRequirementsInfo2 info; + VkResult vr; + HRESULT hr; + + memory_requirements = &memory_requirements2.memoryRequirements; + + if (device->vk_info.KHR_dedicated_allocation) + { + info.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2; + info.pNext = NULL; + info.buffer = vk_buffer; + + dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS; + dedicated_requirements.pNext = NULL; + + memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; + memory_requirements2.pNext = &dedicated_requirements; + + VK_CALL(vkGetBufferMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2)); + + if (dedicated_requirements.prefersDedicatedAllocation) + { + dedicated_allocation = &dedicated_info; + + dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO; + dedicated_info.pNext = NULL; + dedicated_info.image = VK_NULL_HANDLE; + dedicated_info.buffer = vk_buffer; + } + } + else + { + VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, vk_buffer, memory_requirements)); + } + + if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, + memory_requirements, dedicated_allocation, vk_memory, NULL))) + return hr; + + if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0) + { + WARN("Failed to bind memory, vr %d.\n", vr); + VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); + *vk_memory = VK_NULL_HANDLE; + } + + return hresult_from_vk_result(vr); +} + +static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage vk_image, + const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, + VkDeviceMemory *vk_memory) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; + VkMemoryDedicatedRequirements dedicated_requirements; + VkMemoryDedicatedAllocateInfo dedicated_info; + VkMemoryRequirements2 memory_requirements2; + VkMemoryRequirements *memory_requirements; + VkImageMemoryRequirementsInfo2 info; + VkResult vr; + HRESULT hr; + + memory_requirements = &memory_requirements2.memoryRequirements; + + if (device->vk_info.KHR_dedicated_allocation) + { + info.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2; + info.pNext = NULL; + info.image = vk_image; + + dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS; + dedicated_requirements.pNext = NULL; + + memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; + memory_requirements2.pNext = &dedicated_requirements; + + VK_CALL(vkGetImageMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2)); + + if (dedicated_requirements.prefersDedicatedAllocation) + { + dedicated_allocation = &dedicated_info; + + dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO; + dedicated_info.pNext = NULL; + dedicated_info.image = vk_image; + dedicated_info.buffer = VK_NULL_HANDLE; + } + } + else + { + VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, memory_requirements)); + } + + if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, + memory_requirements, dedicated_allocation, vk_memory, NULL))) + return hr; + + if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0) + { + WARN("Failed to bind memory, vr %d.\n", vr); + VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); + *vk_memory = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + + return S_OK; +} + /* ID3D12Heap */ static inline struct d3d12_heap *impl_from_ID3D12Heap(ID3D12Heap *iface) { @@ -731,125 +850,6 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, return hr; } -HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory) -{ - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; - VkMemoryDedicatedRequirements dedicated_requirements; - VkMemoryDedicatedAllocateInfo dedicated_info; - VkMemoryRequirements2 memory_requirements2; - VkMemoryRequirements *memory_requirements; - VkBufferMemoryRequirementsInfo2 info; - VkResult vr; - HRESULT hr; - - memory_requirements = &memory_requirements2.memoryRequirements; - - if (device->vk_info.KHR_dedicated_allocation) - { - info.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2; - info.pNext = NULL; - info.buffer = vk_buffer; - - dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS; - dedicated_requirements.pNext = NULL; - - memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; - memory_requirements2.pNext = &dedicated_requirements; - - VK_CALL(vkGetBufferMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2)); - - if (dedicated_requirements.prefersDedicatedAllocation) - { - dedicated_allocation = &dedicated_info; - - dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO; - dedicated_info.pNext = NULL; - dedicated_info.image = VK_NULL_HANDLE; - dedicated_info.buffer = vk_buffer; - } - } - else - { - VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, vk_buffer, memory_requirements)); - } - - if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - memory_requirements, dedicated_allocation, vk_memory, NULL))) - return hr; - - if ((vr = VK_CALL(vkBindBufferMemory(device->vk_device, vk_buffer, *vk_memory, 0))) < 0) - { - WARN("Failed to bind memory, vr %d.\n", vr); - VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); - *vk_memory = VK_NULL_HANDLE; - } - - return hresult_from_vk_result(vr); -} - -static HRESULT vkd3d_allocate_image_memory(struct d3d12_device *device, VkImage vk_image, - const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, - VkDeviceMemory *vk_memory) -{ - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VkMemoryDedicatedAllocateInfo *dedicated_allocation = NULL; - VkMemoryDedicatedRequirements dedicated_requirements; - VkMemoryDedicatedAllocateInfo dedicated_info; - VkMemoryRequirements2 memory_requirements2; - VkMemoryRequirements *memory_requirements; - VkImageMemoryRequirementsInfo2 info; - VkResult vr; - HRESULT hr; - - memory_requirements = &memory_requirements2.memoryRequirements; - - if (device->vk_info.KHR_dedicated_allocation) - { - info.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2; - info.pNext = NULL; - info.image = vk_image; - - dedicated_requirements.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS; - dedicated_requirements.pNext = NULL; - - memory_requirements2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2; - memory_requirements2.pNext = &dedicated_requirements; - - VK_CALL(vkGetImageMemoryRequirements2KHR(device->vk_device, &info, &memory_requirements2)); - - if (dedicated_requirements.prefersDedicatedAllocation) - { - dedicated_allocation = &dedicated_info; - - dedicated_info.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO; - dedicated_info.pNext = NULL; - dedicated_info.image = vk_image; - dedicated_info.buffer = VK_NULL_HANDLE; - } - } - else - { - VK_CALL(vkGetImageMemoryRequirements(device->vk_device, vk_image, memory_requirements)); - } - - if (FAILED(hr = vkd3d_allocate_device_memory(device, heap_properties, heap_flags, - memory_requirements, dedicated_allocation, vk_memory, NULL))) - return hr; - - if ((vr = VK_CALL(vkBindImageMemory(device->vk_device, vk_image, *vk_memory, 0))) < 0) - { - WARN("Failed to bind memory, vr %d.\n", vr); - VK_CALL(vkFreeMemory(device->vk_device, *vk_memory, NULL)); - *vk_memory = VK_NULL_HANDLE; - return hresult_from_vk_result(vr); - } - - return S_OK; -} - static void d3d12_resource_destroy(struct d3d12_resource *resource, struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;

1 0

Alexandre Julliard : tests: Add new vkd3d_common test to .gitignore.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: vkd3d Branch: master Commit: 443b6618e34416c14bbc6e3409696794479b14b8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=443b6618e34416c14bbc6e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:08:27 2019 +0200 tests: Add new vkd3d_common test to .gitignore. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/.gitignore b/tests/.gitignore index 24258bf..1854d55 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,4 +1,5 @@ /d3d12 /d3d12_invalid_usage /vkd3d_api +/vkd3d_common /vkd3d_shader_api

1 0

Alexandre Julliard : Wine release 4.11
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: website Branch: master Commit: 1b257dd934e75191cb3791797a33047eb1f6133a URL: https://source.winehq.org/git/website.git/?a=commit;h=1b257dd934e75191cb379… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 23:44:35 2019 +0200 Wine release 4.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019062101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019062101.xml b/news/en/2019062101.xml new file mode 100644 index 0000000..210166a --- /dev/null +++ b/news/en/2019062101.xml @@ -0,0 +1,16 @@ +<news> +<date>June 21, 2019</date> +<title>Wine 4.11 Released</title> +<body> + The Wine development release 4.11 is now available. + <a href="{$root}/announce/4.11">What's new</a> in this release: +<ul> + <li>Updated version of the Mono engine, including Windows.Forms.</li> + <li>More DLLs are built as PE files by default.</li> + <li>Faster implementation of Slim Reader/Writer locks on Linux.</li> + <li>Initial support for enumerating display devices.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.11.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
87
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 June 2019