May 2024 - Wine-Commits - list.winehq.org

Alexandre Julliard : atl: Remove empty clsid registration.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 32c2f815d5b691f574b2eab2065f0ac606bc049f URL: https://gitlab.winehq.org/wine/wine/-/commit/32c2f815d5b691f574b2eab2065f0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 5 12:48:34 2024 +0200 atl: Remove empty clsid registration. --- dlls/atl/atl_lib.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/atl/atl_lib.idl b/dlls/atl/atl_lib.idl index 918416c5ee2..e3a4674f6cd 100644 --- a/dlls/atl/atl_lib.idl +++ b/dlls/atl/atl_lib.idl @@ -17,7 +17,6 @@ */ #pragma makedep regtypelib -#pragma makedep register import "atliface.idl";

1 0

Zebediah Figura : ddraw: Upload only the used range of indices in d3d_device7_DrawIndexedPrimitive().
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 4d289c0cb833384a07e85976d98d30e52b3686bd URL: https://gitlab.winehq.org/wine/wine/-/commit/4d289c0cb833384a07e85976d98d30… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 13 20:03:36 2023 -0600 ddraw: Upload only the used range of indices in d3d_device7_DrawIndexedPrimitive(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44863 --- dlls/ddraw/device.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a744d361bd7..eb1ad90ee0f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3582,9 +3582,11 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, WORD *indices, DWORD index_count, DWORD flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + unsigned int idx_size = index_count * sizeof(*indices); + unsigned short min_index = USHRT_MAX, max_index = 0; + unsigned int i; HRESULT hr; UINT stride = get_flexible_vertex_size(fvf); - UINT vtx_size = stride * vertex_count, idx_size = index_count * sizeof(*indices); UINT vb_pos, ib_pos; TRACE("iface %p, primitive_type %#x, fvf %#lx, vertices %p, vertex_count %lu, " @@ -3597,11 +3599,19 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, return D3D_OK; } + /* Prince of Persia 3D creates large vertex buffers but only actually uses + * a few vertices from them. This improves performance dramatically. */ + for (i = 0; i < index_count; ++i) + { + min_index = min(min_index, indices[i]); + max_index = max(max_index, indices[i]); + } + /* Set the D3DDevice's FVF */ wined3d_mutex_lock(); - if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, - &device->vertex_buffer, vertices, vtx_size, stride, &vb_pos))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, &device->vertex_buffer, + (char *)vertices + (min_index * stride), (max_index + 1 - min_index) * stride, stride, &vb_pos))) goto done; if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, @@ -3618,7 +3628,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, wined3d_primitive_type_from_ddraw(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d_device_sync_surfaces(device); - wined3d_device_context_draw_indexed(device->immediate_context, vb_pos / stride, + wined3d_device_context_draw_indexed(device->immediate_context, (int)(vb_pos / stride) - min_index, ib_pos / sizeof(*indices), index_count, 0, 0); done:

1 0

Zebediah Figura : ddraw: Use system memory for version 4 vertex buffers.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: 498f0f115db61b7259dde738aef6804d4c062fcd URL: https://gitlab.winehq.org/wine/wine/-/commit/498f0f115db61b7259dde738aef680… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 13 20:00:11 2023 -0600 ddraw: Use system memory for version 4 vertex buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44863 --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 4 ++-- dlls/ddraw/vertexbuffer.c | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1f0c94a9c6e..7d08ffea361 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -595,6 +595,7 @@ struct d3d_vertex_buffer DWORD size; BOOL dynamic; bool discarded; + bool sysmem; }; HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f64db3aa633..a744d361bd7 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4128,7 +4128,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE stride = get_flexible_vertex_size(vb_impl->fvf); - if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY) + if (vb_impl->sysmem) { TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawPrimitive().\n"); wined3d_mutex_lock(); @@ -4246,7 +4246,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, vb_impl->discarded = false; - if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY) + if (vb_impl->sysmem) { TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawIndexedPrimitive().\n"); wined3d_mutex_lock(); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 73cf0a37991..c02d7e6e354 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -120,7 +120,7 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer if (dynamic) desc.usage |= WINED3DUSAGE_DYNAMIC; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) + if (buffer->sysmem) desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; else desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; @@ -466,6 +466,19 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf, buffer->fvf = desc->dwFVF; buffer->size = get_flexible_vertex_size(desc->dwFVF) * desc->dwNumVertices; + /* ddraw4 vertex buffers ignore DISCARD and NOOVERWRITE, even on + * pretransformed geometry, which means that a GPU-based buffer cannot + * perform well. + * + * While at least one contemporaneous card (Geforce 4) does seem to show a + * difference in its performance characteristics based on whether + * D3DVBCAPS_SYSTEMMEMORY is set, it also doesn't *improve* performance to + * use a non-SYSTEMMEMORY buffer with ddraw4. For wined3d it should always + * be better to use sysmem. + * + * This improves performance in Prince of Persia 3D. */ + buffer->sysmem = ((buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) || buffer->version < 7); + wined3d_mutex_lock(); if (FAILED(hr = d3d_vertex_buffer_create_wined3d_buffer(buffer, FALSE, &buffer->wined3d_buffer)))

1 0

Zebediah Figura : wined3d: Submit command buffers after 512 draw or dispatch commands.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: cb723c6dd3baf13583b0bde2fc71191b86100229 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb723c6dd3baf13583b0bde2fc7119… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 24 18:30:08 2024 -0500 wined3d: Submit command buffers after 512 draw or dispatch commands. This improves performance for the game "Grounded", on a AMD Radeon RX 6700 XT, with radv from Mesa 22.3.6. Testing was done with the "cb_access_map_w" option enabled, which also improves performance with the game by itself. Grounded generally makes about 4000 draw calls per frame, which seems not atypical. This change makes it submit at most an extra 8 times per frame, but in practice due to WINED3D_PERIODIC_SUBMIT_MAX_BUFFERS it submits less (usually only 2-3). The most demanding game I've seen made about 20,000 draw calls per frame, at which point the overhead of adapter_vk_draw_primitive() itself becomes a serious bottleneck. For such a game we would submit 40 more times per frame with these settings, although WINED3D_PERIODIC_SUBMIT_MAX_BUFFERS means we would likely submit less than that. In any case if submission itself becomes a bottleneck, we should offload it to a separate thread. Credit goes to Philip Rebohle and his work on DXVK for helping me to notice that periodic submission might make a difference. --- dlls/wined3d/adapter_vk.c | 4 ++++ dlls/wined3d/context_vk.c | 35 ++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_vk.h | 3 +++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 418b67de8b6..39b263872ed 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1807,6 +1807,8 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, context_vk->c.transform_feedback_active = 0; } + ++context_vk->command_buffer_work_count; + context_release(&context_vk->c); } @@ -1851,6 +1853,8 @@ static void adapter_vk_dispatch_compute(struct wined3d_device *device, VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, 0, 0, NULL, 0, NULL, 0, NULL)); + ++context_vk->command_buffer_work_count; + context_release(&context_vk->c); } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 377c437ee09..200dcb57b7f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1771,6 +1771,37 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) wined3d_context_cleanup(&context_vk->c); } +/* In general we only submit when necessary or when a frame ends. However, + * applications which do a lot of work per frame can end up with the GPU idle + * for long periods of time while the CPU is building commands, and drivers may + * choose to reclock the GPU to a lower power level if they detect it being idle + * for that long. + * + * This may also help performance simply by virtue of allowing more parallelism + * between the GPU and CPU, although no clear evidence of that has been seen + * yet. */ + +#define WINED3D_PERIODIC_SUBMIT_WORK_COUNT 512 +#define WINED3D_PERIODIC_SUBMIT_MAX_BUFFERS 3 + +static bool should_periodic_submit(struct wined3d_context_vk *context_vk) +{ + uint64_t busy_count; + + if (context_vk->command_buffer_work_count < WINED3D_PERIODIC_SUBMIT_WORK_COUNT) + return false; + + /* The point of periodic submit is to keep the GPU busy, so if it's already + * busy with 4 or more command buffers, don't submit another one now. */ + busy_count = context_vk->current_command_buffer.id - context_vk->completed_command_buffer_id - 1; + if (busy_count > WINED3D_PERIODIC_SUBMIT_MAX_BUFFERS) + return false; + + TRACE("Periodically submitting command buffer, %u draw/dispatch commands since last buffer, %I64u currently busy.\n", + context_vk->command_buffer_work_count, busy_count); + return true; +} + VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -1785,7 +1816,7 @@ VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk buffer = &context_vk->current_command_buffer; if (buffer->vk_command_buffer) { - if (context_vk->retired_bo_size > WINED3D_RETIRED_BO_SIZE_THRESHOLD) + if (context_vk->retired_bo_size > WINED3D_RETIRED_BO_SIZE_THRESHOLD || should_periodic_submit(context_vk)) wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); else { @@ -1854,6 +1885,8 @@ VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk wined3d_query_vk_resume(query_vk, context_vk); } + context_vk->command_buffer_work_count = 0; + TRACE("Created new command buffer %p with id 0x%s.\n", buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 94a6b6c0c5e..ad8eb2453f5 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -614,6 +614,9 @@ struct wined3d_context_vk struct wined3d_command_buffer_vk current_command_buffer; uint64_t completed_command_buffer_id; VkDeviceSize retired_bo_size; + /* Number of draw or dispatch calls that have been recorded into the + * current command buffer. */ + unsigned int command_buffer_work_count; struct {

1 0

Zebediah Figura : wined3d: Retrieve the VkCommandBuffer from wined3d_context_vk after executing RTV barriers.
by Alexandre Julliard May 7, 2024

May 7, 2024

Module: wine Branch: master Commit: e7db99d85f8214eafc299e75f644ce222ea655fc URL: https://gitlab.winehq.org/wine/wine/-/commit/e7db99d85f8214eafc299e75f644ce… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 3 17:05:17 2024 -0500 wined3d: Retrieve the VkCommandBuffer from wined3d_context_vk after executing RTV barriers. Part of beginning a render pass involves executing an RTV barrier, which itself needs to call wined3d_context_vk_get_command_buffer(). However, that function may decide to submit the command buffer, in order to prevent resource buildup, or [in the future] because it has been some length of time since the last submission. Therefore we cannot retrieve and store a VkCommandBuffer pointer before executing an RTV barrier and then use it later. --- dlls/wined3d/context_vk.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index dc793a839bb..377c437ee09 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2699,7 +2699,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte } static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *context_vk, - VkCommandBuffer vk_command_buffer, const struct wined3d_state *state, const struct wined3d_vk_info *vk_info) + const struct wined3d_state *state, const struct wined3d_vk_info *vk_info) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); VkClearValue clear_values[WINED3D_MAX_RENDER_TARGETS + 1]; @@ -2709,6 +2709,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont struct wined3d_rendertarget_view *view; const VkPhysicalDeviceLimits *limits; struct wined3d_query_vk *query_vk; + VkCommandBuffer vk_command_buffer; VkRenderPassBeginInfo begin_info; unsigned int attachment_count, i; struct wined3d_texture *texture; @@ -2814,6 +2815,12 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont ++attachment_count; } + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return false; + } + if (!(context_vk->vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, &state->fb, ARRAY_SIZE(state->fb.render_targets), !!state->fb.depth_stencil, 0))) { @@ -3772,19 +3779,15 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c wined3d_context_vk_load_buffers(context_vk, state, indirect_vk, indexed); - if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) - { - ERR("Failed to get command buffer.\n"); - return VK_NULL_HANDLE; - } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER)) wined3d_context_vk_end_current_render_pass(context_vk); - if (!wined3d_context_vk_begin_render_pass(context_vk, vk_command_buffer, state, vk_info)) + + if (!wined3d_context_vk_begin_render_pass(context_vk, state, vk_info)) { ERR("Failed to begin render pass.\n"); return VK_NULL_HANDLE; } + vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; while (invalidate_rt) {

1 0

Zebediah Figura : vkd3d-utils: Implement ID3D12ShaderReflection::GetResourceBindingDesc().
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: cefd6f9de6e278c45f6579c5ec342a7977767a7c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cefd6f9de6e278c45f6579c5ec342… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 23:43:38 2024 -0500 vkd3d-utils: Implement ID3D12ShaderReflection::GetResourceBindingDesc(). --- libs/vkd3d-utils/reflection.c | 84 +++++++++++++++++++++++++++++++++++++++++-- tests/hlsl_d3d12.c | 7 ++-- 2 files changed, 85 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-utils/reflection.c b/libs/vkd3d-utils/reflection.c index 0c9017a4..e8363ae4 100644 --- a/libs/vkd3d-utils/reflection.c +++ b/libs/vkd3d-utils/reflection.c @@ -61,6 +61,8 @@ struct d3d12_reflection D3D12_SHADER_DESC desc; struct d3d12_buffer *buffers; + + D3D12_SHADER_INPUT_BIND_DESC *bindings; }; static struct d3d12_buffer null_buffer; @@ -397,6 +399,10 @@ static ULONG STDMETHODCALLTYPE d3d12_reflection_Release(ID3D12ShaderReflection * } vkd3d_free(reflection->buffers); + for (UINT i = 0; i < reflection->desc.BoundResources; ++i) + vkd3d_free((void *)reflection->bindings[i].Name); + vkd3d_free(reflection->bindings); + vkd3d_shader_free_scan_signature_info(&reflection->signature_info); free(reflection); } @@ -444,9 +450,18 @@ static struct ID3D12ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d12_ref static HRESULT STDMETHODCALLTYPE d3d12_reflection_GetResourceBindingDesc( ID3D12ShaderReflection *iface, UINT index, D3D12_SHADER_INPUT_BIND_DESC *desc) { - FIXME("iface %p, index %u, desc %p stub!\n", iface, index, desc); + struct d3d12_reflection *reflection = impl_from_ID3D12ShaderReflection(iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); + + if (index >= reflection->desc.BoundResources) + { + WARN("Invalid index %u.\n", index); + return E_INVALIDARG; + } + + *desc = reflection->bindings[index]; + return S_OK; } static HRESULT get_signature_parameter(const struct vkd3d_shader_signature *signature, @@ -730,6 +745,20 @@ struct rdef_field uint32_t offset; }; +struct rdef_binding +{ + uint32_t name_offset; + uint32_t type; + uint32_t resource_format; + uint32_t dimension; + uint32_t multisample_count; + uint32_t index; + uint32_t count; + uint32_t flags; + uint32_t space; + uint32_t id; +}; + static HRESULT d3d12_type_init(struct d3d12_type *type, uint32_t type_offset, uint32_t type_size, const struct vkd3d_shader_code *section, uint32_t field_offset) { @@ -856,6 +885,7 @@ static HRESULT d3d12_buffer_init(struct d3d12_buffer *buffer, const struct rdef_ static HRESULT parse_rdef(struct d3d12_reflection *reflection, const struct vkd3d_shader_code *section) { uint32_t variable_size = offsetof(struct rdef_variable, resource_binding); + uint32_t binding_size = offsetof(struct rdef_binding, space); uint32_t type_size = offsetof(struct rdef_type, unknown); const struct rdef_header *header; const struct rdef_rd11 *rd11; @@ -897,6 +927,14 @@ static HRESULT parse_rdef(struct d3d12_reflection *reflection, const struct vkd3 } variable_size = rd11->variable_size; + if (rd11->binding_size != sizeof(struct rdef_binding) + && rd11->binding_size != offsetof(struct rdef_binding, space)) + { + FIXME("Unexpected binding size %#x.\n", rd11->binding_size); + return E_INVALIDARG; + } + binding_size = rd11->binding_size; + if (rd11->type_size != sizeof(struct rdef_type)) { FIXME("Unexpected type size %#x.\n", rd11->type_size); @@ -931,6 +969,48 @@ static HRESULT parse_rdef(struct d3d12_reflection *reflection, const struct vkd3 } } + reflection->desc.BoundResources = header->binding_count; + + if (header->binding_count) + { + if (!(reflection->bindings = vkd3d_calloc(header->binding_count, sizeof(*reflection->bindings)))) + return E_OUTOFMEMORY; + + for (uint32_t i = 0; i < header->binding_count; ++i) + { + const struct rdef_binding *rdef_binding; + D3D12_SHADER_INPUT_BIND_DESC *binding; + char *name; + + if (!(rdef_binding = get_data_ptr(section, header->bindings_offset + (i * binding_size), 1, binding_size))) + return E_INVALIDARG; + + if (FAILED(hr = get_string(section, rdef_binding->name_offset, &name))) + return hr; + + binding = &reflection->bindings[i]; + + binding->Name = name; + binding->Type = rdef_binding->type; + binding->BindPoint = rdef_binding->index; + binding->BindCount = rdef_binding->count; + binding->uFlags = rdef_binding->flags; + binding->ReturnType = rdef_binding->resource_format; + binding->Dimension = rdef_binding->dimension; + binding->NumSamples = rdef_binding->multisample_count; + if (binding_size == sizeof(*rdef_binding)) + { + binding->Space = rdef_binding->space; + binding->uID = rdef_binding->id; + } + else + { + binding->Space = 0; + binding->uID = rdef_binding->index; + } + } + } + return S_OK; } diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index ffab9fdd..8d5d8d90 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1573,7 +1573,7 @@ static void test_reflection(void) hr = ID3D12ShaderReflection_GetDesc(reflection, &shader_desc); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(shader_desc.ConstantBuffers == tests[t].buffer_count, "Got %u buffers.\n", shader_desc.ConstantBuffers); - todo ok(shader_desc.BoundResources == tests[t].binding_count, "Got %u resources.\n", shader_desc.BoundResources); + ok(shader_desc.BoundResources == tests[t].binding_count, "Got %u resources.\n", shader_desc.BoundResources); for (unsigned int i = 0; i < shader_desc.ConstantBuffers; ++i) { @@ -1669,8 +1669,7 @@ static void test_reflection(void) ok(binding_desc.Type == expect->Type, "Got type %#x.\n", binding_desc.Type); ok(binding_desc.BindPoint == expect->BindPoint, "Got bind point %u.\n", binding_desc.BindPoint); ok(binding_desc.BindCount == expect->BindCount, "Got bind count %u.\n", binding_desc.BindCount); - todo_if ((expect->uFlags & D3D_SIF_USERPACKED) && expect->Type != D3D_SIT_CBUFFER) - ok(binding_desc.uFlags == expect->uFlags, "Got flags %#x.\n", binding_desc.uFlags); + ok(binding_desc.uFlags == expect->uFlags, "Got flags %#x.\n", binding_desc.uFlags); ok(binding_desc.ReturnType == expect->ReturnType, "Got return type %#x.\n", binding_desc.ReturnType); ok(binding_desc.Dimension == expect->Dimension, "Got dimension %#x.\n", binding_desc.Dimension); ok(binding_desc.NumSamples == expect->NumSamples, "Got multisample count %u.\n", binding_desc.NumSamples); @@ -1679,7 +1678,7 @@ static void test_reflection(void) } hr = ID3D12ShaderReflection_GetResourceBindingDesc(reflection, shader_desc.BoundResources, &binding_desc); - todo ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ID3D10Blob_Release(code); refcount = ID3D12ShaderReflection_Release(reflection);

1 0

Zebediah Figura : tests: Test bounds checking in ID3D12ShaderReflection.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 694d39ffe655e1507f1b7a42a388b9d180806c1c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/694d39ffe655e1507f1b7a42a388b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 22:13:51 2024 -0500 tests: Test bounds checking in ID3D12ShaderReflection. --- tests/hlsl_d3d12.c | 62 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 4ab08816..ffab9fdd 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1555,7 +1555,14 @@ static void test_reflection(void) for (unsigned int t = 0; t < ARRAY_SIZE(tests); ++t) { ID3D10Blob *code = compile_shader_flags(tests[t].source, - tests[t].profile, D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + tests[t].profile, strstr(tests[t].profile, "5_1") ? 0 : D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + ID3D12ShaderReflectionConstantBuffer *cbuffer; + D3D12_SHADER_TYPE_DESC type_desc, field_desc; + D3D12_SHADER_INPUT_BIND_DESC binding_desc; + ID3D12ShaderReflectionType *type, *field; + D3D12_SHADER_BUFFER_DESC buffer_desc; + ID3D12ShaderReflectionVariable *var; + D3D12_SHADER_VARIABLE_DESC var_desc; ID3D12ShaderReflection *reflection; D3D12_SHADER_DESC shader_desc; @@ -1571,8 +1578,6 @@ static void test_reflection(void) for (unsigned int i = 0; i < shader_desc.ConstantBuffers; ++i) { const struct shader_buffer *expect_buffer = &tests[t].buffers[i]; - ID3D12ShaderReflectionConstantBuffer *cbuffer; - D3D12_SHADER_BUFFER_DESC buffer_desc; vkd3d_test_push_context("Buffer %u", i); @@ -1588,10 +1593,6 @@ static void test_reflection(void) for (unsigned int j = 0; j < buffer_desc.Variables; ++j) { const struct shader_variable *expect = &expect_buffer->vars[j]; - D3D12_SHADER_TYPE_DESC type_desc, field_desc; - ID3D12ShaderReflectionType *type, *field; - ID3D12ShaderReflectionVariable *var; - D3D12_SHADER_VARIABLE_DESC var_desc; vkd3d_test_push_context("Variable %u", j); @@ -1630,35 +1631,56 @@ static void test_reflection(void) vkd3d_test_pop_context(); } + field = ID3D12ShaderReflectionType_GetMemberTypeByIndex(type, type_desc.Members); + hr = ID3D12ShaderReflectionType_GetDesc(field, &field_desc); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + vkd3d_test_pop_context(); } + var = ID3D12ShaderReflectionConstantBuffer_GetVariableByIndex(cbuffer, buffer_desc.Variables); + hr = ID3D12ShaderReflectionVariable_GetDesc(var, &var_desc); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + type = ID3D12ShaderReflectionVariable_GetType(var); + hr = ID3D12ShaderReflectionType_GetDesc(type, &type_desc); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + field = ID3D12ShaderReflectionType_GetMemberTypeByIndex(type, 0); + hr = ID3D12ShaderReflectionType_GetDesc(field, &type_desc); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + vkd3d_test_pop_context(); } + cbuffer = ID3D12ShaderReflection_GetConstantBufferByIndex(reflection, shader_desc.ConstantBuffers); + hr = ID3D12ShaderReflectionConstantBuffer_GetDesc(cbuffer, &buffer_desc); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + for (unsigned int i = 0; i < shader_desc.BoundResources; ++i) { const D3D12_SHADER_INPUT_BIND_DESC *expect = &tests[t].bindings[i]; - D3D12_SHADER_INPUT_BIND_DESC desc; vkd3d_test_push_context("Binding %u", i); - hr = ID3D12ShaderReflection_GetResourceBindingDesc(reflection, i, &desc); + hr = ID3D12ShaderReflection_GetResourceBindingDesc(reflection, i, &binding_desc); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(!strcmp(desc.Name, expect->Name), "Got name \"%s\".\n", desc.Name); - ok(desc.Type == expect->Type, "Got type %#x.\n", desc.Type); - ok(desc.BindPoint == expect->BindPoint, "Got bind point %u.\n", desc.BindPoint); - ok(desc.BindCount == expect->BindCount, "Got bind count %u.\n", desc.BindCount); + ok(!strcmp(binding_desc.Name, expect->Name), "Got name \"%s\".\n", binding_desc.Name); + ok(binding_desc.Type == expect->Type, "Got type %#x.\n", binding_desc.Type); + ok(binding_desc.BindPoint == expect->BindPoint, "Got bind point %u.\n", binding_desc.BindPoint); + ok(binding_desc.BindCount == expect->BindCount, "Got bind count %u.\n", binding_desc.BindCount); todo_if ((expect->uFlags & D3D_SIF_USERPACKED) && expect->Type != D3D_SIT_CBUFFER) - ok(desc.uFlags == expect->uFlags, "Got flags %#x.\n", desc.uFlags); - ok(desc.ReturnType == expect->ReturnType, "Got return type %#x.\n", desc.ReturnType); - ok(desc.Dimension == expect->Dimension, "Got dimension %#x.\n", desc.Dimension); - ok(desc.NumSamples == expect->NumSamples, "Got multisample count %u.\n", desc.NumSamples); + ok(binding_desc.uFlags == expect->uFlags, "Got flags %#x.\n", binding_desc.uFlags); + ok(binding_desc.ReturnType == expect->ReturnType, "Got return type %#x.\n", binding_desc.ReturnType); + ok(binding_desc.Dimension == expect->Dimension, "Got dimension %#x.\n", binding_desc.Dimension); + ok(binding_desc.NumSamples == expect->NumSamples, "Got multisample count %u.\n", binding_desc.NumSamples); vkd3d_test_pop_context(); } + hr = ID3D12ShaderReflection_GetResourceBindingDesc(reflection, shader_desc.BoundResources, &binding_desc); + todo ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ID3D10Blob_Release(code); refcount = ID3D12ShaderReflection_Release(reflection); ok(!refcount, "Got unexpected refcount %u.\n", refcount); @@ -1845,6 +1867,9 @@ static void test_signature_reflection(void) vkd3d_test_pop_context(); } + hr = reflection->lpVtbl->GetInputParameterDesc(reflection, shader_desc.InputParameters, &desc); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + for (unsigned int j = 0; j < shader_desc.OutputParameters; ++j) { vkd3d_test_push_context("Output %u", j); @@ -1854,6 +1879,9 @@ static void test_signature_reflection(void) vkd3d_test_pop_context(); } + hr = reflection->lpVtbl->GetOutputParameterDesc(reflection, shader_desc.OutputParameters, &desc); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Zebediah Figura : vkd3d-utils: Initialize the null type vtbl.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 35d388eedd87ca3a8d53b8faded59e5ed28f86d2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/35d388eedd87ca3a8d53b8faded59… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 22:11:54 2024 -0500 vkd3d-utils: Initialize the null type vtbl. --- libs/vkd3d-utils/reflection.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-utils/reflection.c b/libs/vkd3d-utils/reflection.c index 4f3a1a24..0c9017a4 100644 --- a/libs/vkd3d-utils/reflection.c +++ b/libs/vkd3d-utils/reflection.c @@ -197,6 +197,8 @@ static const struct ID3D12ShaderReflectionTypeVtbl d3d12_type_vtbl = d3d12_type_ImplementsInterface, }; +static struct d3d12_type null_type = {{&d3d12_type_vtbl}}; + static struct d3d12_variable *impl_from_ID3D12ShaderReflectionVariable(ID3D12ShaderReflectionVariable *iface) { return CONTAINING_RECORD(iface, struct d3d12_variable, ID3D12ShaderReflectionVariable_iface);

1 0

Zebediah Figura : vkd3d-shader/tpf: Write the field offset in bytes.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 7b3c47ba2ec28531b1342331396c0ac28fe3e4c2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b3c47ba2ec28531b1342331396c0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 22:07:13 2024 -0500 vkd3d-shader/tpf: Write the field offset in bytes. --- libs/vkd3d-shader/tpf.c | 2 +- tests/hlsl_d3d12.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c98667de..4e3bef96 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3090,7 +3090,7 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b put_u32(buffer, field->name_bytecode_offset); put_u32(buffer, field->type->bytecode_offset); - put_u32(buffer, field->reg_offset[HLSL_REGSET_NUMERIC]); + put_u32(buffer, field->reg_offset[HLSL_REGSET_NUMERIC] * sizeof(float)); } type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(D3D_SVC_STRUCT, D3D_SVT_VOID)); put_u32(buffer, vkd3d_make_u32(1, hlsl_type_component_count(array_type))); diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 4d03efd5..4ab08816 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1333,7 +1333,7 @@ static void check_type_desc_(int line, const D3D12_SHADER_TYPE_DESC *type, const ok_(line)(type->Columns == expect->Columns, "Got %u columns.\n", type->Columns); ok_(line)(type->Elements == expect->Elements, "Got %u elements.\n", type->Elements); ok_(line)(type->Members == expect->Members, "Got %u members.\n", type->Members); - ok_(line)(type->Offset == expect->Offset, "Got %u members.\n", type->Members); + ok_(line)(type->Offset == expect->Offset, "Got offset %u.\n", type->Offset); ok_(line)(!strcmp(type->Name, expect->Name), "Got name \"%s\".\n", type->Name); } #define check_type_desc(a, b) check_type_desc_(__LINE__, a, b) @@ -1407,7 +1407,7 @@ static void test_reflection(void) static const D3D12_SHADER_TYPE_DESC r_field_types[] = { {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}, + {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 16, "float4"}, }; static const struct shader_variable globals_vars = @@ -1519,7 +1519,7 @@ static void test_reflection(void) static const D3D12_SHADER_TYPE_DESC ps_h_field_types[] = { {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 4, "float"}, }; static const D3D12_SHADER_TYPE_DESC ps_i_field_types[] = @@ -1588,10 +1588,10 @@ static void test_reflection(void) for (unsigned int j = 0; j < buffer_desc.Variables; ++j) { const struct shader_variable *expect = &expect_buffer->vars[j]; + D3D12_SHADER_TYPE_DESC type_desc, field_desc; ID3D12ShaderReflectionType *type, *field; ID3D12ShaderReflectionVariable *var; D3D12_SHADER_VARIABLE_DESC var_desc; - D3D12_SHADER_TYPE_DESC type_desc; vkd3d_test_push_context("Variable %u", j); @@ -1623,9 +1623,9 @@ static void test_reflection(void) vkd3d_test_push_context("Field %u", k); field = ID3D12ShaderReflectionType_GetMemberTypeByIndex(type, k); - hr = ID3D12ShaderReflectionType_GetDesc(field, &type_desc); + hr = ID3D12ShaderReflectionType_GetDesc(field, &field_desc); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_type_desc(&type_desc, &expect->field_types[k]); + check_type_desc(&field_desc, &expect->field_types[k]); vkd3d_test_pop_context(); }

1 0

Zebediah Figura : vkd3d-utils: Fix bounds comparison against element counts.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 68562d375e0fba682bf6bfa32397c43d210ef602 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/68562d375e0fba682bf6bfa32397c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 20:56:40 2024 -0500 vkd3d-utils: Fix bounds comparison against element counts. --- libs/vkd3d-utils/reflection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-utils/reflection.c b/libs/vkd3d-utils/reflection.c index f4cc78bc..4f3a1a24 100644 --- a/libs/vkd3d-utils/reflection.c +++ b/libs/vkd3d-utils/reflection.c @@ -102,7 +102,7 @@ static ID3D12ShaderReflectionType * STDMETHODCALLTYPE d3d12_type_GetMemberTypeBy TRACE("iface %p, index %u.\n", iface, index); - if (index > type->desc.Members) + if (index >= type->desc.Members) { WARN("Invalid index %u.\n", index); return &null_type.ID3D12ShaderReflectionType_iface; @@ -301,7 +301,7 @@ static ID3D12ShaderReflectionVariable * STDMETHODCALLTYPE d3d12_buffer_GetVariab TRACE("iface %p, index %u.\n", iface, index); - if (index > buffer->desc.Variables) + if (index >= buffer->desc.Variables) { WARN("Invalid index %u.\n", index); return &null_variable.ID3D12ShaderReflectionVariable_iface; @@ -422,7 +422,7 @@ static struct ID3D12ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d12_ref TRACE("iface %p, index %u.\n", iface, index); - if (index > reflection->desc.ConstantBuffers) + if (index >= reflection->desc.ConstantBuffers) { WARN("Invalid index %u.\n", index); return &null_buffer.ID3D12ShaderReflectionConstantBuffer_iface;

1 0