March 2018 - Wine-Devel - list.winehq.org

[PATCH v2 1/7] winevulkan: Implement device extension enumeration.
by Józef Kucia March 14, 2018

March 14, 2018

From: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: * Remove redundant NULL check before heap_free(). * Use %u for unsigned integers. --- dlls/winevulkan/make_vulkan | 22 +++++++ dlls/winevulkan/vulkan.c | 138 +++++++++++++++++++++++++++++++++++---- dlls/winevulkan/vulkan_private.h | 4 ++ dlls/winevulkan/vulkan_thunks.c | 16 +++++ dlls/winevulkan/vulkan_thunks.h | 2 + 5 files changed, 168 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5fff3f1511a1..b53203bd281e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1803,6 +1803,26 @@ class VkGenerator(object): f.write(" }\n") f.write(" }\n") f.write(" return NULL;\n") + f.write("}\n\n") + + # Create array of device extensions. + f.write("static const char * const vk_device_extensions[] =\n{\n") + for ext in self.registry.extensions: + if ext["type"] != "device": + continue + + f.write(" \"{0}\",\n".format(ext["name"])) + f.write("};\n\n") + + f.write("BOOL wine_vk_device_extension_supported(const char *name)\n") + f.write("{\n") + f.write(" unsigned int i;\n") + f.write(" for (i = 0; i < ARRAY_SIZE(vk_device_extensions); i++)\n") + f.write(" {\n") + f.write(" if (strcmp(vk_device_extensions[i], name) == 0)\n") + f.write(" return TRUE;\n") + f.write(" }\n") + f.write(" return FALSE;\n") f.write("}\n") def generate_thunks_h(self, f, prefix): @@ -1820,6 +1840,8 @@ class VkGenerator(object): f.write("void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN;\n") f.write("void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;\n\n") + f.write("BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN;\n\n") + # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index fe1f85121fc3..7b0fb37a00ee 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -46,6 +46,9 @@ struct wine_vk_structure_header }; static void *wine_vk_get_global_proc_addr(const char *name); +static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstance_T *instance, + VkPhysicalDevice phys_dev_host); +static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev); static const struct vulkan_funcs *vk_funcs = NULL; @@ -170,7 +173,7 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst /* Wrap each native physical device handle into a dispatchable object for the ICD loader. */ for (i = 0; i < num_phys_devs; i++) { - struct VkPhysicalDevice_T *phys_dev = heap_alloc(sizeof(*phys_dev)); + struct VkPhysicalDevice_T *phys_dev = wine_vk_physical_device_alloc(instance, tmp_phys_devs[i]); if (!phys_dev) { ERR("Unable to allocate memory for physical device!\n"); @@ -178,10 +181,6 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst goto err; } - phys_dev->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - phys_dev->instance = instance; - phys_dev->phys_dev = tmp_phys_devs[i]; - instance->phys_devs[i] = phys_dev; instance->num_phys_devs = i + 1; } @@ -192,7 +191,6 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst err: heap_free(tmp_phys_devs); - return res; } @@ -210,7 +208,7 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) for (i = 0; i < instance->num_phys_devs; i++) { - heap_free(&instance->phys_devs[i]); + wine_vk_physical_device_free(instance->phys_devs[i]); } heap_free(instance->phys_devs); } @@ -221,6 +219,99 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) heap_free(instance); } +static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstance_T *instance, + VkPhysicalDevice phys_dev) +{ + struct VkPhysicalDevice_T *object; + uint32_t num_host_properties, num_properties = 0; + VkExtensionProperties *host_properties = NULL; + VkResult res; + unsigned int i, j; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return NULL; + + object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + object->instance = instance; + object->phys_dev = phys_dev; + + res = instance->funcs.p_vkEnumerateDeviceExtensionProperties(phys_dev, + NULL, &num_host_properties, NULL); + if (res != VK_SUCCESS) + { + ERR("Failed to enumerate device extensions, res=%d\n", res); + goto err; + } + + host_properties = heap_calloc(num_host_properties, sizeof(*host_properties)); + if (!host_properties) + { + ERR("Failed to allocate memory for device properties!\n"); + goto err; + } + + res = instance->funcs.p_vkEnumerateDeviceExtensionProperties(phys_dev, + NULL, &num_host_properties, host_properties); + if (res != VK_SUCCESS) + { + ERR("Failed to enumerate device extensions, res=%d\n", res); + goto err; + } + + /* Count list of extensions for which we have an implementation. + * TODO: perform translation for platform specific extensions. + */ + for (i = 0; i < num_host_properties; i++) + { + if (wine_vk_device_extension_supported(host_properties[i].extensionName)) + { + TRACE("Enabling extension '%s' for physical device %p\n", host_properties[i].extensionName, object); + num_properties++; + } + else + { + TRACE("Skipping extension '%s', no implementation found in winevulkan.\n", host_properties[i].extensionName); + } + } + + TRACE("Host supported extensions %u, Wine supported extensions %u\n", num_host_properties, num_properties); + + object->properties = heap_calloc(num_properties, sizeof(*object->properties)); + if (!object->properties) + { + ERR("Failed to allocate memory for device properties!\n"); + goto err; + } + + for (i = 0, j = 0; i < num_host_properties; i++) + { + if (wine_vk_device_extension_supported(host_properties[i].extensionName)) + { + memcpy(&object->properties[j], &host_properties[i], sizeof(*object->properties)); + j++; + } + } + object->num_properties = num_properties; + + heap_free(host_properties); + return object; + +err: + wine_vk_physical_device_free(object); + heap_free(host_properties); + return NULL; +} + +static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) +{ + if (!phys_dev) + return; + + heap_free(phys_dev->properties); + heap_free(phys_dev); +} + VkResult WINAPI wine_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *image_index) { @@ -460,6 +551,9 @@ void WINAPI wine_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_dev, const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { + VkResult res; + unsigned int i, num_copies; + TRACE("%p, %p, %p, %p\n", phys_dev, layer_name, count, properties); /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ @@ -471,16 +565,32 @@ VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_ if (!properties) { - *count = 0; /* No extensions yet. */ + *count = phys_dev->num_properties; return VK_SUCCESS; } - /* When properties is not NULL, we copy the extensions over and set count to - * the number of copied extensions. For now we don't have much to do as we don't support - * any extensions yet. - */ - *count = 0; - return VK_SUCCESS; + if (*count < phys_dev->num_properties) + { + /* Incomplete is a type of success used to signal the application + * that not all devices got copied. + */ + num_copies = *count; + res = VK_INCOMPLETE; + } + else + { + num_copies = phys_dev->num_properties; + res = VK_SUCCESS; + } + + for (i = 0; i < num_copies; i++) + { + memcpy(&properties[i], &phys_dev->properties[i], sizeof(phys_dev->properties[i])); + } + *count = num_copies; + + TRACE("Result %d, extensions copied %u\n", res, num_copies); + return res; } static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 897c1e1418da..d49366fa5fb1 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -74,6 +74,10 @@ struct VkPhysicalDevice_T { struct wine_vk_base base; struct VkInstance_T *instance; /* parent */ + + uint32_t num_properties; + VkExtensionProperties *properties; + VkPhysicalDevice phys_dev; /* native physical device */ }; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 5d9826cd6756..dfda842b664b 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1073,3 +1073,19 @@ void *wine_vk_get_instance_proc_addr(const char *name) } return NULL; } + +static const char * const vk_device_extensions[] = +{ + "VK_KHR_swapchain", +}; + +BOOL wine_vk_device_extension_supported(const char *name) +{ + unsigned int i; + for (i = 0; i < ARRAY_SIZE(vk_device_extensions); i++) + { + if (strcmp(vk_device_extensions[i], name) == 0) + return TRUE; + } + return FALSE; +} diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index a91612e62b69..13c1228196ae 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -12,6 +12,8 @@ void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; +BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; + /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *pImageIndex) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) DECLSPEC_HIDDEN; -- 2.16.1

1 6

[PATCH 5/5] usp10: Use usp10_array_reserve() in GSUB_initialize_script_cache().
by Henri Verbeet March 14, 2018

March 14, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/opentype.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 2d708a8c401..74620a38f13 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2580,25 +2580,31 @@ static LoadedScript *usp10_script_cache_get_script(ScriptCache *script_cache, OP static void GSUB_initialize_script_cache(ScriptCache *psc) { - int i; + const OT_ScriptList *script; + const GSUB_Header *header; + SIZE_T i; + + if (!(header = psc->GSUB_Table)) + return; + + script = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList)); + psc->script_count = GET_BE_WORD(script->ScriptCount); + + TRACE("Initialising %li scripts in this font.\n", psc->script_count); + + if (!psc->script_count) + return; + + if (!usp10_array_reserve((void **)&psc->scripts, &psc->scripts_size, psc->script_count, sizeof(*psc->scripts))) + ERR("Failed to allocate script array.\n"); - if (psc->GSUB_Table) + for (i = 0; i < psc->script_count; ++i) { - const OT_ScriptList *script; - const GSUB_Header* header = (const GSUB_Header*)psc->GSUB_Table; - script = (const OT_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); - psc->script_count = GET_BE_WORD(script->ScriptCount); - TRACE("initializing %li scripts in this font\n",psc->script_count); - if (psc->script_count) - { - psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); - for (i = 0; i < psc->script_count; i++) - { - int offset = GET_BE_WORD(script->ScriptRecord[i].Script); - psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); - psc->scripts[i].gsub_table = ((const BYTE*)script + offset); - } - } + psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], + script->ScriptRecord[i].ScriptTag[1], + script->ScriptRecord[i].ScriptTag[2], + script->ScriptRecord[i].ScriptTag[3]); + psc->scripts[i].gsub_table = (const BYTE *)script + GET_BE_WORD(script->ScriptRecord[i].Script); } } -- 2.11.0

2 1

[PATCH v2] msctf: Added semi-stub support for ITfKeyTraceEventSink event sink.
by Jacek Caban March 14, 2018

March 14, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/tests/inputprocessor.c | 59 +++++++++++++++++++++++++++++++++++++-- dlls/msctf/threadmgr.c | 12 +++++++- include/msctf.idl | 17 +++++++++++ 4 files changed, 86 insertions(+), 3 deletions(-)

2 1

[PATCH] ole32: Better logging for apartment_getclassobject, on failure log dll path
by Fabian Maurer March 14, 2018

March 14, 2018

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ole32/compobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 598081bd34..58b9835306 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1339,7 +1339,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, hr = DllGetClassObject(rclsid, riid, ppv); if (hr != S_OK) - ERR("DllGetClassObject returned error 0x%08x\n", hr); + ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath)); return hr; } @@ -1388,7 +1388,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, hr = apartment_loaded_dll->dll->DllGetClassObject(rclsid, riid, ppv); if (hr != S_OK) - ERR("DllGetClassObject returned error 0x%08x\n", hr); + ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath)); } return hr; -- 2.16.2

2 1

[PATCH 4/5] wined3d: Get rid of the unused context_get_rt_surface().
by Henri Verbeet March 14, 2018

March 14, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7da2da4f5c8..8acf3b04a74 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4419,15 +4419,6 @@ static inline void wined3d_insert_bits(DWORD *bitstream, } } -static inline struct wined3d_surface *context_get_rt_surface(const struct wined3d_context *context) -{ - struct wined3d_texture *texture = context->current_rt.texture; - - if (!texture) - return NULL; - return texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; -} - static inline void wined3d_from_cs(const struct wined3d_cs *cs) { if (cs->thread) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Get rid of the "container" field from struct wined3d_surface.
by Henri Verbeet March 14, 2018

March 14, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 12 +++++------- dlls/wined3d/device.c | 25 +++++++++++++++++-------- dlls/wined3d/swapchain.c | 20 ++++++++++---------- dlls/wined3d/texture.c | 1 - dlls/wined3d/wined3d_private.h | 15 --------------- 5 files changed, 32 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 480717c06a5..0db2daa4893 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1011,16 +1011,14 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const struct wined3d_device *device = cs->device; struct wined3d_rendertarget_view *prev; - if ((prev = cs->state.fb->depth_stencil)) + if ((prev = cs->state.fb->depth_stencil) && prev->resource->type != WINED3D_RTYPE_BUFFER) { - struct wined3d_surface *prev_surface = wined3d_rendertarget_view_get_surface(prev); + struct wined3d_texture *prev_texture = texture_from_resource(prev->resource); - if (prev_surface && (device->swapchains[0]->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL - || prev_surface->container->flags & WINED3D_TEXTURE_DISCARD)) - { - wined3d_texture_validate_location(prev_surface->container, + if (device->swapchains[0]->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL + || prev_texture->flags & WINED3D_TEXTURE_DISCARD) + wined3d_texture_validate_location(prev_texture, prev->sub_resource_idx, WINED3D_LOCATION_DISCARDED); - } } cs->fb.depth_stencil = op->view; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92dfa0ccf93..c5517f5fcde 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -226,11 +226,11 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c float depth, DWORD stencil) { struct wined3d_rendertarget_view *rtv = rt_count ? fb->render_targets[0] : NULL; - struct wined3d_surface *target = rtv ? wined3d_rendertarget_view_get_surface(rtv) : NULL; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - struct wined3d_surface *depth_stencil = dsv ? wined3d_rendertarget_view_get_surface(dsv) : NULL; const struct wined3d_state *state = &device->cs->state; + struct wined3d_texture *depth_stencil = NULL; const struct wined3d_gl_info *gl_info; + struct wined3d_texture *target = NULL; UINT drawable_width, drawable_height; struct wined3d_color corrected_color; struct wined3d_context *context; @@ -238,10 +238,19 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c BOOL render_offscreen; unsigned int i; - if (target) - context = context_acquire(device, target->container, rtv->sub_resource_idx); + if (rtv && rtv->resource->type != WINED3D_RTYPE_BUFFER) + { + target = texture_from_resource(rtv->resource); + context = context_acquire(device, target, rtv->sub_resource_idx); + } else + { context = context_acquire(device, NULL, 0); + } + + if (dsv && dsv->resource->type != WINED3D_RTYPE_BUFFER) + depth_stencil = texture_from_resource(dsv->resource); + if (!context->valid) { context_release(context); @@ -281,11 +290,11 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } else { - unsigned int ds_level = dsv->sub_resource_idx % depth_stencil->container->level_count; + unsigned int ds_level = dsv->sub_resource_idx % depth_stencil->level_count; render_offscreen = TRUE; - drawable_width = wined3d_texture_get_level_pow2_width(depth_stencil->container, ds_level); - drawable_height = wined3d_texture_get_level_pow2_height(depth_stencil->container, ds_level); + drawable_width = wined3d_texture_get_level_pow2_width(depth_stencil, ds_level); + drawable_height = wined3d_texture_get_level_pow2_height(depth_stencil, ds_level); } if (depth_stencil) @@ -449,7 +458,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c } if (wined3d_settings.strict_draw_ordering || (flags & WINED3DCLEAR_TARGET - && target->container->swapchain && target->container->swapchain->front_buffer == target->container)) + && target->swapchain && target->swapchain->front_buffer == target)) gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4542f291f43..36d84f6182a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -385,6 +385,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, { struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; + struct wined3d_rendertarget_view *dsv = fb->depth_stencil; const struct wined3d_gl_info *gl_info; struct wined3d_texture *logo_texture; struct wined3d_context *context; @@ -509,14 +510,13 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, wined3d_texture_validate_location(swapchain->back_buffers[swapchain->desc.backbuffer_count - 1], 0, WINED3D_LOCATION_DISCARDED); - if (fb->depth_stencil) + if (dsv && dsv->resource->type != WINED3D_RTYPE_BUFFER) { - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil); + struct wined3d_texture *ds = texture_from_resource(dsv->resource); - if (ds && (swapchain->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL - || ds->container->flags & WINED3D_TEXTURE_DISCARD)) - wined3d_texture_validate_location(ds->container, - fb->depth_stencil->sub_resource_idx, WINED3D_LOCATION_DISCARDED); + if ((swapchain->desc.flags & WINED3D_SWAPCHAIN_DISCARD_DEPTHSTENCIL + || ds->flags & WINED3D_TEXTURE_DISCARD)) + wined3d_texture_validate_location(ds, dsv->sub_resource_idx, WINED3D_LOCATION_DISCARDED); } context_release(context); @@ -553,7 +553,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai if (swapchain->palette) wined3d_palette_apply_to_dc(swapchain->palette, front->dc); - if (front->container->resource.map_count) + if (swapchain->front_buffer->resource.map_count) ERR("Trying to blit a mapped surface.\n"); TRACE("Copying surface %p to screen.\n", front); @@ -595,15 +595,15 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, /* Flip the surface data. */ dc = front->dc; bitmap = front->bitmap; - data = front->container->resource.heap_memory; + data = swapchain->front_buffer->resource.heap_memory; front->dc = back->dc; front->bitmap = back->bitmap; - front->container->resource.heap_memory = back->container->resource.heap_memory; + swapchain->front_buffer->resource.heap_memory = swapchain->back_buffers[0]->resource.heap_memory; back->dc = dc; back->bitmap = bitmap; - back->container->resource.heap_memory = data; + swapchain->back_buffers[0]->resource.heap_memory = data; /* FPS support */ if (TRACE_ON(fps)) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6abc7e71770..fc5c6747862 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2365,7 +2365,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 struct wined3d_surface *surface; surface = &surfaces[idx]; - surface->container = texture; sub_resource = &texture->sub_resources[idx]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3a404e01674..7da2da4f5c8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3337,8 +3337,6 @@ struct fbo_entry struct wined3d_surface { - struct wined3d_texture *container; - /* For GetDC */ HBITMAP bitmap; HDC dc; @@ -3716,19 +3714,6 @@ struct wined3d_rendertarget_view struct wined3d_view_desc desc; }; -static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( - const struct wined3d_rendertarget_view *view) -{ - struct wined3d_texture *texture; - - if (!view || view->resource->type != WINED3D_RTYPE_TEXTURE_2D) - return NULL; - - texture = texture_from_resource(view->resource); - - return texture->sub_resources[view->sub_resource_idx].u.surface; -} - void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a resource to context_generate_rt_mask_no_fbo().
by Henri Verbeet March 14, 2018

March 14, 2018

Instead of a texture, since rendertarget views operate on resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1ea2765284e..34102c76784 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2717,12 +2717,12 @@ GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) } } -static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, struct wined3d_texture *rt) +static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, struct wined3d_resource *rt) { - if (!rt || rt->resource.format->id == WINED3DFMT_NULL) + if (!rt || rt->format->id == WINED3DFMT_NULL) return 0; - else if (rt->swapchain) - return context_generate_rt_mask_from_resource(&rt->resource); + else if (rt->type != WINED3D_RTYPE_BUFFER && texture_from_resource(rt)->swapchain) + return context_generate_rt_mask_from_resource(rt); else return context_generate_rt_mask(context_get_offscreen_gl_buffer(context)); } @@ -2760,7 +2760,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine } else { - rt_mask = context_generate_rt_mask_no_fbo(context, rt); + rt_mask = context_generate_rt_mask_no_fbo(context, &rt->resource); } cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; @@ -3043,8 +3043,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win } else { - rt_mask = context_generate_rt_mask_no_fbo(context, - rt_count ? wined3d_rendertarget_view_get_surface(rts[0])->container : NULL); + rt_mask = context_generate_rt_mask_no_fbo(context, rt_count ? rts[0]->resource : NULL); } } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO @@ -3058,8 +3057,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win } else { - rt_mask = context_generate_rt_mask_no_fbo(context, - rt_count ? wined3d_rendertarget_view_get_surface(rts[0])->container : NULL); + rt_mask = context_generate_rt_mask_no_fbo(context, rt_count ? rts[0]->resource : NULL); } cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; @@ -3109,7 +3107,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return context_generate_rt_mask_no_fbo(context, wined3d_rendertarget_view_get_surface(rts[0])->container); + return context_generate_rt_mask_no_fbo(context, rts[0]->resource); else if (!context->render_offscreen) return context_generate_rt_mask_from_resource(rts[0]->resource); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a texture to context_surface_update().
by Henri Verbeet March 14, 2018

March 14, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/surface.c | 3 +-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6530b6fc37e..1ea2765284e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1092,7 +1092,7 @@ void context_gl_resource_released(struct wined3d_device *device, context_enum_fbo_entries(device, name, rb_namespace, context_queue_fbo_entry_destruction); } -void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) +void context_texture_update(struct wined3d_context *context, const struct wined3d_texture *texture) { const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry = context->current_fbo; @@ -1102,10 +1102,10 @@ void context_surface_update(struct wined3d_context *context, const struct wined3 for (i = 0; i < gl_info->limits.buffers + 1; ++i) { - if (surface->container->texture_rgb.name == entry->key.objects[i].object - || surface->container->texture_srgb.name == entry->key.objects[i].object) + if (texture->texture_rgb.name == entry->key.objects[i].object + || texture->texture_srgb.name == entry->key.objects[i].object) { - TRACE("Updated surface %p is bound as attachment %u to the current FBO.\n", surface, i); + TRACE("Updated texture %p is bound as attachment %u to the current FBO.\n", texture, i); context->rebind_fbo = TRUE; return; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b0ccfb8122d..7f74d4954de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -912,13 +912,12 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) { - struct wined3d_surface *surface = texture->sub_resources[sub_resource_idx].u.surface; struct wined3d_device *device = texture->resource.device; unsigned int i; for (i = 0; i < device->context_count; ++i) { - context_surface_update(device->contexts[i], surface); + context_texture_update(device->contexts[i], texture); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f02ae465c1..3a404e01674 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2185,7 +2185,7 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) DECLSPEC_HIDDEN; +void context_texture_update(struct wined3d_context *context, const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/7] winevulkan: Implement device extension enumeration.
by Roderick Colenbrander March 14, 2018

March 14, 2018

Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> --- dlls/winevulkan/make_vulkan | 22 +++++++ dlls/winevulkan/vulkan.c | 138 +++++++++++++++++++++++++++++++++++---- dlls/winevulkan/vulkan_private.h | 4 ++ dlls/winevulkan/vulkan_thunks.c | 16 +++++ dlls/winevulkan/vulkan_thunks.h | 2 + 5 files changed, 168 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5fff3f1511..ddae964457 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1803,6 +1803,26 @@ class VkGenerator(object): f.write(" }\n") f.write(" }\n") f.write(" return NULL;\n") + f.write("}\n\n") + + # Create array of device extensions. + f.write("static const char *vk_device_extensions[] =\n{\n") + for ext in self.registry.extensions: + if ext["type"] != "device": + continue + + f.write(" \"{0}\",\n".format(ext["name"])) + f.write("};\n\n") + + f.write("BOOL wine_vk_device_extension_supported(const char *name)\n") + f.write("{\n") + f.write(" unsigned int i;\n") + f.write(" for (i = 0; i < ARRAY_SIZE(vk_device_extensions); i++)\n") + f.write(" {\n") + f.write(" if (strcmp(vk_device_extensions[i], name) == 0)\n") + f.write(" return TRUE;\n") + f.write(" }\n") + f.write(" return FALSE;\n") f.write("}\n") def generate_thunks_h(self, f, prefix): @@ -1820,6 +1840,8 @@ class VkGenerator(object): f.write("void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN;\n") f.write("void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;\n\n") + f.write("BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN;\n\n") + # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index fe1f85121f..7b0a15f2af 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -46,6 +46,9 @@ struct wine_vk_structure_header }; static void *wine_vk_get_global_proc_addr(const char *name); +static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstance_T *instance, + VkPhysicalDevice phys_dev_host); +static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev); static const struct vulkan_funcs *vk_funcs = NULL; @@ -170,7 +173,7 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst /* Wrap each native physical device handle into a dispatchable object for the ICD loader. */ for (i = 0; i < num_phys_devs; i++) { - struct VkPhysicalDevice_T *phys_dev = heap_alloc(sizeof(*phys_dev)); + struct VkPhysicalDevice_T *phys_dev = wine_vk_physical_device_alloc(instance, tmp_phys_devs[i]); if (!phys_dev) { ERR("Unable to allocate memory for physical device!\n"); @@ -178,10 +181,6 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst goto err; } - phys_dev->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - phys_dev->instance = instance; - phys_dev->phys_dev = tmp_phys_devs[i]; - instance->phys_devs[i] = phys_dev; instance->num_phys_devs = i + 1; } @@ -192,7 +191,6 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst err: heap_free(tmp_phys_devs); - return res; } @@ -210,7 +208,7 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) for (i = 0; i < instance->num_phys_devs; i++) { - heap_free(&instance->phys_devs[i]); + wine_vk_physical_device_free(instance->phys_devs[i]); } heap_free(instance->phys_devs); } @@ -221,6 +219,99 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) heap_free(instance); } +static struct VkPhysicalDevice_T *wine_vk_physical_device_alloc(struct VkInstance_T *instance, + VkPhysicalDevice phys_dev) +{ + struct VkPhysicalDevice_T *object; + uint32_t num_host_properties, num_properties = 0; + VkExtensionProperties *host_properties = NULL; + VkResult res; + unsigned int i, j; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return NULL; + + object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + object->instance = instance; + object->phys_dev = phys_dev; + + res = instance->funcs.p_vkEnumerateDeviceExtensionProperties(phys_dev, + NULL, &num_host_properties, NULL); + if (res != VK_SUCCESS) + { + ERR("Failed to enumerate device extensions, res=%d\n", res); + goto err; + } + + host_properties = heap_calloc(num_host_properties, sizeof(*host_properties)); + if (!host_properties) + { + ERR("Failed to allocate memory for device properties!\n"); + goto err; + } + + res = instance->funcs.p_vkEnumerateDeviceExtensionProperties(phys_dev, + NULL, &num_host_properties, host_properties); + if (res != VK_SUCCESS) + { + ERR("Failed to enumerate device extensions, res=%d\n", res); + goto err; + } + + /* Count list of extensions for which we have an implementation. + * TODO: perform translation for platform specific extensions. + */ + for (i = 0; i < num_host_properties; i++) + { + if (wine_vk_device_extension_supported(host_properties[i].extensionName)) + { + TRACE("Enabling extension '%s' for physical device %p\n", host_properties[i].extensionName, object); + num_properties++; + } + else + TRACE("Skipping extension '%s', no implementation found in winevulkan.\n", host_properties[i].extensionName); + } + + TRACE("Host supported extensions %d, Wine supported extensions %d\n", num_host_properties, num_properties); + + object->properties = heap_calloc(num_properties, sizeof(*object->properties)); + if (!object->properties) + { + ERR("Failed to allocate memory for device properties!\n"); + goto err; + } + + for (i = 0, j = 0; i < num_host_properties; i++) + { + if (wine_vk_device_extension_supported(host_properties[i].extensionName)) + { + memcpy(&object->properties[j], &host_properties[i], sizeof(*object->properties)); + j++; + } + } + object->num_properties = num_properties; + + heap_free(host_properties); + return object; + +err: + wine_vk_physical_device_free(object); + heap_free(host_properties); + return NULL; +} + +static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) +{ + if (!phys_dev) + return; + + if (phys_dev->properties) + heap_free(phys_dev->properties); + + heap_free(phys_dev); +} + VkResult WINAPI wine_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *image_index) { @@ -460,6 +551,9 @@ void WINAPI wine_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_dev, const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { + VkResult res; + unsigned int i, num_copies; + TRACE("%p, %p, %p, %p\n", phys_dev, layer_name, count, properties); /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ @@ -471,16 +565,32 @@ VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_ if (!properties) { - *count = 0; /* No extensions yet. */ + *count = phys_dev->num_properties; return VK_SUCCESS; } - /* When properties is not NULL, we copy the extensions over and set count to - * the number of copied extensions. For now we don't have much to do as we don't support - * any extensions yet. - */ - *count = 0; - return VK_SUCCESS; + if (*count < phys_dev->num_properties) + { + /* Incomplete is a type of success used to signal the application + * that not all devices got copied. + */ + num_copies = *count; + res = VK_INCOMPLETE; + } + else + { + num_copies = phys_dev->num_properties; + res = VK_SUCCESS; + } + + for (i = 0; i < num_copies; i++) + { + memcpy(&properties[i], &phys_dev->properties[i], sizeof(phys_dev->properties[i])); + } + *count = num_copies; + + TRACE("Result %d, extensions copied %d\n", res, num_copies); + return res; } static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 897c1e1418..d49366fa5f 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -74,6 +74,10 @@ struct VkPhysicalDevice_T { struct wine_vk_base base; struct VkInstance_T *instance; /* parent */ + + uint32_t num_properties; + VkExtensionProperties *properties; + VkPhysicalDevice phys_dev; /* native physical device */ }; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 5d9826cd67..51de005a7f 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1073,3 +1073,19 @@ void *wine_vk_get_instance_proc_addr(const char *name) } return NULL; } + +static const char *vk_device_extensions[] = +{ + "VK_KHR_swapchain", +}; + +BOOL wine_vk_device_extension_supported(const char *name) +{ + unsigned int i; + for (i = 0; i < ARRAY_SIZE(vk_device_extensions); i++) + { + if (strcmp(vk_device_extensions[i], name) == 0) + return TRUE; + } + return FALSE; +} diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index a91612e62b..13c1228196 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -12,6 +12,8 @@ void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; +BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; + /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *pImageIndex) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) DECLSPEC_HIDDEN; -- 2.14.3

1 6

[PATCH] Ensure 16 byte alignment of data
by Adeniyi Mayokun March 14, 2018

March 14, 2018

>From 275d93c9ab0f533fa70d698726afc8adaaefb664 Mon Sep 17 00:00:00 2001 From: Adeniyi Mayokun <adeniyimayokun17(a)gmail.com> Date: Wed, 14 Mar 2018 06:50:15 +0100 Subject: [PATCH] Ensure 16 byte alignment of data Signed-off-by: Adeniyi Mayokun <adeniyimayokun17(a)gmail.com(a)gmail.com> --- dlls/ntdll/heap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 57d3d544e5..5469b6fc55 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -54,8 +54,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(heap); typedef struct tagARENA_INUSE { DWORD size; /* Block size; must be the first field */ - DWORD magic : 24; /* Magic number */ - DWORD unused_bytes : 8; /* Number of bytes in the block not used by user data (max value is HEAP_MIN_DATA_SIZE+HEAP_MIN_SHRINK_SIZE) */ + DWORD magic; /* Magic number */ + DWORD unused_bytes; /* Number of bytes in the block not used by user data (max value is HEAP_MIN_DATA_SIZE+HEAP_MIN_SHRINK_SIZE) */ + DWORD padding; } ARENA_INUSE; typedef struct tagARENA_FREE @@ -92,9 +93,11 @@ typedef struct /* everything is aligned on 64 byte boundaries */ #define ALIGNMENT 64 +#define HEADER_ALIGNMENT 16 #define LARGE_ALIGNMENT 16 /* large blocks have stricter alignment */ -C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); +C_ASSERT( sizeof(ARENA_LARGE) % HEADER_ALIGNMENT == 0 ); +C_ASSERT( sizeof(ARENA_INUSE) % HEADER_ALIGNMENT == 0 ); #define ROUND_SIZE(size) ((size + ALIGNMENT - 1) & ~(ALIGNMENT - 1)) #define ROUND_DATA_SIZE(size) (((size + sizeof(ARENA_INUSE) + ALIGNMENT - 1) \ -- 2.14.1

1 0