April 2020 - Wine-Devel - list.winehq.org

[PATCH] ksproxy.ax: New stub DLL.
by Zebediah Figura April 27, 2020

April 27, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47688 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 1 + dlls/ksproxy.ax/Makefile.in | 3 +++ dlls/ksproxy.ax/ksproxy.ax.spec | 10 ++++++++++ 3 files changed, 14 insertions(+) create mode 100644 dlls/ksproxy.ax/Makefile.in create mode 100644 dlls/ksproxy.ax/ksproxy.ax.spec diff --git a/configure.ac b/configure.ac index 63991f8614..ca7ac9f45a 100644 --- a/configure.ac +++ b/configure.ac @@ -3381,6 +3381,7 @@ WINE_CONFIG_MAKEFILE(dlls/kernelbase/tests) WINE_CONFIG_MAKEFILE(dlls/keyboard.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/krnl386.exe16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/ksecdd.sys) +WINE_CONFIG_MAKEFILE(dlls/ksproxy.ax) WINE_CONFIG_MAKEFILE(dlls/ksuser) WINE_CONFIG_MAKEFILE(dlls/ktmw32) WINE_CONFIG_MAKEFILE(dlls/l3codeca.acm) diff --git a/dlls/ksproxy.ax/Makefile.in b/dlls/ksproxy.ax/Makefile.in new file mode 100644 index 0000000000..db6565855d --- /dev/null +++ b/dlls/ksproxy.ax/Makefile.in @@ -0,0 +1,3 @@ +MODULE = ksproxy.ax + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/ksproxy.ax/ksproxy.ax.spec b/dlls/ksproxy.ax/ksproxy.ax.spec new file mode 100644 index 0000000000..db7e2112f0 --- /dev/null +++ b/dlls/ksproxy.ax/ksproxy.ax.spec @@ -0,0 +1,10 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub KsGetMediaType +@ stub KsGetMediaTypeCount +@ stub KsGetMultiplePinFactoryItems +@ stub KsOpenDefaultDevice +@ stub KsResolveRequiredAttributes +@ stub KsSynchronousDeviceControl -- 2.26.2

1 0

[PATCH 1/5] wined3d: Implement depth/stencil clears in the Vulkan blitter.
by Henri Verbeet April 27, 2020

April 27, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 54 ++++++++++++++++++++++++--- dlls/wined3d/texture.c | 68 ++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 5 ++- 3 files changed, 117 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 427dc064055..e8fcc391782 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -630,7 +630,7 @@ static void wined3d_context_vk_destroy_bo_slab(struct wine_rb_entry *entry, void } static void wined3d_render_pass_key_vk_init(struct wined3d_render_pass_key_vk *key, - const struct wined3d_fb_state *fb, unsigned int rt_count) + const struct wined3d_fb_state *fb, unsigned int rt_count, bool depth_stencil, uint32_t clear_flags) { struct wined3d_render_pass_attachment_vk *a; struct wined3d_rendertarget_view *view; @@ -649,6 +649,17 @@ static void wined3d_render_pass_key_vk_init(struct wined3d_render_pass_key_vk *k a->vk_layout = wined3d_texture_vk(wined3d_texture_from_resource(view->resource))->layout; key->rt_mask |= 1u << i; } + + if (depth_stencil && (view = fb->depth_stencil)) + { + a = &key->ds; + a->vk_format = wined3d_format_vk(view->format)->vk_format; + a->vk_samples = max(1, wined3d_resource_get_sample_count(view->resource)); + a->vk_layout = wined3d_texture_vk(wined3d_texture_from_resource(view->resource))->layout; + key->rt_mask |= 1u << WINED3D_MAX_RENDER_TARGETS; + } + + key->clear_flags = clear_flags; } static void wined3d_render_pass_vk_cleanup(struct wined3d_render_pass_vk *pass, @@ -668,6 +679,8 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, VkAttachmentDescription attachments[WINED3D_MAX_RENDER_TARGETS + 1]; const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_render_pass_attachment_vk *a; + VkAttachmentReference ds_attachment_reference; + VkAttachmentReference *ds_reference = NULL; unsigned int attachment_count, rt_count, i; VkAttachmentDescription *attachment; VkSubpassDescription sub_pass_desc; @@ -687,7 +700,10 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, attachment->flags = 0; attachment->format = a->vk_format; attachment->samples = a->vk_samples; - attachment->loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; + if (key->clear_flags & WINED3DCLEAR_TARGET) + attachment->loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; + else + attachment->loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; attachment->storeOp = VK_ATTACHMENT_STORE_OP_STORE; attachment->stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachment->stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; @@ -709,6 +725,34 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, attachment_references[i].layout = VK_IMAGE_LAYOUT_UNDEFINED; } + if (key->rt_mask & (1u << WINED3D_MAX_RENDER_TARGETS)) + { + a = &key->ds; + + attachment = &attachments[attachment_count]; + attachment->flags = 0; + attachment->format = a->vk_format; + attachment->samples = a->vk_samples; + if (key->clear_flags & WINED3DCLEAR_ZBUFFER) + attachment->loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; + else + attachment->loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachment->storeOp = VK_ATTACHMENT_STORE_OP_STORE; + if (key->clear_flags & WINED3DCLEAR_STENCIL) + attachment->stencilLoadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; + else + attachment->stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachment->stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; + attachment->initialLayout = a->vk_layout; + attachment->finalLayout = a->vk_layout; + + ds_reference = &ds_attachment_reference; + ds_reference->attachment = attachment_count; + ds_reference->layout = a->vk_layout; + + ++attachment_count; + } + sub_pass_desc.flags = 0; sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; sub_pass_desc.inputAttachmentCount = 0; @@ -716,7 +760,7 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, sub_pass_desc.colorAttachmentCount = rt_count; sub_pass_desc.pColorAttachments = attachment_references; sub_pass_desc.pResolveAttachments = NULL; - sub_pass_desc.pDepthStencilAttachment = NULL; + sub_pass_desc.pDepthStencilAttachment = ds_reference; sub_pass_desc.preserveAttachmentCount = 0; sub_pass_desc.pPreserveAttachments = NULL; @@ -742,13 +786,13 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, } VkRenderPass wined3d_context_vk_get_render_pass(struct wined3d_context_vk *context_vk, - const struct wined3d_fb_state *fb, unsigned int rt_count) + const struct wined3d_fb_state *fb, unsigned int rt_count, bool depth_stencil, uint32_t clear_flags) { struct wined3d_render_pass_key_vk key; struct wined3d_render_pass_vk *pass; struct wine_rb_entry *entry; - wined3d_render_pass_key_vk_init(&key, fb, rt_count); + wined3d_render_pass_key_vk_init(&key, fb, rt_count, depth_stencil, clear_flags); if ((entry = wine_rb_get(&context_vk->render_passes, &key))) return WINE_RB_ENTRY_VALUE(entry, struct wined3d_render_pass_vk, entry)->vk_render_pass; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ef5f3cd48e5..4f55abb5e2b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6052,8 +6052,8 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, uint32_t flags, const struct wined3d_color *colour, float depth, unsigned int stencil) { - VkClearValue clear_values[WINED3D_MAX_RENDER_TARGETS]; - VkImageView views[WINED3D_MAX_RENDER_TARGETS]; + VkClearValue clear_values[WINED3D_MAX_RENDER_TARGETS + 1]; + VkImageView views[WINED3D_MAX_RENDER_TARGETS + 1]; struct wined3d_rendertarget_view_vk *rtv_vk; struct wined3d_rendertarget_view *view; const struct wined3d_vk_info *vk_info; @@ -6065,6 +6065,7 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk VkFramebufferCreateInfo fb_desc; VkFramebuffer vk_framebuffer; VkRenderPass vk_render_pass; + bool depth_stencil = false; unsigned int layer_count; VkClearColorValue *c; VkResult vr; @@ -6078,6 +6079,9 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk device_vk = wined3d_device_vk(context_vk->c.device); vk_info = context_vk->vk_info; + if (!(flags & WINED3DCLEAR_TARGET)) + rt_count = 0; + for (i = 0, attachment_count = 0, layer_count = 1; i < rt_count; ++i) { if (!(view = fb->render_targets[i])) @@ -6115,7 +6119,33 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk ++attachment_count; } - if (!(vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, fb, rt_count))) + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && (view = fb->depth_stencil)) + { + if (!is_full_clear(view, draw_rect, clear_rects)) + wined3d_rendertarget_view_load_location(view, &context_vk->c, view->resource->draw_binding); + else + wined3d_rendertarget_view_prepare_location(view, &context_vk->c, view->resource->draw_binding); + wined3d_rendertarget_view_validate_location(view, view->resource->draw_binding); + wined3d_rendertarget_view_invalidate_location(view, ~view->resource->draw_binding); + + rtv_vk = wined3d_rendertarget_view_vk(view); + views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); + + clear_values[attachment_count].depthStencil.depth = depth; + clear_values[attachment_count].depthStencil.stencil = stencil; + + if (view->layer_count > layer_count) + layer_count = view->layer_count; + + depth_stencil = true; + ++attachment_count; + } + + if (!attachment_count) + return; + + if (!(vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, fb, + rt_count, flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL), flags))) { ERR("Failed to get render pass.\n"); return; @@ -6183,6 +6213,19 @@ static void vk_blitter_clear_rendertargets(struct wined3d_context_vk *context_vk texture_vk->layout, texture_vk->layout, texture_vk->vk_image, VK_IMAGE_ASPECT_COLOR_BIT); } + + if (depth_stencil) + { + view = fb->depth_stencil; + wined3d_context_vk_reference_rendertarget_view(context_vk, wined3d_rendertarget_view_vk(view)); + texture_vk = wined3d_texture_vk(wined3d_texture_from_resource(view->resource)); + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, + vk_access_mask_from_bind_flags(texture_vk->t.resource.bind_flags), + texture_vk->layout, texture_vk->layout, + texture_vk->vk_image, vk_aspect_mask_from_format(texture_vk->t.resource.format)); + } } static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, @@ -6228,7 +6271,10 @@ static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_dev } } - if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && fb->depth_stencil) + if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && (view = fb->depth_stencil) + && (!view->format->depth_size || (flags & WINED3DCLEAR_ZBUFFER)) + && (!view->format->stencil_size || (flags & WINED3DCLEAR_STENCIL)) + && blitter_use_cpu_clear(view)) { next_flags |= flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); flags &= ~(WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); @@ -6247,6 +6293,13 @@ static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_dev have_identical_size = false; previous = view; } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + view = fb->depth_stencil; + + if (previous && (previous->width != view->width || previous->height != view->height)) + have_identical_size = false; + } if (have_identical_size) { @@ -6265,6 +6318,13 @@ static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_dev vk_blitter_clear_rendertargets(context_vk, 1, &tmp_fb, rect_count, clear_rects, draw_rect, WINED3DCLEAR_TARGET, colour, depth, stencil); } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + tmp_fb.render_targets[0] = NULL; + tmp_fb.depth_stencil = fb->depth_stencil; + vk_blitter_clear_rendertargets(context_vk, 0, &tmp_fb, rect_count, + clear_rects, draw_rect, flags & ~WINED3DCLEAR_TARGET, colour, depth, stencil); + } } context_release(&context_vk->c); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd8e03d35d9..db86d746b5f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2272,7 +2272,9 @@ struct wined3d_render_pass_attachment_vk struct wined3d_render_pass_key_vk { struct wined3d_render_pass_attachment_vk rt[WINED3D_MAX_RENDER_TARGETS]; + struct wined3d_render_pass_attachment_vk ds; uint32_t rt_mask; + uint32_t clear_flags; }; struct wined3d_render_pass_vk @@ -2330,7 +2332,8 @@ void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, VkDeviceMemory vk_memory, uint64_t command_buffer_id) DECLSPEC_HIDDEN; VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; VkRenderPass wined3d_context_vk_get_render_pass(struct wined3d_context_vk *context_vk, - const struct wined3d_fb_state *fb, unsigned int rt_count) DECLSPEC_HIDDEN; + const struct wined3d_fb_state *fb, unsigned int rt_count, + bool depth_stencil, uint32_t clear_flags) DECLSPEC_HIDDEN; void wined3d_context_vk_image_barrier(struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer, VkPipelineStageFlags src_stage_mask, VkPipelineStageFlags dst_stage_mask, VkAccessFlags src_access_mask, VkAccessFlags dst_access_mask, VkImageLayout old_layout, -- 2.20.1

2 1

[PATCH 1/3] quartz: Don't register the DirectSound renderer as a filter for autoplugging.
by Zebediah Figura April 27, 2020

April 27, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/regsvr.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 7196f79a54..a5b52425b0 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -222,19 +222,6 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, - { &CLSID_DSoundRender, - &CLSID_LegacyAmFilterCategory, - L"Audio Renderer", - 0x800000, - { { REG_PINFLAG_B_RENDERER, - { { &MEDIATYPE_Audio, &MEDIASUBTYPE_PCM }, -/* { &MEDIATYPE_Audio, &MEDIASUBTYPE_IEEE_FLOAT }, */ - { NULL } - }, - }, - { 0xFFFFFFFF }, - } - }, { &CLSID_AudioRender, &CLSID_LegacyAmFilterCategory, L"Audio Renderer", -- 2.26.2

1 0

[PATCH 5/5] wined3d: Add Vulkan format information for WINED3DFMT_D32_FLOAT_S8X24_UINT.
by Henri Verbeet April 27, 2020

April 27, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 125 ++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 12e8ed2c716..0397056441f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4138,68 +4138,69 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, } vulkan_formats[] = { - {WINED3DFMT_R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, }, - {WINED3DFMT_R32G32B32A32_UINT, VK_FORMAT_R32G32B32A32_UINT, }, - {WINED3DFMT_R32G32B32A32_SINT, VK_FORMAT_R32G32B32A32_SINT, }, - {WINED3DFMT_R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, }, - {WINED3DFMT_R32G32B32_UINT, VK_FORMAT_R32G32B32_UINT, }, - {WINED3DFMT_R32G32B32_SINT, VK_FORMAT_R32G32B32_SINT, }, - {WINED3DFMT_R16G16B16A16_FLOAT, VK_FORMAT_R16G16B16A16_SFLOAT, }, - {WINED3DFMT_R16G16B16A16_UNORM, VK_FORMAT_R16G16B16A16_UNORM, }, - {WINED3DFMT_R16G16B16A16_UINT, VK_FORMAT_R16G16B16A16_UINT, }, - {WINED3DFMT_R16G16B16A16_SNORM, VK_FORMAT_R16G16B16A16_SNORM, }, - {WINED3DFMT_R16G16B16A16_SINT, VK_FORMAT_R16G16B16A16_SINT, }, - {WINED3DFMT_R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, }, - {WINED3DFMT_R32G32_UINT, VK_FORMAT_R32G32_UINT, }, - {WINED3DFMT_R32G32_SINT, VK_FORMAT_R32G32_SINT, }, - {WINED3DFMT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32,}, - {WINED3DFMT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, }, - {WINED3DFMT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, }, - {WINED3DFMT_R8G8_UINT, VK_FORMAT_R8G8_UINT, }, - {WINED3DFMT_R8G8_SNORM, VK_FORMAT_R8G8_SNORM, }, - {WINED3DFMT_R8G8_SINT, VK_FORMAT_R8G8_SINT, }, - {WINED3DFMT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, }, - {WINED3DFMT_R8G8B8A8_UNORM_SRGB, VK_FORMAT_R8G8B8A8_SRGB, }, - {WINED3DFMT_R8G8B8A8_UINT, VK_FORMAT_R8G8B8A8_UINT, }, - {WINED3DFMT_R8G8B8A8_SNORM, VK_FORMAT_R8G8B8A8_SNORM, }, - {WINED3DFMT_R8G8B8A8_SINT, VK_FORMAT_R8G8B8A8_SINT, }, - {WINED3DFMT_R16G16_FLOAT, VK_FORMAT_R16G16_SFLOAT, }, - {WINED3DFMT_R16G16_UNORM, VK_FORMAT_R16G16_UNORM, }, - {WINED3DFMT_R16G16_UINT, VK_FORMAT_R16G16_UINT, }, - {WINED3DFMT_R16G16_SNORM, VK_FORMAT_R16G16_SNORM, }, - {WINED3DFMT_R16G16_SINT, VK_FORMAT_R16G16_SINT, }, - {WINED3DFMT_D32_FLOAT, VK_FORMAT_D32_SFLOAT, }, - {WINED3DFMT_R32_FLOAT, VK_FORMAT_R32_SFLOAT, }, - {WINED3DFMT_R32_UINT, VK_FORMAT_R32_UINT, }, - {WINED3DFMT_R32_SINT, VK_FORMAT_R32_SINT, }, - {WINED3DFMT_R16_FLOAT, VK_FORMAT_R16_SFLOAT, }, - {WINED3DFMT_D16_UNORM, VK_FORMAT_D16_UNORM, }, - {WINED3DFMT_R16_UNORM, VK_FORMAT_R16_UNORM, }, - {WINED3DFMT_R16_UINT, VK_FORMAT_R16_UINT, }, - {WINED3DFMT_R16_SNORM, VK_FORMAT_R16_SNORM, }, - {WINED3DFMT_R16_SINT, VK_FORMAT_R16_SINT, }, - {WINED3DFMT_R8_UNORM, VK_FORMAT_R8_UNORM, }, - {WINED3DFMT_R8_UINT, VK_FORMAT_R8_UINT, }, - {WINED3DFMT_R8_SNORM, VK_FORMAT_R8_SNORM, }, - {WINED3DFMT_R8_SINT, VK_FORMAT_R8_SINT, }, - {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, }, - {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, - {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, - {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, - {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, - {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, }, - {WINED3DFMT_BC2_UNORM_SRGB, VK_FORMAT_BC2_SRGB_BLOCK, }, - {WINED3DFMT_BC3_UNORM, VK_FORMAT_BC3_UNORM_BLOCK, }, - {WINED3DFMT_BC3_UNORM_SRGB, VK_FORMAT_BC3_SRGB_BLOCK, }, - {WINED3DFMT_BC4_UNORM, VK_FORMAT_BC4_UNORM_BLOCK, }, - {WINED3DFMT_BC4_SNORM, VK_FORMAT_BC4_SNORM_BLOCK, }, - {WINED3DFMT_BC5_UNORM, VK_FORMAT_BC5_UNORM_BLOCK, }, - {WINED3DFMT_BC5_SNORM, VK_FORMAT_BC5_SNORM_BLOCK, }, - {WINED3DFMT_BC6H_UF16, VK_FORMAT_BC6H_UFLOAT_BLOCK, }, - {WINED3DFMT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, }, - {WINED3DFMT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, }, - {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, - {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, + {WINED3DFMT_R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, }, + {WINED3DFMT_R32G32B32A32_UINT, VK_FORMAT_R32G32B32A32_UINT, }, + {WINED3DFMT_R32G32B32A32_SINT, VK_FORMAT_R32G32B32A32_SINT, }, + {WINED3DFMT_R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, }, + {WINED3DFMT_R32G32B32_UINT, VK_FORMAT_R32G32B32_UINT, }, + {WINED3DFMT_R32G32B32_SINT, VK_FORMAT_R32G32B32_SINT, }, + {WINED3DFMT_R16G16B16A16_FLOAT, VK_FORMAT_R16G16B16A16_SFLOAT, }, + {WINED3DFMT_R16G16B16A16_UNORM, VK_FORMAT_R16G16B16A16_UNORM, }, + {WINED3DFMT_R16G16B16A16_UINT, VK_FORMAT_R16G16B16A16_UINT, }, + {WINED3DFMT_R16G16B16A16_SNORM, VK_FORMAT_R16G16B16A16_SNORM, }, + {WINED3DFMT_R16G16B16A16_SINT, VK_FORMAT_R16G16B16A16_SINT, }, + {WINED3DFMT_R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, }, + {WINED3DFMT_R32G32_UINT, VK_FORMAT_R32G32_UINT, }, + {WINED3DFMT_R32G32_SINT, VK_FORMAT_R32G32_SINT, }, + {WINED3DFMT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32,}, + {WINED3DFMT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, }, + {WINED3DFMT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, }, + {WINED3DFMT_R8G8_UINT, VK_FORMAT_R8G8_UINT, }, + {WINED3DFMT_R8G8_SNORM, VK_FORMAT_R8G8_SNORM, }, + {WINED3DFMT_R8G8_SINT, VK_FORMAT_R8G8_SINT, }, + {WINED3DFMT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, }, + {WINED3DFMT_R8G8B8A8_UNORM_SRGB, VK_FORMAT_R8G8B8A8_SRGB, }, + {WINED3DFMT_R8G8B8A8_UINT, VK_FORMAT_R8G8B8A8_UINT, }, + {WINED3DFMT_R8G8B8A8_SNORM, VK_FORMAT_R8G8B8A8_SNORM, }, + {WINED3DFMT_R8G8B8A8_SINT, VK_FORMAT_R8G8B8A8_SINT, }, + {WINED3DFMT_R16G16_FLOAT, VK_FORMAT_R16G16_SFLOAT, }, + {WINED3DFMT_R16G16_UNORM, VK_FORMAT_R16G16_UNORM, }, + {WINED3DFMT_R16G16_UINT, VK_FORMAT_R16G16_UINT, }, + {WINED3DFMT_R16G16_SNORM, VK_FORMAT_R16G16_SNORM, }, + {WINED3DFMT_R16G16_SINT, VK_FORMAT_R16G16_SINT, }, + {WINED3DFMT_D32_FLOAT, VK_FORMAT_D32_SFLOAT, }, + {WINED3DFMT_R32_FLOAT, VK_FORMAT_R32_SFLOAT, }, + {WINED3DFMT_R32_UINT, VK_FORMAT_R32_UINT, }, + {WINED3DFMT_R32_SINT, VK_FORMAT_R32_SINT, }, + {WINED3DFMT_R16_FLOAT, VK_FORMAT_R16_SFLOAT, }, + {WINED3DFMT_D16_UNORM, VK_FORMAT_D16_UNORM, }, + {WINED3DFMT_R16_UNORM, VK_FORMAT_R16_UNORM, }, + {WINED3DFMT_R16_UINT, VK_FORMAT_R16_UINT, }, + {WINED3DFMT_R16_SNORM, VK_FORMAT_R16_SNORM, }, + {WINED3DFMT_R16_SINT, VK_FORMAT_R16_SINT, }, + {WINED3DFMT_R8_UNORM, VK_FORMAT_R8_UNORM, }, + {WINED3DFMT_R8_UINT, VK_FORMAT_R8_UINT, }, + {WINED3DFMT_R8_SNORM, VK_FORMAT_R8_SNORM, }, + {WINED3DFMT_R8_SINT, VK_FORMAT_R8_SINT, }, + {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, }, + {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, + {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, + {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, + {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, + {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, }, + {WINED3DFMT_BC2_UNORM_SRGB, VK_FORMAT_BC2_SRGB_BLOCK, }, + {WINED3DFMT_BC3_UNORM, VK_FORMAT_BC3_UNORM_BLOCK, }, + {WINED3DFMT_BC3_UNORM_SRGB, VK_FORMAT_BC3_SRGB_BLOCK, }, + {WINED3DFMT_BC4_UNORM, VK_FORMAT_BC4_UNORM_BLOCK, }, + {WINED3DFMT_BC4_SNORM, VK_FORMAT_BC4_SNORM_BLOCK, }, + {WINED3DFMT_BC5_UNORM, VK_FORMAT_BC5_UNORM_BLOCK, }, + {WINED3DFMT_BC5_SNORM, VK_FORMAT_BC5_SNORM_BLOCK, }, + {WINED3DFMT_BC6H_UF16, VK_FORMAT_BC6H_UFLOAT_BLOCK, }, + {WINED3DFMT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, }, + {WINED3DFMT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, }, + {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, + {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, + {WINED3DFMT_D32_FLOAT_S8X24_UINT, VK_FORMAT_D32_SFLOAT_S8_UINT, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; -- 2.20.1

1 0

[PATCH 4/5] wined3d: Add Vulkan format information for WINED3DFMT_R9G9B9E5_SHAREDEXP.
by Henri Verbeet April 27, 2020

April 27, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 06857f22845..12e8ed2c716 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4199,6 +4199,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, }, {WINED3DFMT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, }, {WINED3DFMT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, }, + {WINED3DFMT_R9G9B9E5_SHAREDEXP, VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, }, }; VkFormat vk_format = VK_FORMAT_UNDEFINED; VkImageFormatProperties image_properties; -- 2.20.1

1 0

[PATCH 3/5] wined3d: Make the adapter responsible for draws.
by Henri Verbeet April 27, 2020

April 27, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 7 +++++++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 343dfff0eea..29496f2556e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5101,6 +5101,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = .adapter_create_query = adapter_gl_create_query, .adapter_destroy_query = adapter_gl_destroy_query, .adapter_flush_context = adapter_gl_flush_context, + .adapter_draw_primitive = draw_primitive, .adapter_dispatch_compute = dispatch_compute, .adapter_clear_uav = adapter_gl_clear_uav, }; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7c635620867..b6a0eea7852 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1414,6 +1414,12 @@ static void adapter_vk_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_vk_draw_primitive(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) +{ + FIXME("device %p, state %p, parameters %p.\n", device, state, parameters); +} + static void adapter_vk_dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) { @@ -1457,6 +1463,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = .adapter_create_query = adapter_vk_create_query, .adapter_destroy_query = adapter_vk_destroy_query, .adapter_flush_context = adapter_vk_flush_context, + .adapter_draw_primitive = adapter_vk_draw_primitive, .adapter_dispatch_compute = adapter_vk_dispatch_compute, .adapter_clear_uav = adapter_vk_clear_uav, }; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 930351d092c..85e696d4d19 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -888,7 +888,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } state->gl_patch_vertices = op->patch_vertex_count; - draw_primitive(cs->device, state, &op->parameters); + cs->device->adapter->adapter_ops->adapter_draw_primitive(cs->device, state, &op->parameters); if (op->parameters.indirect) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 40221ab7dee..b6a9b502d82 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2843,6 +2843,12 @@ static void adapter_no3d_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_no3d_draw_primitive(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) +{ + ERR("device %p, state %p, parameters %p.\n", device, state, parameters); +} + static void adapter_no3d_dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) { @@ -2886,6 +2892,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = .adapter_create_query = adapter_no3d_create_query, .adapter_destroy_query = adapter_no3d_destroy_query, .adapter_flush_context = adapter_no3d_flush_context, + .adapter_draw_primitive = adapter_no3d_draw_primitive, .adapter_dispatch_compute = adapter_no3d_dispatch_compute, .adapter_clear_uav = adapter_no3d_clear_uav, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a5d22600013..a7983b31b7d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3031,6 +3031,8 @@ struct wined3d_adapter_ops void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); void (*adapter_flush_context)(struct wined3d_context *context); + void (*adapter_draw_primitive)(struct wined3d_device *device, const struct wined3d_state *state, + const struct wined3d_draw_parameters *parameters); void (*adapter_dispatch_compute)(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters); void (*adapter_clear_uav)(struct wined3d_context *context, -- 2.20.1

1 0

[PATCH 2/5] wined3d: Make the adapter responsible for compute dispatch.
by Henri Verbeet April 27, 2020

April 27, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 61 ++++++++++++++++--------------- dlls/wined3d/adapter_vk.c | 67 +++++++++++++++++++--------------- dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 67 +++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 108 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index eaeb13b46cc..343dfff0eea 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5072,36 +5072,37 @@ void adapter_gl_clear_uav(struct wined3d_context *context, static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { - adapter_gl_destroy, - adapter_gl_create_device, - adapter_gl_destroy_device, - adapter_gl_acquire_context, - adapter_gl_release_context, - adapter_gl_get_wined3d_caps, - adapter_gl_check_format, - adapter_gl_init_3d, - adapter_gl_uninit_3d, - adapter_gl_map_bo_address, - adapter_gl_unmap_bo_address, - adapter_gl_copy_bo_address, - adapter_gl_create_swapchain, - adapter_gl_destroy_swapchain, - adapter_gl_create_buffer, - adapter_gl_destroy_buffer, - adapter_gl_create_texture, - adapter_gl_destroy_texture, - adapter_gl_create_rendertarget_view, - adapter_gl_destroy_rendertarget_view, - adapter_gl_create_shader_resource_view, - adapter_gl_destroy_shader_resource_view, - adapter_gl_create_unordered_access_view, - adapter_gl_destroy_unordered_access_view, - adapter_gl_create_sampler, - adapter_gl_destroy_sampler, - adapter_gl_create_query, - adapter_gl_destroy_query, - adapter_gl_flush_context, - adapter_gl_clear_uav, + .adapter_destroy = adapter_gl_destroy, + .adapter_create_device = adapter_gl_create_device, + .adapter_destroy_device = adapter_gl_destroy_device, + .adapter_acquire_context = adapter_gl_acquire_context, + .adapter_release_context = adapter_gl_release_context, + .adapter_get_wined3d_caps = adapter_gl_get_wined3d_caps, + .adapter_check_format = adapter_gl_check_format, + .adapter_init_3d = adapter_gl_init_3d, + .adapter_uninit_3d = adapter_gl_uninit_3d, + .adapter_map_bo_address = adapter_gl_map_bo_address, + .adapter_unmap_bo_address = adapter_gl_unmap_bo_address, + .adapter_copy_bo_address = adapter_gl_copy_bo_address, + .adapter_create_swapchain = adapter_gl_create_swapchain, + .adapter_destroy_swapchain = adapter_gl_destroy_swapchain, + .adapter_create_buffer = adapter_gl_create_buffer, + .adapter_destroy_buffer = adapter_gl_destroy_buffer, + .adapter_create_texture = adapter_gl_create_texture, + .adapter_destroy_texture = adapter_gl_destroy_texture, + .adapter_create_rendertarget_view = adapter_gl_create_rendertarget_view, + .adapter_destroy_rendertarget_view = adapter_gl_destroy_rendertarget_view, + .adapter_create_shader_resource_view = adapter_gl_create_shader_resource_view, + .adapter_destroy_shader_resource_view = adapter_gl_destroy_shader_resource_view, + .adapter_create_unordered_access_view = adapter_gl_create_unordered_access_view, + .adapter_destroy_unordered_access_view = adapter_gl_destroy_unordered_access_view, + .adapter_create_sampler = adapter_gl_create_sampler, + .adapter_destroy_sampler = adapter_gl_destroy_sampler, + .adapter_create_query = adapter_gl_create_query, + .adapter_destroy_query = adapter_gl_destroy_query, + .adapter_flush_context = adapter_gl_flush_context, + .adapter_dispatch_compute = dispatch_compute, + .adapter_clear_uav = adapter_gl_clear_uav, }; static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_gl, uint32_t wined3d_creation_flags) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 1641de78522..7c635620867 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1414,6 +1414,12 @@ static void adapter_vk_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_vk_dispatch_compute(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) +{ + FIXME("device %p, state %p, parameters %p.\n", device, state, parameters); +} + void adapter_vk_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { @@ -1422,36 +1428,37 @@ void adapter_vk_clear_uav(struct wined3d_context *context, static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { - adapter_vk_destroy, - adapter_vk_create_device, - adapter_vk_destroy_device, - adapter_vk_acquire_context, - adapter_vk_release_context, - adapter_vk_get_wined3d_caps, - adapter_vk_check_format, - adapter_vk_init_3d, - adapter_vk_uninit_3d, - adapter_vk_map_bo_address, - adapter_vk_unmap_bo_address, - adapter_vk_copy_bo_address, - adapter_vk_create_swapchain, - adapter_vk_destroy_swapchain, - adapter_vk_create_buffer, - adapter_vk_destroy_buffer, - adapter_vk_create_texture, - adapter_vk_destroy_texture, - adapter_vk_create_rendertarget_view, - adapter_vk_destroy_rendertarget_view, - adapter_vk_create_shader_resource_view, - adapter_vk_destroy_shader_resource_view, - adapter_vk_create_unordered_access_view, - adapter_vk_destroy_unordered_access_view, - adapter_vk_create_sampler, - adapter_vk_destroy_sampler, - adapter_vk_create_query, - adapter_vk_destroy_query, - adapter_vk_flush_context, - adapter_vk_clear_uav, + .adapter_destroy = adapter_vk_destroy, + .adapter_create_device = adapter_vk_create_device, + .adapter_destroy_device = adapter_vk_destroy_device, + .adapter_acquire_context = adapter_vk_acquire_context, + .adapter_release_context = adapter_vk_release_context, + .adapter_get_wined3d_caps = adapter_vk_get_wined3d_caps, + .adapter_check_format = adapter_vk_check_format, + .adapter_init_3d = adapter_vk_init_3d, + .adapter_uninit_3d = adapter_vk_uninit_3d, + .adapter_map_bo_address = adapter_vk_map_bo_address, + .adapter_unmap_bo_address = adapter_vk_unmap_bo_address, + .adapter_copy_bo_address = adapter_vk_copy_bo_address, + .adapter_create_swapchain = adapter_vk_create_swapchain, + .adapter_destroy_swapchain = adapter_vk_destroy_swapchain, + .adapter_create_buffer = adapter_vk_create_buffer, + .adapter_destroy_buffer = adapter_vk_destroy_buffer, + .adapter_create_texture = adapter_vk_create_texture, + .adapter_destroy_texture = adapter_vk_destroy_texture, + .adapter_create_rendertarget_view = adapter_vk_create_rendertarget_view, + .adapter_destroy_rendertarget_view = adapter_vk_destroy_rendertarget_view, + .adapter_create_shader_resource_view = adapter_vk_create_shader_resource_view, + .adapter_destroy_shader_resource_view = adapter_vk_destroy_shader_resource_view, + .adapter_create_unordered_access_view = adapter_vk_create_unordered_access_view, + .adapter_destroy_unordered_access_view = adapter_vk_destroy_unordered_access_view, + .adapter_create_sampler = adapter_vk_create_sampler, + .adapter_destroy_sampler = adapter_vk_destroy_sampler, + .adapter_create_query = adapter_vk_create_query, + .adapter_destroy_query = adapter_vk_destroy_query, + .adapter_flush_context = adapter_vk_flush_context, + .adapter_dispatch_compute = adapter_vk_dispatch_compute, + .adapter_clear_uav = adapter_vk_clear_uav, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 899d5a712e4..930351d092c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -785,7 +785,7 @@ static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_dispatch *op = data; struct wined3d_state *state = &cs->state; - dispatch_compute(cs->device, state, &op->parameters); + cs->device->adapter->adapter_ops->adapter_dispatch_compute(cs->device, state, &op->parameters); if (op->parameters.indirect) wined3d_resource_release(&op->parameters.u.indirect.buffer->resource); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c44d06f2b5b..40221ab7dee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2843,6 +2843,12 @@ static void adapter_no3d_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +static void adapter_no3d_dispatch_compute(struct wined3d_device *device, + const struct wined3d_state *state, const struct wined3d_dispatch_parameters *parameters) +{ + ERR("device %p, state %p, parameters %p.\n", device, state, parameters); +} + void adapter_no3d_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { @@ -2851,36 +2857,37 @@ void adapter_no3d_clear_uav(struct wined3d_context *context, static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { - adapter_no3d_destroy, - adapter_no3d_create_device, - adapter_no3d_destroy_device, - adapter_no3d_acquire_context, - adapter_no3d_release_context, - adapter_no3d_get_wined3d_caps, - adapter_no3d_check_format, - adapter_no3d_init_3d, - adapter_no3d_uninit_3d, - adapter_no3d_map_bo_address, - adapter_no3d_unmap_bo_address, - adapter_no3d_copy_bo_address, - adapter_no3d_create_swapchain, - adapter_no3d_destroy_swapchain, - adapter_no3d_create_buffer, - adapter_no3d_destroy_buffer, - adapter_no3d_create_texture, - adapter_no3d_destroy_texture, - adapter_no3d_create_rendertarget_view, - adapter_no3d_destroy_rendertarget_view, - adapter_no3d_create_shader_resource_view, - adapter_no3d_destroy_shader_resource_view, - adapter_no3d_create_unordered_access_view, - adapter_no3d_destroy_unordered_access_view, - adapter_no3d_create_sampler, - adapter_no3d_destroy_sampler, - adapter_no3d_create_query, - adapter_no3d_destroy_query, - adapter_no3d_flush_context, - adapter_no3d_clear_uav, + .adapter_destroy = adapter_no3d_destroy, + .adapter_create_device = adapter_no3d_create_device, + .adapter_destroy_device = adapter_no3d_destroy_device, + .adapter_acquire_context = adapter_no3d_acquire_context, + .adapter_release_context = adapter_no3d_release_context, + .adapter_get_wined3d_caps = adapter_no3d_get_wined3d_caps, + .adapter_check_format = adapter_no3d_check_format, + .adapter_init_3d = adapter_no3d_init_3d, + .adapter_uninit_3d = adapter_no3d_uninit_3d, + .adapter_map_bo_address = adapter_no3d_map_bo_address, + .adapter_unmap_bo_address = adapter_no3d_unmap_bo_address, + .adapter_copy_bo_address = adapter_no3d_copy_bo_address, + .adapter_create_swapchain = adapter_no3d_create_swapchain, + .adapter_destroy_swapchain = adapter_no3d_destroy_swapchain, + .adapter_create_buffer = adapter_no3d_create_buffer, + .adapter_destroy_buffer = adapter_no3d_destroy_buffer, + .adapter_create_texture = adapter_no3d_create_texture, + .adapter_destroy_texture = adapter_no3d_destroy_texture, + .adapter_create_rendertarget_view = adapter_no3d_create_rendertarget_view, + .adapter_destroy_rendertarget_view = adapter_no3d_destroy_rendertarget_view, + .adapter_create_shader_resource_view = adapter_no3d_create_shader_resource_view, + .adapter_destroy_shader_resource_view = adapter_no3d_destroy_shader_resource_view, + .adapter_create_unordered_access_view = adapter_no3d_create_unordered_access_view, + .adapter_destroy_unordered_access_view = adapter_no3d_destroy_unordered_access_view, + .adapter_create_sampler = adapter_no3d_create_sampler, + .adapter_destroy_sampler = adapter_no3d_destroy_sampler, + .adapter_create_query = adapter_no3d_create_query, + .adapter_destroy_query = adapter_no3d_destroy_query, + .adapter_flush_context = adapter_no3d_flush_context, + .adapter_dispatch_compute = adapter_no3d_dispatch_compute, + .adapter_clear_uav = adapter_no3d_clear_uav, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db86d746b5f..a5d22600013 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3031,6 +3031,8 @@ struct wined3d_adapter_ops void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); void (*adapter_flush_context)(struct wined3d_context *context); + void (*adapter_dispatch_compute)(struct wined3d_device *device, const struct wined3d_state *state, + const struct wined3d_dispatch_parameters *parameters); void (*adapter_clear_uav)(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); }; -- 2.20.1

1 0

[PATCH 0/9] First patches for PPC64
by André Hentschel April 27, 2020

April 27, 2020

Since some weeks I keep splitting/cleaning up/rebasing the PowerPC64le patchset from last year: [1] It's a horrible time for rebasing as so many things are changing in Wine right now, so I want to at least send out the easier ones, hoping I could then better concentrate on the harder ones. What it means is that this patchset alone won't build on PPC64 yet [1] https://github.com/madscientist159/wine/commits/master

3 12

[PATCH v6 1/3] qedit: Retrieve the pin media type using a helper function.
by Zebediah Figura April 27, 2020

April 27, 2020

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v6: Simplify error handling a bit. This supersedes <https://source.winehq.org/patches/data/184349>. dlls/qedit/mediadet.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 392320560b8..3c00a85b9ed 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -103,6 +103,24 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) return hr; } +static HRESULT get_pin_media_type(IPin *pin, AM_MEDIA_TYPE *out) +{ + IEnumMediaTypes *enummt; + AM_MEDIA_TYPE *pmt; + HRESULT hr; + + if (FAILED(hr = IPin_EnumMediaTypes(pin, &enummt))) + return hr; + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + IEnumMediaTypes_Release(enummt); + if (hr != S_OK) + return E_NOINTERFACE; + + *out = *pmt; + CoTaskMemFree(pmt); + return S_OK; +} + static HRESULT find_splitter(MediaDetImpl *detector) { IPin *source_pin, *splitter_pin; @@ -611,9 +629,6 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, AM_MEDIA_TYPE *pVal) { MediaDetImpl *This = impl_from_IMediaDet(iface); - IEnumMediaTypes *types; - AM_MEDIA_TYPE *pmt; - HRESULT hr; TRACE("(%p)\n", This); @@ -623,22 +638,7 @@ static HRESULT WINAPI MediaDet_get_StreamMediaType(IMediaDet* iface, if (!This->cur_pin) return E_INVALIDARG; - hr = IPin_EnumMediaTypes(This->cur_pin, &types); - if (SUCCEEDED(hr)) - { - hr = (IEnumMediaTypes_Next(types, 1, &pmt, NULL) == S_OK - ? S_OK - : E_NOINTERFACE); - IEnumMediaTypes_Release(types); - } - - if (SUCCEEDED(hr)) - { - *pVal = *pmt; - CoTaskMemFree(pmt); - } - - return hr; + return get_pin_media_type(This->cur_pin, pVal); } static HRESULT WINAPI MediaDet_GetSampleGrabber(IMediaDet* iface, -- 2.26.2

2 4

[PATCH v2 3/3] windowscodecs/tests: Add the tests for GIF encoder and decoder.
by Dmitry Timoshkov April 27, 2020

April 27, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/converter.c | 61 +++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 0a7e7238aa..7936c5e653 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1132,6 +1132,40 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } +static void check_gif_format(IStream *stream, const WICPixelFormatGUID *format) +{ +#include "pshpack1.h" + struct logical_screen_descriptor + { + char signature[6]; + USHORT width; + USHORT height; + BYTE packed; + /* global_color_table_flag : 1; + * color_resolution : 3; + * sort_flag : 1; + * global_color_table_size : 3; + */ + BYTE background_color_index; + BYTE pixel_aspect_ratio; + } lsd; +#include "poppack.h" + UINT color_resolution; + HRESULT hr; + + memset(&lsd, 0, sizeof(lsd)); + hr = IStream_Read(stream, &lsd, sizeof(lsd), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + ok(!memcmp(lsd.signature, "GIF89a", 6), "wrong GIF signature %.6s\n", lsd.signature); + + ok(lsd.width == 32, "wrong width %u\n", lsd.width); + ok(lsd.height == 2, "wrong height %u\n", lsd.height); + color_resolution = 1 << (((lsd.packed >> 4) & 0x07) + 1); + ok(color_resolution == 256, "wrong color resolution %u\n", color_resolution); + ok(lsd.pixel_aspect_ratio == 0, "wrong pixel_aspect_ratio %u\n", lsd.pixel_aspect_ratio); +} + static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) { HRESULT hr; @@ -1147,6 +1181,8 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WIC check_bmp_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) check_tiff_format(stream, format); + else if (IsEqualGUID(encoder, &CLSID_WICGifEncoder)) + check_gif_format(stream, format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -1241,6 +1277,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls container_format = &GUID_ContainerFormatTiff; else if (IsEqualGUID(clsid_encoder, &CLSID_WICJpegEncoder)) container_format = &GUID_ContainerFormatJpeg; + else if (IsEqualGUID(clsid_encoder, &CLSID_WICGifEncoder)) + container_format = &GUID_ContainerFormatGif; else ok(0, "Unknown encoder %s.\n", wine_dbgstr_guid(clsid_encoder)); @@ -1265,7 +1303,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); - ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + ok(SUCCEEDED(hr), "CoCreateInstance(%s) failed, hr=%x\n", wine_dbgstr_guid(clsid_encoder), hr); if (SUCCEEDED(hr)) { hglobal = GlobalAlloc(GMEM_MOVEABLE, 0); @@ -1290,7 +1328,10 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls if (palette) { hr = IWICBitmapEncoder_SetPalette(encoder, palette); - ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_encoder, &CLSID_WICGifEncoder)) + ok(hr == S_OK, "SetPalette failed, hr=%#x\n", hr); + else + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "wrong error %#x\n", hr); hr = S_OK; } @@ -1429,13 +1470,19 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, frame_palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) + ok(hr == WINCODEC_ERR_WRONGSTATE, "wrong error %#x\n", hr); + else + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); hr = IWICBitmapDecoder_CopyPalette(decoder, frame_palette); - ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); + if (IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) + ok(hr == S_OK || broken(hr == WINCODEC_ERR_FRAMEMISSING) /* XP */, "CopyPalette failed, hr=%#x\n", hr); + else + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "wrong error %#x\n", hr); hr = S_OK; i=0; @@ -1495,7 +1542,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls } } else if (IsEqualGUID(clsid_decoder, &CLSID_WICBmpDecoder) || - IsEqualGUID(clsid_decoder, &CLSID_WICTiffDecoder)) + IsEqualGUID(clsid_decoder, &CLSID_WICTiffDecoder) || + IsEqualGUID(clsid_decoder, &CLSID_WICGifDecoder)) { if (IsEqualGUID(&pixelformat, &GUID_WICPixelFormatBlackWhite) || IsEqualGUID(&pixelformat, &GUID_WICPixelFormat8bppIndexed)) @@ -1845,6 +1893,9 @@ START_TEST(converter) test_default_converter(); test_converter_8bppIndexed(); + test_encoder(&testdata_8bppIndexed, &CLSID_WICGifEncoder, + &testdata_8bppIndexed, &CLSID_WICGifDecoder, "GIF encoder 8bppIndexed"); + test_encoder(&testdata_BlackWhite, &CLSID_WICPngEncoder, &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICPngEncoder, -- 2.26.2

3 2