wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Henri Verbeet : wined3d: Create Vulkan buffer views for unordered access view counters.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: wine Branch: master Commit: 0c27d244f76ad90301c5db09d738b3a0389bcdac URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c27d244f76ad90301c5db09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 18:36:41 2020 +0430 wined3d: Create Vulkan buffer views for unordered access view counters. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 31 ++++++++++++++++++++---- dlls/wined3d/view.c | 54 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 77 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a0f503edbe..bd943a65af 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1218,6 +1218,8 @@ struct wined3d_view_vk_destroy_ctx struct wined3d_device_vk *device_vk; VkBufferView *vk_buffer_view; VkImageView *vk_image_view; + struct wined3d_bo_vk *vk_counter_bo; + VkBufferView *vk_counter_view; uint64_t *command_buffer_id; void *object; struct wined3d_view_vk_destroy_ctx *free; @@ -1260,6 +1262,21 @@ static void wined3d_view_vk_destroy_object(void *object) TRACE("Destroyed image view 0x%s.\n", wine_dbgstr_longlong(*ctx->vk_image_view)); } } + if (ctx->vk_counter_bo && ctx->vk_counter_bo->vk_buffer) + wined3d_context_vk_destroy_bo(wined3d_context_vk(context), ctx->vk_counter_bo); + if (ctx->vk_counter_view) + { + if (context) + { + wined3d_context_vk_destroy_buffer_view(wined3d_context_vk(context), + *ctx->vk_counter_view, *ctx->command_buffer_id); + } + else + { + VK_CALL(vkDestroyBufferView(device_vk->vk_device, *ctx->vk_counter_view, NULL)); + TRACE("Destroyed counter buffer view 0x%s.\n", wine_dbgstr_longlong(*ctx->vk_counter_view)); + } + } if (context) context_release(context); @@ -1269,7 +1286,8 @@ static void wined3d_view_vk_destroy_object(void *object) } static void wined3d_view_vk_destroy(struct wined3d_device *device, VkBufferView *vk_buffer_view, - VkImageView *vk_image_view, uint64_t *command_buffer_id, void *view_vk) + VkImageView *vk_image_view, struct wined3d_bo_vk *vk_counter_bo, + VkBufferView *vk_counter_view, uint64_t *command_buffer_id, void *view_vk) { struct wined3d_view_vk_destroy_ctx *ctx, c; @@ -1278,6 +1296,8 @@ static void wined3d_view_vk_destroy(struct wined3d_device *device, VkBufferView ctx->device_vk = wined3d_device_vk(device); ctx->vk_buffer_view = vk_buffer_view; ctx->vk_image_view = vk_image_view; + ctx->vk_counter_bo = vk_counter_bo; + ctx->vk_counter_view = vk_counter_view; ctx->command_buffer_id = command_buffer_id; ctx->object = view_vk; ctx->free = ctx != &c ? ctx : NULL; @@ -1302,7 +1322,8 @@ static void adapter_vk_destroy_rendertarget_view(struct wined3d_rendertarget_vie if (swapchain_count) wined3d_device_incref(device); wined3d_rendertarget_view_cleanup(&view_vk->v); - wined3d_view_vk_destroy(device, NULL, &view_vk->vk_image_view, &view_vk->command_buffer_id, view_vk); + wined3d_view_vk_destroy(device, NULL, &view_vk->vk_image_view, + NULL, NULL, &view_vk->command_buffer_id, view_vk); if (swapchain_count) wined3d_device_decref(device); } @@ -1355,7 +1376,8 @@ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resour else vk_image_view = &view_vk->u.vk_image_info.imageView; wined3d_shader_resource_view_cleanup(&srv_vk->v); - wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &view_vk->command_buffer_id, srv_vk); + wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, + NULL, NULL, &view_vk->command_buffer_id, srv_vk); if (swapchain_count) wined3d_device_decref(device); } @@ -1408,7 +1430,8 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac else vk_image_view = &view_vk->u.vk_image_info.imageView; wined3d_unordered_access_view_cleanup(&uav_vk->v); - wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &view_vk->command_buffer_id, uav_vk); + wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &uav_vk->counter_bo, + &uav_vk->vk_counter_view, &view_vk->command_buffer_id, uav_vk); if (swapchain_count) wined3d_device_decref(device); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index d87a94023d..e7f77f58cd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1459,13 +1459,16 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) struct wined3d_view_vk *view_vk = &uav_vk->view_vk; struct wined3d_view_desc *desc = &uav_vk->v.desc; const struct wined3d_format_vk *format_vk; + const struct wined3d_vk_info *vk_info; struct wined3d_texture_vk *texture_vk; struct wined3d_context_vk *context_vk; struct wined3d_device_vk *device_vk; + VkBufferViewCreateInfo create_info; struct wined3d_resource *resource; VkBufferView vk_buffer_view; uint32_t default_flags = 0; VkImageView vk_image_view; + VkResult vr; resource = uav_vk->v.resource; device_vk = wined3d_device_vk(resource->device); @@ -1474,16 +1477,53 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); - vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, - desc, wined3d_buffer_vk(buffer_from_resource(resource)), format_vk); - context_release(&context_vk->c); + vk_info = context_vk->vk_info; - if (!vk_buffer_view) - return; + if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, + desc, wined3d_buffer_vk(buffer_from_resource(resource)), format_vk))) + { + TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); - TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); + uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + } + + if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) + { + if (!wined3d_context_vk_create_bo(context_vk, sizeof(uint32_t), VK_BUFFER_USAGE_TRANSFER_SRC_BIT + | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &uav_vk->counter_bo)) + { + ERR("Failed to create counter bo.\n"); + context_release(&context_vk->c); - uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + return; + } + + VK_CALL(vkCmdFillBuffer(wined3d_context_vk_get_command_buffer(context_vk), + uav_vk->counter_bo.vk_buffer, uav_vk->counter_bo.buffer_offset, sizeof(uint32_t), 0)); + wined3d_context_vk_reference_bo(context_vk, &uav_vk->counter_bo); + + create_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.buffer = uav_vk->counter_bo.vk_buffer; + create_info.format = VK_FORMAT_R32_UINT; + create_info.offset = uav_vk->counter_bo.buffer_offset; + create_info.range = sizeof(uint32_t); + if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, + &create_info, NULL, &uav_vk->vk_counter_view))) < 0) + { + ERR("Failed to create counter buffer view, vr %s.\n", wined3d_debug_vkresult(vr)); + } + else + { + TRACE("Created counter buffer view 0x%s.\n", wine_dbgstr_longlong(uav_vk->vk_counter_view)); + + uav_vk->v.counter_bo = (uintptr_t)&uav_vk->counter_bo; + } + } + + context_release(&context_vk->c); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a65a33ad25..2409728f27 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4671,6 +4671,9 @@ struct wined3d_unordered_access_view_vk { struct wined3d_unordered_access_view v; struct wined3d_view_vk view_vk; + + VkBufferView vk_counter_view; + struct wined3d_bo_vk counter_bo; }; static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_view_vk(

1 0

Henri Verbeet : wined3d: Create Vulkan buffer views for unordered access views.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: wine Branch: master Commit: 3d10118bea641f226afec6acacfb66983bf04438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d10118bea641f226afec6ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 18:36:40 2020 +0430 wined3d: Create Vulkan buffer views for unordered access views. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 7 +++++-- dlls/wined3d/view.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5a5b51da50..a0f503edbe 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1392,6 +1392,7 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac struct wined3d_device *device = uav_vk->v.resource->device; unsigned int swapchain_count = device->swapchain_count; struct wined3d_view_vk *view_vk = &uav_vk->view_vk; + VkBufferView *vk_buffer_view = NULL; VkImageView *vk_image_view = NULL; TRACE("uav_vk %p.\n", uav_vk); @@ -1402,10 +1403,12 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac * the refcount on a device that's in the process of being destroyed. */ if (swapchain_count) wined3d_device_incref(device); - if (uav_vk->v.resource->type != WINED3D_RTYPE_BUFFER) + if (uav_vk->v.resource->type == WINED3D_RTYPE_BUFFER) + vk_buffer_view = &view_vk->u.vk_buffer_view; + else vk_image_view = &view_vk->u.vk_image_info.imageView; wined3d_unordered_access_view_cleanup(&uav_vk->v); - wined3d_view_vk_destroy(device, NULL, vk_image_view, &view_vk->command_buffer_id, uav_vk); + wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &view_vk->command_buffer_id, uav_vk); if (swapchain_count) wined3d_device_decref(device); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1e9a2052ec..d87a94023d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1463,6 +1463,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) struct wined3d_context_vk *context_vk; struct wined3d_device_vk *device_vk; struct wined3d_resource *resource; + VkBufferView vk_buffer_view; uint32_t default_flags = 0; VkImageView vk_image_view; @@ -1472,7 +1473,18 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer views not implemented.\n"); + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); + vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, + desc, wined3d_buffer_vk(buffer_from_resource(resource)), format_vk); + context_release(&context_vk->c); + + if (!vk_buffer_view) + return; + + TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view)); + + uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view; + return; }

1 0

Henri Verbeet : wined3d: Create Vulkan image views for unordered access views.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: wine Branch: master Commit: f45dd543327ba51860f44a7085c287e8f662126d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f45dd543327ba51860f44a70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 18:36:39 2020 +0430 wined3d: Create Vulkan image views for unordered access views. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 14 +++++---- dlls/wined3d/view.c | 64 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 73 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4f00a5a575..5a5b51da50 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1388,11 +1388,13 @@ static HRESULT adapter_vk_create_unordered_access_view(const struct wined3d_view static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_access_view *view) { - struct wined3d_unordered_access_view_vk *view_vk = wined3d_unordered_access_view_vk(view); - struct wined3d_device *device = view_vk->v.resource->device; + struct wined3d_unordered_access_view_vk *uav_vk = wined3d_unordered_access_view_vk(view); + struct wined3d_device *device = uav_vk->v.resource->device; unsigned int swapchain_count = device->swapchain_count; + struct wined3d_view_vk *view_vk = &uav_vk->view_vk; + VkImageView *vk_image_view = NULL; - TRACE("view_vk %p.\n", view_vk); + TRACE("uav_vk %p.\n", uav_vk); /* Take a reference to the device, in case releasing the view's resource * would cause the device to be destroyed. However, swapchain resources @@ -1400,8 +1402,10 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac * the refcount on a device that's in the process of being destroyed. */ if (swapchain_count) wined3d_device_incref(device); - wined3d_unordered_access_view_cleanup(&view_vk->v); - wined3d_cs_destroy_object(device->cs, heap_free, view_vk); + if (uav_vk->v.resource->type != WINED3D_RTYPE_BUFFER) + vk_image_view = &view_vk->u.vk_image_info.imageView; + wined3d_unordered_access_view_cleanup(&uav_vk->v); + wined3d_view_vk_destroy(device, NULL, vk_image_view, &view_vk->command_buffer_id, uav_vk); if (swapchain_count) wined3d_device_decref(device); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 572fdbd620..1e9a2052ec 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1453,14 +1453,76 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi return hr; } +static void wined3d_unordered_access_view_vk_cs_init(void *object) +{ + struct wined3d_unordered_access_view_vk *uav_vk = object; + struct wined3d_view_vk *view_vk = &uav_vk->view_vk; + struct wined3d_view_desc *desc = &uav_vk->v.desc; + const struct wined3d_format_vk *format_vk; + struct wined3d_texture_vk *texture_vk; + struct wined3d_context_vk *context_vk; + struct wined3d_device_vk *device_vk; + struct wined3d_resource *resource; + uint32_t default_flags = 0; + VkImageView vk_image_view; + + resource = uav_vk->v.resource; + device_vk = wined3d_device_vk(resource->device); + format_vk = wined3d_format_vk(uav_vk->v.format); + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Buffer views not implemented.\n"); + return; + } + + texture_vk = wined3d_texture_vk(texture_from_resource(resource)); + + if (texture_vk->t.layer_count > 1) + default_flags |= WINED3D_VIEW_TEXTURE_ARRAY; + + if (resource->format->id == format_vk->f.id && desc->flags == default_flags + && !desc->u.texture.level_idx && desc->u.texture.level_count == texture_vk->t.level_count + && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture_vk->t.layer_count + && !(resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) && resource->type != WINED3D_RTYPE_TEXTURE_3D) + { + TRACE("Creating identity unordered access view.\n"); + return; + } + + if (texture_vk->t.swapchain && texture_vk->t.swapchain->state.desc.backbuffer_count > 1) + FIXME("Swapchain unordered access views not supported.\n"); + + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); + vk_image_view = wined3d_view_vk_create_texture_view(context_vk, desc, + texture_vk, format_vk, format_vk->f.color_fixup, false); + context_release(&context_vk->c); + + if (!vk_image_view) + return; + + TRACE("Created image view 0x%s.\n", wine_dbgstr_longlong(vk_image_view)); + + view_vk->u.vk_image_info.imageView = vk_image_view; + view_vk->u.vk_image_info.sampler = VK_NULL_HANDLE; + view_vk->u.vk_image_info.imageLayout = texture_vk->layout; +} + HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { + HRESULT hr; + TRACE("view_vk %p, desc %s, resource %p, parent %p, parent_ops %p.\n", view_vk, wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops); - return wined3d_unordered_access_view_init(&view_vk->v, desc, resource, parent, parent_ops); + if (FAILED(hr = wined3d_unordered_access_view_init(&view_vk->v, desc, resource, parent, parent_ops))) + return hr; + + wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_vk_cs_init, view_vk); + + return hr; } HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_view_desc *desc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f46690a351..a65a33ad25 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4670,6 +4670,7 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi struct wined3d_unordered_access_view_vk { struct wined3d_unordered_access_view v; + struct wined3d_view_vk view_vk; }; static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_view_vk(

1 0

Henri Verbeet : wined3d: Create Vulkan buffer views for shader resource views.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: wine Branch: master Commit: 573f37abf098edaef17c6e1ab8c141323e0205be URL: https://source.winehq.org/git/wine.git/?a=commit;h=573f37abf098edaef17c6e1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 18:36:38 2020 +0430 wined3d: Create Vulkan buffer views for shader resource views. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 43 ++++++++++++++++++++++++++-------- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context_vk.c | 30 ++++++++++++++++++++++++ dlls/wined3d/view.c | 52 ++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 16 ++++++++++--- 5 files changed, 125 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=573f37abf098edaef17c…

1 0

Henri Verbeet : wined3d: Create Vulkan image views for shader resource views.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: wine Branch: master Commit: fcbdddfb55a38753bd68b4e489450e86ddb55b2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcbdddfb55a38753bd68b4e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 18:36:37 2020 +0430 wined3d: Create Vulkan image views for shader resource views. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 11 ++- dlls/wined3d/texture.c | 18 ++++ dlls/wined3d/utils.c | 1 + dlls/wined3d/view.c | 204 ++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 8 ++ 5 files changed, 194 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fcbdddfb55a38753bd68…

1 0

Zebediah Figura : d3dcompiler: Set the x-dimension for struct types.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: wine Branch: master Commit: d9db4beb3b35dde51a6ec8ee9f682bc4b06ebd85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9db4beb3b35dde51a6ec8ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 29 21:54:43 2020 -0500 d3dcompiler: Set the x-dimension for struct types. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 11 ++++++++++- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 6 +++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index a628d8b20a..b63166d895 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -808,6 +808,13 @@ static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, s return list; } +static DWORD get_array_size(const struct hlsl_type *type) +{ + if (type->type == HLSL_CLASS_ARRAY) + return get_array_size(type->e.array.type) * type->e.array.elements_count; + return 1; +} + static struct hlsl_type *new_struct_type(const char *name, struct list *fields) { struct hlsl_type *type = d3dcompiler_alloc(sizeof(*type)); @@ -822,13 +829,15 @@ static struct hlsl_type *new_struct_type(const char *name, struct list *fields) type->type = HLSL_CLASS_STRUCT; type->base_type = HLSL_TYPE_VOID; type->name = name; - type->dimx = type->dimy = 1; + type->dimx = 0; + type->dimy = 1; type->e.elements = fields; LIST_FOR_EACH_ENTRY(field, fields, struct hlsl_struct_field, entry) { field->reg_offset = reg_size; reg_size += field->type->reg_size; + type->dimx += field->type->dimx * field->type->dimy * get_array_size(field->type); } type->reg_size = reg_size; diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 093e6b3010..c8cf86d05c 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -889,7 +889,7 @@ static void test_constant_table(void) "uniform struct\n" "{\n" " float2x2 a;\n" - " float b;\n" + " float b[2];\n" " float c;\n" "#pragma pack_matrix(row_major)\n" " float2x2 d;\n" @@ -919,7 +919,7 @@ static void test_constant_table(void) {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, {"d", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, {"e", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4}, - {"f", D3DXRS_FLOAT4, 0, 6, D3DXPC_STRUCT, D3DXPT_VOID, 1, 10, 1, 4, 40}, + {"f", D3DXRS_FLOAT4, 0, 7, D3DXPC_STRUCT, D3DXPT_VOID, 1, 11, 1, 4, 44}, {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 2, 5, 0, 40}, {"i", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 3, 1, 0, 36}, {"j", D3DXRS_FLOAT4, 0, 3, D3DXPC_STRUCT, D3DXPT_VOID, 1, 9, 1, 1, 36}, @@ -928,7 +928,7 @@ static void test_constant_table(void) static const D3DXCONSTANT_DESC expect_fields_f[] = { {"a", D3DXRS_FLOAT4, 0, 2, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 2, 2, 1, 0, 16}, - {"b", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + {"b", D3DXRS_FLOAT4, 0, 2, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 2, 0, 8}, {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, {"d", D3DXRS_FLOAT4, 0, 2, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 2, 2, 1, 0, 16}, };

1 0

Zebediah Figura : d3dcompiler: Set the dimensions for array types.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: wine Branch: master Commit: c6c060139627b9813c4f357cc278b89b729508ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6c060139627b9813c4f357c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 29 21:54:42 2020 -0500 d3dcompiler: Set the dimensions for array types. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 6 +++--- dlls/d3dcompiler_43/utils.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 9ebc42147e..093e6b3010 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -894,12 +894,12 @@ static void test_constant_table(void) "#pragma pack_matrix(row_major)\n" " float2x2 d;\n" "} f;\n" - "uniform float g[5];\n" + "uniform float2 g[5];\n" "uniform matrix_t i;\n" "uniform struct matrix_record j;\n" "float4 main(uniform float4 h) : COLOR\n" "{\n" - " return a + b + c._31 + d._31 + f.d._22 + g[e] + h + i._33 + j.a._33;\n" + " return a + b + c._31 + d._31 + f.d._22 + g[e].x + h + i._33 + j.a._33;\n" "}"; D3DXCONSTANTTABLE_DESC table_desc; @@ -920,7 +920,7 @@ static void test_constant_table(void) {"d", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, {"e", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4}, {"f", D3DXRS_FLOAT4, 0, 6, D3DXPC_STRUCT, D3DXPT_VOID, 1, 10, 1, 4, 40}, - {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 5, 0, 20}, + {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 2, 5, 0, 40}, {"i", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 3, 1, 0, 36}, {"j", D3DXRS_FLOAT4, 0, 3, D3DXPC_STRUCT, D3DXPT_VOID, 1, 9, 1, 1, 36}, }; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index d24341329d..f89db44858 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -841,6 +841,8 @@ struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int arra type->e.array.elements_count = array_size; type->e.array.type = basic_type; type->reg_size = basic_type->reg_size * array_size; + type->dimx = basic_type->dimx; + type->dimy = basic_type->dimy; return type; }

1 0

Zebediah Figura : d3dcompiler: Respect arrays in struct fields.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: wine Branch: master Commit: aa333c63fca62e1958e341829d88897487c571f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa333c63fca62e1958e34182… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 29 21:54:41 2020 -0500 d3dcompiler: Respect arrays in struct fields. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 3b812de410..a628d8b20a 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -789,7 +789,10 @@ static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, s d3dcompiler_free(v); return list; } - field->type = type; + if (v->array_size) + field->type = new_array_type(type, v->array_size); + else + field->type = type; field->name = v->name; field->modifiers = modifiers; field->semantic = v->semantic;

1 0

Zebediah Figura : d3dcompiler: Set the struct base type to HLSL_TYPE_VOID.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: wine Branch: master Commit: 867fe223461f5e9d57722e8716ad186dbbc8e833 URL: https://source.winehq.org/git/wine.git/?a=commit;h=867fe223461f5e9d57722e87… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 29 21:54:40 2020 -0500 d3dcompiler: Set the struct base type to HLSL_TYPE_VOID. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 56acd02c55..3b812de410 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -817,6 +817,7 @@ static struct hlsl_type *new_struct_type(const char *name, struct list *fields) return NULL; } type->type = HLSL_CLASS_STRUCT; + type->base_type = HLSL_TYPE_VOID; type->name = name; type->dimx = type->dimy = 1; type->e.elements = fields;

1 0

Zebediah Figura : d3dcompiler: Fix matrix dimension declaration and access.
by Alexandre Julliard 30 Apr '20

30 Apr '20

Module: wine Branch: master Commit: 4952bcfa4cf698ebdc8a67528098010e0d073a64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4952bcfa4cf698ebdc8a6752… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 29 21:54:39 2020 -0500 d3dcompiler: Fix matrix dimension declaration and access. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index ccabd6d29f..56acd02c55 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -214,7 +214,7 @@ static void declare_predefined_types(struct hlsl_scope *scope) { for (x = 1; x <= 4; ++x) { - sprintf(name, "%s%ux%u", names[bt], x, y); + sprintf(name, "%s%ux%u", names[bt], y, x); type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_MATRIX, bt, x, y); add_type_to_scope(scope, type); @@ -427,13 +427,13 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha { if (swizzle[i + 1] != 'm') return NULL; - x = swizzle[i + 2] - '0'; - y = swizzle[i + 3] - '0'; + y = swizzle[i + 2] - '0'; + x = swizzle[i + 3] - '0'; } else { - x = swizzle[i + 1] - '1'; - y = swizzle[i + 2] - '1'; + y = swizzle[i + 1] - '1'; + x = swizzle[i + 2] - '1'; } if (x >= value->data_type->dimx || y >= value->data_type->dimy)

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 April 2020