wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Henri Verbeet : vkd3d: Normalise layer counts in d3d12_desc_create_srv().
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: vkd3d Branch: master Commit: 8577747879bcab16101ad0bdeb964a95195c4878 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8577747879bcab16101ad0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 12 18:31:13 2021 +0200 vkd3d: Normalise layer counts in d3d12_desc_create_srv(). I'm not aware of any issue caused by not normalising SRV layer counts, but this makes it consistent with the other view types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index bf01a64..d6e5d4b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2753,6 +2753,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); if (desc->u.Texture2DArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_SRV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -2761,6 +2762,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; @@ -2783,10 +2785,11 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_count = desc->u.TextureCubeArray.MipLevels; vkd3d_desc.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; vkd3d_desc.layer_count = desc->u.TextureCubeArray.NumCubes; - if (vkd3d_desc.layer_count != VK_REMAINING_ARRAY_LAYERS) + if (vkd3d_desc.layer_count != UINT_MAX) vkd3d_desc.layer_count *= 6; if (desc->u.TextureCubeArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCubeArray.ResourceMinLODClamp); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension);

1 0

Conor McCarthy : vkd3d: Normalise layer counts in d3d12_dsv_desc_create_dsv().
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: vkd3d Branch: master Commit: 3f6f615e50a096e00c2c8fdbd49af42e47ff1e87 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3f6f615e50a096e00c2c8fd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:12 2021 +0200 vkd3d: Normalise layer counts in d3d12_dsv_desc_create_dsv(). Signed-off-by: Conor McCarthy <cmccarthy(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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 30d7d2c..bf01a64 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3296,6 +3296,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_DSV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -3304,6 +3305,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension);

1 0

Conor McCarthy : vkd3d: Normalise layer counts in d3d12_rtv_desc_create_rtv().
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: vkd3d Branch: master Commit: 4c07252da6c9b8779e3d09c8000a31ad87f1116f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4c07252da6c9b8779e3d09c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:11 2021 +0200 vkd3d: Normalise layer counts in d3d12_rtv_desc_create_rtv(). Signed-off-by: Conor McCarthy <cmccarthy(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 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 854e73a..30d7d2c 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2480,7 +2480,19 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, static void vkd3d_texture_view_desc_normalise(struct vkd3d_texture_view_desc *desc, const D3D12_RESOURCE_DESC *resource_desc) { - unsigned int max_layer_count = resource_desc->DepthOrArraySize; + unsigned int max_layer_count; + + if (resource_desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + if (desc->view_type == VK_IMAGE_VIEW_TYPE_2D_ARRAY) + max_layer_count = max(1, resource_desc->DepthOrArraySize >> desc->miplevel_idx); + else + max_layer_count = 1; + } + else + { + max_layer_count = resource_desc->DepthOrArraySize; + } if (desc->layer_idx >= max_layer_count) { @@ -3186,6 +3198,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_RTV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -3194,12 +3207,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; vkd3d_desc.layer_idx = desc->u.Texture3D.FirstWSlice; vkd3d_desc.layer_count = desc->u.Texture3D.WSize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension);

1 0

Conor McCarthy : vkd3d: Normalise layer counts in vkd3d_create_texture_uav().
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: vkd3d Branch: master Commit: bec4f0a85ecd3ee6e1f7bbae5dd8545170507f20 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bec4f0a85ecd3ee6e1f7bba… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:10 2021 +0200 vkd3d: Normalise layer counts in vkd3d_create_texture_uav(). Passing UINT_MAX as layer count to Direct3D behaves similar to passing VK_REMAINING_ARRAY_LAYERS to Vulkan. Since these have the same value, everything usually works out even without normalisation. However, there are some exceptions; for example, we calculate workgroup counts for UAV clears from layer counts using vkd3d_compute_workgroup_count(), which doesn't handle UINT_MAX. Normalising layer counts during view creation avoids having to handle this issue in the rest of the code. Signed-off-by: Conor McCarthy <cmccarthy(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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a51f579..854e73a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2477,6 +2477,27 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } +static void vkd3d_texture_view_desc_normalise(struct vkd3d_texture_view_desc *desc, + const D3D12_RESOURCE_DESC *resource_desc) +{ + unsigned int max_layer_count = resource_desc->DepthOrArraySize; + + if (desc->layer_idx >= max_layer_count) + { + WARN("Layer index %u exceeds maximum available layer %u.\n", desc->layer_idx, max_layer_count - 1); + desc->layer_count = 1; + return; + } + + max_layer_count -= desc->layer_idx; + if (desc->layer_count <= max_layer_count) + return; + + if (desc->layer_count != UINT_MAX) + WARN("Layer count %u exceeds maximum %u.\n", desc->layer_count, max_layer_count); + desc->layer_count = max_layer_count; +} + bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) { @@ -2920,6 +2941,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_UAV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D;

1 0

Conor McCarthy : vkd3d-shader/spirv: Correctly handle bit shifts greater than 31 bits.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: vkd3d Branch: master Commit: 85def272ae4793698cfdfc76a847311b43988f12 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=85def272ae4793698cfdfc7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:09 2021 +0200 vkd3d-shader/spirv: Correctly handle bit shifts greater than 31 bits. This is undefined behaviour in SPIR-V, but well-defined in Direct3D, so we should explicitly 'and' the shift amount with 31. Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(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 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ebaf163..58bf3d9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6840,6 +6840,21 @@ static void vkd3d_dxbc_compiler_emit_alu_instruction(struct vkd3d_dxbc_compiler for (i = 0; i < instruction->src_count; ++i) src_ids[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], dst->write_mask); + /* The SPIR-V specification states, "The resulting value is undefined if + * Shift is greater than or equal to the bit width of the components of + * Base." Direct3D applies only the lowest 5 bits of the shift. + * + * Microsoft fxc will compile immediate constants larger than 5 bits. + * Fixing up the constants would be more elegant, but the simplest way is + * to let this handle constants too. */ + if (instruction->handler_idx == VKD3DSIH_ISHL || instruction->handler_idx == VKD3DSIH_ISHR + || instruction->handler_idx == VKD3DSIH_USHR) + { + uint32_t mask_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, + VKD3D_SHADER_COMPONENT_UINT, vkd3d_write_mask_component_count(dst->write_mask), 0x1f); + src_ids[1] = vkd3d_spirv_build_op_and(builder, type_id, src_ids[1], mask_id); + } + val_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, src_ids, instruction->src_count); if (instruction->flags & VKD3DSI_PRECISE_XYZW)

1 0

Conor McCarthy : tests: Add a test for 5-bit masking of shader bit shift operands.
by Alexandre Julliard 12 Oct '21

12 Oct '21

Module: vkd3d Branch: master Commit: 0c3fb46a7afe76d0be1ef72362cfa96b6e2884d2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c3fb46a7afe76d0be1ef72… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 12 18:31:08 2021 +0200 tests: Add a test for 5-bit masking of shader bit shift operands. Signed-off-by: Conor McCarthy <cmccarthy(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, 8 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 38fab13..d1337e2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -8584,15 +8584,16 @@ static void test_shader_instructions(void) void main(out uint4 dst : SV_Target) { - dst = src << 2; + dst = src << uint4(2, 2, 0x22, 0x22); } #endif - 0x43425844, 0x5b749bf4, 0xe24de3dc, 0xbbd75bc9, 0xc6fc9eca, 0x00000001, 0x000000c0, 0x00000003, + 0x43425844, 0x999070b8, 0x623414f1, 0xb1ce04f4, 0x58554022, 0x00000001, 0x000000d0, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000048, 0x00000040, 0x00000012, - 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x08000029, - 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000058, 0x00000050, 0x00000016, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x0b000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004002, 0x00000002, + 0x00000002, 0x00000022, 0x00000022, 0x0100003e, }; static struct named_shader ps_ishl_const = {"ishl_const", ps_ishl_const_code, sizeof(ps_ishl_const_code)}; static const DWORD ps_not_code[] = @@ -9913,6 +9914,8 @@ static void test_shader_instructions(void) {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}}, {&ps_ishl, {{{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}, {~0x1fu, 0, 32, 64}}}, {{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}}}, + {&ps_ishl, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, { 33, 34, 65, 66}}}, + {{0xfffffffe, 0xfffffffc, 0xfffffffe, 0xfffffffc}}}, {&ps_ishl, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, { 31, 7, 15, 11}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, {&ps_ishl, {{{0x80000000, 0x80000000, 0x80000000, 0x80000000}, { 31, 7, 15, 11}}},

1 0

Jan Sikorski : wined3d: Use atomic instructions for resource view bind counts.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: dfeded6460ce067fe1c0540306c2964a170bed2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfeded6460ce067fe1c05403… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 7 12:57:27 2021 +0200 wined3d: Use atomic instructions for resource view bind counts. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 657b6acee39..56c90ba6606 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4157,8 +4157,8 @@ struct wined3d_resource struct list resource_list_entry; - uint32_t srv_bind_count_device; - uint32_t rtv_bind_count_device; + int32_t srv_bind_count_device; + int32_t rtv_bind_count_device; }; static inline ULONG wined3d_resource_incref(struct wined3d_resource *resource) @@ -6329,22 +6329,22 @@ static inline bool wined3d_rtv_all_subresources(const struct wined3d_rendertarge static inline void wined3d_srv_bind_count_inc(struct wined3d_shader_resource_view *srv) { - ++srv->resource->srv_bind_count_device; + InterlockedIncrement(&srv->resource->srv_bind_count_device); } static inline void wined3d_srv_bind_count_dec(struct wined3d_shader_resource_view *srv) { - --srv->resource->srv_bind_count_device; + InterlockedDecrement(&srv->resource->srv_bind_count_device); } static inline void wined3d_rtv_bind_count_inc(struct wined3d_rendertarget_view *rtv) { - ++rtv->resource->rtv_bind_count_device; + InterlockedIncrement(&rtv->resource->rtv_bind_count_device); } static inline void wined3d_rtv_bind_count_dec(struct wined3d_rendertarget_view *rtv) { - --rtv->resource->rtv_bind_count_device; + InterlockedDecrement(&rtv->resource->rtv_bind_count_device); } static inline bool wined3d_rtv_overlaps_srv(const struct wined3d_rendertarget_view *rtv,

1 0

Jan Sikorski : wined3d: Do not call wined3d_device_destroy_default_samplers() in the CS thread.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 33449ed625b93ed1507b2bdb98d57bf828adcbdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=33449ed625b93ed1507b2bdb… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 7 12:57:26 2021 +0200 wined3d: Do not call wined3d_device_destroy_default_samplers() in the CS thread. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/device.c | 4 +--- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index bba728e2fb5..3a6ff54eec2 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4575,6 +4575,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) { TRACE("device %p.\n", device); + wined3d_device_destroy_default_samplers(device); wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 91a6b92b4aa..5667cd8d0d3 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -748,7 +748,6 @@ static void adapter_vk_uninit_3d_cs(void *object) device->shader_backend->shader_free_private(device, &context_vk->c); wined3d_device_vk_destroy_null_views(device_vk, context_vk); wined3d_device_vk_destroy_null_resources(device_vk, context_vk); - wined3d_device_destroy_default_samplers(device, &context_vk->c); } static void adapter_vk_uninit_3d(struct wined3d_device *device) @@ -761,6 +760,7 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) device_vk = wined3d_device_vk(device); context_vk = &device_vk->context_vk; + wined3d_device_destroy_default_samplers(device); wined3d_cs_destroy_object(device->cs, adapter_vk_uninit_3d_cs, device_vk); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8020f7d0844..436c4dfe854 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -572,8 +572,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struc } } -/* Context activation is done by the caller. */ -void wined3d_device_destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) +void wined3d_device_destroy_default_samplers(struct wined3d_device *device) { wined3d_sampler_decref(device->default_sampler); device->default_sampler = NULL; @@ -982,7 +981,6 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) device->blitter->ops->blitter_destroy(device->blitter, context); device->shader_backend->shader_free_private(device, context); wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); - wined3d_device_destroy_default_samplers(device, context); context_release(context); while (device->context_count) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c169ec344b..657b6acee39 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3889,8 +3889,7 @@ void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; -void wined3d_device_destroy_default_samplers(struct wined3d_device *device, - struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_device_destroy_default_samplers(struct wined3d_device *device) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count,

1 0

Jan Sikorski : wined3d: Make wined3d_device_context procedures thread safe.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 6d2d43bb057958890745b8ecc2811b24a28df8d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2d43bb057958890745b8ec… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Oct 7 12:57:25 2021 +0200 wined3d: Make wined3d_device_context procedures thread safe. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 13 ++++++ dlls/wined3d/device.c | 123 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 118 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6d2d43bb057958890745…

1 0

Alex Henrie : dhcpcsvc6: Add stub DLL.
by Alexandre Julliard 11 Oct '21

11 Oct '21

Module: wine Branch: master Commit: 5abee26b8a2849847c15a9d8f08fd9c90154f05a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5abee26b8a2849847c15a9d8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 11 00:16:53 2021 -0600 dhcpcsvc6: Add stub DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51863 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dhcpcsvc6/Makefile.in | 3 +++ dlls/dhcpcsvc6/dhcpcsvc6.spec | 22 ++++++++++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/configure b/configure index 959c08e5506..7f863aa38c0 100755 --- a/configure +++ b/configure @@ -1264,6 +1264,7 @@ enable_ddraw enable_ddrawex enable_devenum enable_dhcpcsvc +enable_dhcpcsvc6 enable_dhtmled_ocx enable_difxapi enable_dinput @@ -20151,6 +20152,7 @@ wine_fn_config_makefile dlls/devenum enable_devenum wine_fn_config_makefile dlls/devenum/tests enable_tests wine_fn_config_makefile dlls/dhcpcsvc enable_dhcpcsvc wine_fn_config_makefile dlls/dhcpcsvc/tests enable_tests +wine_fn_config_makefile dlls/dhcpcsvc6 enable_dhcpcsvc6 wine_fn_config_makefile dlls/dhtmled.ocx enable_dhtmled_ocx wine_fn_config_makefile dlls/difxapi enable_difxapi wine_fn_config_makefile dlls/dinput enable_dinput diff --git a/configure.ac b/configure.ac index 4eecb1f24f4..1821feefa49 100644 --- a/configure.ac +++ b/configure.ac @@ -3038,6 +3038,7 @@ WINE_CONFIG_MAKEFILE(dlls/devenum) WINE_CONFIG_MAKEFILE(dlls/devenum/tests) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests) +WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc6) WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx) WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) diff --git a/dlls/dhcpcsvc6/Makefile.in b/dlls/dhcpcsvc6/Makefile.in new file mode 100644 index 00000000000..6b3e0d03000 --- /dev/null +++ b/dlls/dhcpcsvc6/Makefile.in @@ -0,0 +1,3 @@ +MODULE = dhcpcsvc6.dll + +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/dhcpcsvc6/dhcpcsvc6.spec b/dlls/dhcpcsvc6/dhcpcsvc6.spec new file mode 100644 index 00000000000..2ac66d9a34f --- /dev/null +++ b/dlls/dhcpcsvc6/dhcpcsvc6.spec @@ -0,0 +1,22 @@ +@ stub Dhcpv6AcquireParameters +@ stub Dhcpv6CApiCleanup +@ stub Dhcpv6CApiInitialize +@ stub Dhcpv6CancelOperation +@ stub Dhcpv6EnableDhcp +@ stub Dhcpv6EnableTracing +@ stub Dhcpv6FreeLeaseInfo +@ stub Dhcpv6FreeLeaseInfoArray +@ stub Dhcpv6GetTraceArray +@ stub Dhcpv6GetUserClasses +@ stub Dhcpv6IsEnabled +@ stub Dhcpv6QueryLeaseInfo +@ stub Dhcpv6QueryLeaseInfoArray +@ stub Dhcpv6ReleaseParameters +@ stub Dhcpv6ReleasePrefix +@ stub Dhcpv6ReleasePrefixEx +@ stub Dhcpv6RenewPrefix +@ stub Dhcpv6RenewPrefixEx +@ stub Dhcpv6RequestParams +@ stub Dhcpv6RequestPrefix +@ stub Dhcpv6RequestPrefixEx +@ stub Dhcpv6SetUserClass

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 2021