- Wine-Commits - list.winehq.org

Nikolay Sivov : d2d1/tests: Add some more tests for effect shader loading.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: cf2e1db7b519072c96efdba697d823f2b38a9da8 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf2e1db7b519072c96efdba697d823… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 2 10:37:11 2023 +0200 d2d1/tests: Add some more tests for effect shader loading. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 70 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 6e2b3bb622a..2f4ded1d0cc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11405,11 +11405,14 @@ static void test_effect_register(BOOL d3d11) static void test_effect_context(BOOL d3d11) { - ID2D1EffectContext *effect_context; + ID2D1EffectContext *effect_context, *effect_context2; + ID2D1Effect *effect = NULL, *effect2 = NULL; + ID2D1DeviceContext *device_context; D2D1_PROPERTY_BINDING binding; struct d2d1_test_context ctx; - ID2D1Effect *effect = NULL; ID2D1Factory1 *factory; + ID2D1Device *device; + ULONG refcount; BOOL loaded; HRESULT hr; @@ -11441,9 +11444,9 @@ static void test_effect_context(BOOL d3d11) /* Test shader loading */ loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestVertexShader); - ok(!loaded, "Shader is loaded.\n"); + ok(!loaded, "Unexpected shader loaded state.\n"); loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); - ok(!loaded, "Shader is loaded.\n"); + ok(!loaded, "Unexpected shader loaded state.\n"); hr = ID2D1EffectContext_LoadVertexShader(effect_context, &GUID_TestVertexShader, (const BYTE *)test_ps, sizeof(test_ps)); @@ -11452,7 +11455,7 @@ static void test_effect_context(BOOL d3d11) &GUID_TestVertexShader, (const BYTE *)test_vs, sizeof(test_vs)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestVertexShader); - ok(loaded, "Shader is not loaded.\n"); + ok(loaded, "Unexpected shader loaded state.\n"); hr = ID2D1EffectContext_LoadVertexShader(effect_context, &GUID_TestVertexShader, (const BYTE *)test_ps, sizeof(test_ps)); @@ -11468,9 +11471,64 @@ static void test_effect_context(BOOL d3d11) &GUID_TestPixelShader, (const BYTE *)test_ps, sizeof(test_ps)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); - ok(loaded, "Shader is not loaded.\n"); + ok(loaded, "Unexpected shader loaded state.\n"); + + /* Same shader id, using different context. */ + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect2); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + effect_context2 = NULL; + hr = ID2D1Effect_GetValueByName(effect2, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context2, sizeof(effect_context2)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context2, &GUID_TestPixelShader); + todo_wine + ok(loaded, "Unexpected shader loaded state.\n"); + + ID2D1Effect_Release(effect2); + + /* Same shader id, using different device. */ + hr = ID2D1Factory1_CreateDevice(factory, ctx.device, &device); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(device_context, &CLSID_TestEffect, &effect2); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + effect_context = NULL; + hr = ID2D1Effect_GetValueByName(effect2, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); + ok(!loaded, "Unexpected shader loaded state.\n"); + + ID2D1Effect_Release(effect2); + + ID2D1DeviceContext_Release(device_context); + ID2D1Device_Release(device); + + /* Release all created effects, check shader map. */ + refcount = ID2D1Effect_Release(effect); + ok(!refcount, "Unexpected refcount %lu.\n", refcount); + + hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + effect_context = NULL; + hr = ID2D1Effect_GetValueByName(effect, L"Context", + D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); + todo_wine + ok(loaded, "Unexpected shader loaded state.\n"); ID2D1Effect_Release(effect); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); release_test_context(&ctx);

1 0

Nikolay Sivov : d2d1: Use device instance pointer in device context structure.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: 9e4ee3e4e048f5f1b1ba1c1d32d1489c9cf53fcd URL: https://gitlab.winehq.org/wine/wine/-/commit/9e4ee3e4e048f5f1b1ba1c1d32d148… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 2 11:48:12 2023 +0200 d2d1: Use device instance pointer in device context structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 5 +++-- dlls/d2d1/dc_render_target.c | 5 +++-- dlls/d2d1/device.c | 35 +++++++++++++++++++---------------- dlls/d2d1/factory.c | 3 ++- dlls/d2d1/hwnd_render_target.c | 2 +- dlls/d2d1/wic_render_target.c | 3 ++- 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index dfd4e130f58..8762a7a5503 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -171,7 +171,7 @@ struct d2d_device_context const struct d2d_device_context_ops *ops; ID2D1Factory *factory; - ID2D1Device *device; + struct d2d_device *device; ID3D11Device1 *d3d_device; ID3DDeviceContextState *d3d_state; struct @@ -209,7 +209,7 @@ struct d2d_device_context struct d2d_clip_stack clip_stack; }; -HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface, IUnknown *outer_unknown, +HRESULT d2d_d3d_create_render_target(struct d2d_device *device, IDXGISurface *surface, IUnknown *outer_unknown, const struct d2d_device_context_ops *ops, const D2D1_RENDER_TARGET_PROPERTIES *desc, void **render_target); @@ -601,6 +601,7 @@ struct d2d_device }; void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device); +struct d2d_device *unsafe_impl_from_ID2D1Device(ID2D1Device1 *iface); struct d2d_shader { diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index 99b2a1d4da9..aa0c715baa5 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -864,8 +864,9 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID return hr; } - hr = d2d_d3d_create_render_target(device, NULL, (IUnknown *)&render_target->ID2D1DCRenderTarget_iface, - &d2d_dc_render_target_ops, desc, (void **)&render_target->dxgi_inner); + hr = d2d_d3d_create_render_target(unsafe_impl_from_ID2D1Device((ID2D1Device1* )device), NULL, + (IUnknown *)&render_target->ID2D1DCRenderTarget_iface, &d2d_dc_render_target_ops, + desc, (void **)&render_target->dxgi_inner); ID2D1Device_Release(device); if (FAILED(hr)) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 25cbb609b26..954ce7f8c28 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -40,8 +40,6 @@ static inline struct d2d_device *impl_from_ID2D1Device(ID2D1Device1 *iface) return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device1_iface); } -static struct d2d_device *unsafe_impl_from_ID2D1Device(ID2D1Device1 *iface); - static ID2D1Brush *d2d_draw_get_text_brush(struct d2d_draw_text_layout_ctx *context, IUnknown *effect) { ID2D1Brush *brush = NULL; @@ -293,7 +291,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) IUnknown_Release(context->target.object); ID3D11Device1_Release(context->d3d_device); ID2D1Factory_Release(context->factory); - ID2D1Device_Release(context->device); + ID2D1Device1_Release(&context->device->ID2D1Device1_iface); free(context); } @@ -2338,7 +2336,7 @@ static void STDMETHODCALLTYPE d2d_device_context_GetDevice(ID2D1DeviceContext1 * TRACE("iface %p, device %p.\n", iface, device); - *device = context->device; + *device = (ID2D1Device *)&context->device->ID2D1Device1_iface; ID2D1Device_AddRef(*device); } @@ -3184,8 +3182,8 @@ static const struct ID2D1GdiInteropRenderTargetVtbl d2d_gdi_interop_render_targe d2d_gdi_interop_render_target_ReleaseDC, }; -static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, ID2D1Device *device, - IUnknown *outer_unknown, const struct d2d_device_context_ops *ops) +static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, + struct d2d_device *device, IUnknown *outer_unknown, const struct d2d_device_context_ops *ops) { D3D11_SUBRESOURCE_DATA buffer_data; struct d2d_device *device_impl; @@ -4248,9 +4246,9 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl; render_target->IUnknown_iface.lpVtbl = &d2d_device_context_inner_unknown_vtbl; render_target->refcount = 1; - ID2D1Device_GetFactory(device, &render_target->factory); + ID2D1Device1_GetFactory(&device->ID2D1Device1_iface, &render_target->factory); render_target->device = device; - ID2D1Device_AddRef(render_target->device); + ID2D1Device1_AddRef(&render_target->device->ID2D1Device1_iface); render_target->outer_unknown = outer_unknown ? outer_unknown : &render_target->IUnknown_iface; render_target->ops = ops; @@ -4424,12 +4422,12 @@ err: ID3DDeviceContextState_Release(render_target->d3d_state); if (render_target->d3d_device) ID3D11Device1_Release(render_target->d3d_device); - ID2D1Device_Release(render_target->device); + ID2D1Device1_Release(&render_target->device->ID2D1Device1_iface); ID2D1Factory_Release(render_target->factory); return hr; } -HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface, IUnknown *outer_unknown, +HRESULT d2d_d3d_create_render_target(struct d2d_device *device, IDXGISurface *surface, IUnknown *outer_unknown, const struct d2d_device_context_ops *ops, const D2D1_RENDER_TARGET_PROPERTIES *desc, void **render_target) { D2D1_BITMAP_PROPERTIES1 bitmap_desc; @@ -4553,8 +4551,9 @@ static void WINAPI d2d_device_GetFactory(ID2D1Device1 *iface, ID2D1Factory **fac ID2D1Factory1_AddRef(device->factory); } -static HRESULT d2d_device_create_device_context(ID2D1Device1 *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, - ID2D1DeviceContext1 **context) { +static HRESULT d2d_device_create_device_context(struct d2d_device *device, + D2D1_DEVICE_CONTEXT_OPTIONS options, ID2D1DeviceContext1 **context) +{ struct d2d_device_context *object; HRESULT hr; @@ -4564,7 +4563,7 @@ static HRESULT d2d_device_create_device_context(ID2D1Device1 *iface, D2D1_DEVICE if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_device_context_init(object, (ID2D1Device *)iface, NULL, NULL))) + if (FAILED(hr = d2d_device_context_init(object, device, NULL, NULL))) { WARN("Failed to initialise device context, hr %#lx.\n", hr); free(object); @@ -4580,9 +4579,11 @@ static HRESULT d2d_device_create_device_context(ID2D1Device1 *iface, D2D1_DEVICE static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device1 *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, ID2D1DeviceContext **context) { + struct d2d_device *device = impl_from_ID2D1Device(iface); + TRACE("iface %p, options %#x, context %p.\n", iface, options, context); - return d2d_device_create_device_context(iface, options, (ID2D1DeviceContext1 **)context); + return d2d_device_create_device_context(device, options, (ID2D1DeviceContext1 **)context); } static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device1 *iface, IWICImagingFactory *wic_factory, @@ -4629,9 +4630,11 @@ static void WINAPI d2d_device_SetRenderingPriority(ID2D1Device1 *iface, D2D1_REN static HRESULT WINAPI d2d_device_CreateDeviceContext1(ID2D1Device1 *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, ID2D1DeviceContext1 **context) { + struct d2d_device *device = impl_from_ID2D1Device(iface); + TRACE("iface %p, options %#x, context %p.\n", iface, options, context); - return d2d_device_create_device_context(iface, options, context); + return d2d_device_create_device_context(device, options, context); } static const struct ID2D1Device1Vtbl d2d_device_vtbl = @@ -4650,7 +4653,7 @@ static const struct ID2D1Device1Vtbl d2d_device_vtbl = d2d_device_CreateDeviceContext1, }; -static struct d2d_device *unsafe_impl_from_ID2D1Device(ID2D1Device1 *iface) +struct d2d_device *unsafe_impl_from_ID2D1Device(ID2D1Device1 *iface) { if (!iface) return NULL; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index bf905bcd581..fff9895e930 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -495,7 +495,8 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 return hr; } - hr = d2d_d3d_create_render_target(device, surface, NULL, NULL, desc, (void **)render_target); + hr = d2d_d3d_create_render_target(unsafe_impl_from_ID2D1Device((ID2D1Device1 *)device), surface, + NULL, NULL, desc, (void **)render_target); ID2D1Device_Release(device); return hr; } diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index f176a25e956..7f16ff00d4e 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -928,7 +928,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target return hr; } - hr = d2d_d3d_create_render_target(device, dxgi_surface, + hr = d2d_d3d_create_render_target(unsafe_impl_from_ID2D1Device((ID2D1Device1 *)device), dxgi_surface, (IUnknown *)&render_target->ID2D1HwndRenderTarget_iface, &d2d_hwnd_render_target_ops, &dxgi_rt_desc, (void **)&render_target->dxgi_inner); IDXGISurface_Release(dxgi_surface); diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index f6e7b14ed3f..858c187e3bc 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -255,7 +255,8 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, return hr; } - hr = d2d_d3d_create_render_target(device, render_target->dxgi_surface, &render_target->IUnknown_iface, + hr = d2d_d3d_create_render_target(unsafe_impl_from_ID2D1Device((ID2D1Device1 *)device), + render_target->dxgi_surface, &render_target->IUnknown_iface, &d2d_wic_render_target_ops, desc, (void **)&render_target->dxgi_inner); ID2D1Device_Release(device); if (FAILED(hr))

1 0

Nikolay Sivov : d2d1: Keep effect shader objects at device level.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: e0ab89b856fc66853a6a9363822080f565d492cf URL: https://gitlab.winehq.org/wine/wine/-/commit/e0ab89b856fc66853a6a9363822080… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 2 14:30:48 2023 +0200 d2d1: Keep effect shader objects at device level. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 25 +++++++++++++--------- dlls/d2d1/device.c | 36 ++++++++++++++++++++++++++++++++ dlls/d2d1/effect.c | 54 +++++++----------------------------------------- dlls/d2d1/tests/d2d1.c | 2 -- 4 files changed, 59 insertions(+), 58 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8762a7a5503..f3029bab0f2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -592,22 +592,31 @@ HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *fac D2D1_FILL_MODE fill_mode, ID2D1Geometry **src_geometries, unsigned int geometry_count); struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface); +struct d2d_shader +{ + GUID id; + IUnknown *shader; +}; + struct d2d_device { ID2D1Device1 ID2D1Device1_iface; LONG refcount; ID2D1Factory1 *factory; IDXGIDevice *dxgi_device; + + struct + { + struct d2d_shader *objects; + size_t size; + size_t count; + } shaders; }; void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device); struct d2d_device *unsafe_impl_from_ID2D1Device(ID2D1Device1 *iface); - -struct d2d_shader -{ - GUID id; - IUnknown *shader; -}; +HRESULT d2d_device_add_shader(struct d2d_device *device, REFGUID shader_id, IUnknown *shader); +BOOL d2d_device_is_shader_loaded(struct d2d_device *device, REFGUID shader_id); struct d2d_effect_context { @@ -615,10 +624,6 @@ struct d2d_effect_context LONG refcount; struct d2d_device_context *device_context; - - struct d2d_shader *shaders; - size_t shaders_size; - size_t shader_count; }; void d2d_effect_context_init(struct d2d_effect_context *effect_context, diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 954ce7f8c28..33cf943010c 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -4528,6 +4528,7 @@ static ULONG WINAPI d2d_device_Release(ID2D1Device1 *iface) { struct d2d_device *device = impl_from_ID2D1Device(iface); ULONG refcount = InterlockedDecrement(&device->refcount); + size_t i; TRACE("%p decreasing refcount to %lu.\n", iface, refcount); @@ -4535,6 +4536,9 @@ static ULONG WINAPI d2d_device_Release(ID2D1Device1 *iface) { IDXGIDevice_Release(device->dxgi_device); ID2D1Factory1_Release(device->factory); + for (i = 0; i < device->shaders.count; ++i) + IUnknown_Release(device->shaders.objects[i].shader); + free(device->shaders.objects); free(device); } @@ -4670,3 +4674,35 @@ void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *iface, IDXGIDevic device->dxgi_device = dxgi_device; IDXGIDevice_AddRef(device->dxgi_device); } + +HRESULT d2d_device_add_shader(struct d2d_device *device, REFGUID shader_id, IUnknown *shader) +{ + struct d2d_shader *entry; + + if (!d2d_array_reserve((void **)&device->shaders.objects, &device->shaders.size, + device->shaders.count + 1, sizeof(*device->shaders.objects))) + { + WARN("Failed to resize shaders array.\n"); + return E_OUTOFMEMORY; + } + + entry = &device->shaders.objects[device->shaders.count++]; + entry->id = *shader_id; + entry->shader = shader; + IUnknown_AddRef(entry->shader); + + return S_OK; +} + +BOOL d2d_device_is_shader_loaded(struct d2d_device *device, REFGUID shader_id) +{ + size_t i; + + for (i = 0; i < device->shaders.count; ++i) + { + if (IsEqualGUID(shader_id, &device->shaders.objects[i].id)) + return TRUE; + } + + return FALSE; +} diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 7b086e20b9b..ddc9eee9236 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -624,37 +624,6 @@ static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1Effec return CONTAINING_RECORD(iface, struct d2d_effect_context, ID2D1EffectContext_iface); } -static void d2d_effect_context_cleanup(struct d2d_effect_context *effect_context) -{ - size_t i; - - for (i = 0; i < effect_context->shader_count; ++i) - IUnknown_Release(effect_context->shaders[i].shader); - free(effect_context->shaders); - - ID2D1DeviceContext1_Release(&effect_context->device_context->ID2D1DeviceContext1_iface); -} - -static HRESULT d2d_effect_context_add_shader(struct d2d_effect_context *effect_context, - REFGUID shader_id, void *shader) -{ - struct d2d_shader *entry; - - if (!d2d_array_reserve((void **)&effect_context->shaders, &effect_context->shaders_size, - effect_context->shader_count + 1, sizeof(*effect_context->shaders))) - { - WARN("Failed to resize shaders array.\n"); - return E_OUTOFMEMORY; - } - - entry = &effect_context->shaders[effect_context->shader_count++]; - entry->id = *shader_id; - entry->shader = shader; - IUnknown_AddRef(entry->shader); - - return S_OK; -} - static HRESULT STDMETHODCALLTYPE d2d_effect_context_QueryInterface(ID2D1EffectContext *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -692,7 +661,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *if if (!refcount) { - d2d_effect_context_cleanup(effect_context); + ID2D1DeviceContext1_Release(&effect_context->device_context->ID2D1DeviceContext1_iface); free(effect_context); } @@ -787,7 +756,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectC return hr; } - hr = d2d_effect_context_add_shader(effect_context, shader_id, shader); + hr = d2d_device_add_shader(effect_context->device_context->device, shader_id, (IUnknown *)shader); ID3D11PixelShader_Release(shader); return hr; @@ -797,7 +766,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); - ID3D11VertexShader *vertex_shader; + ID3D11VertexShader *shader; HRESULT hr; TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", @@ -807,14 +776,14 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect return S_OK; if (FAILED(hr = ID3D11Device1_CreateVertexShader(effect_context->device_context->d3d_device, - buffer, buffer_size, NULL, &vertex_shader))) + buffer, buffer_size, NULL, &shader))) { WARN("Failed to create vertex shader, hr %#lx.\n", hr); return hr; } - hr = d2d_effect_context_add_shader(effect_context, shader_id, vertex_shader); - ID3D11VertexShader_Release(vertex_shader); + hr = d2d_device_add_shader(effect_context->device_context->device, shader_id, (IUnknown *)shader); + ID3D11VertexShader_Release(shader); return hr; } @@ -839,7 +808,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1Effec return hr; } - hr = d2d_effect_context_add_shader(effect_context, shader_id, shader); + hr = d2d_device_add_shader(effect_context->device_context->device, shader_id, (IUnknown *)shader); ID3D11ComputeShader_Release(shader); return hr; @@ -848,17 +817,10 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1Effec static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id) { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); - size_t i; TRACE("iface %p, shader_id %s.\n", iface, debugstr_guid(shader_id)); - for (i = 0; i < effect_context->shader_count; ++i) - { - if (IsEqualGUID(shader_id, &effect_context->shaders[i].id)) - return TRUE; - } - - return FALSE; + return d2d_device_is_shader_loaded(effect_context->device_context->device, shader_id); } static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateResourceTexture(ID2D1EffectContext *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2f4ded1d0cc..4f53b4b7142 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11483,7 +11483,6 @@ static void test_effect_context(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); loaded = ID2D1EffectContext_IsShaderLoaded(effect_context2, &GUID_TestPixelShader); - todo_wine ok(loaded, "Unexpected shader loaded state.\n"); ID2D1Effect_Release(effect2); @@ -11524,7 +11523,6 @@ static void test_effect_context(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); - todo_wine ok(loaded, "Unexpected shader loaded state.\n"); ID2D1Effect_Release(effect);

1 0

Mohamad Al-Jaf : graphicscapture: Trim default debug channel.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: 79140eb277e891d4d401e4c4fb3b2c33496bb7c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/79140eb277e891d4d401e4c4fb3b2c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Jul 10 02:23:51 2023 -0400 graphicscapture: Trim default debug channel. The maximum size for a debug channel name is 15. --- dlls/graphicscapture/main.c | 2 +- dlls/graphicscapture/session.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/graphicscapture/main.c b/dlls/graphicscapture/main.c index b64a8936aeb..1b749a850d0 100644 --- a/dlls/graphicscapture/main.c +++ b/dlls/graphicscapture/main.c @@ -22,7 +22,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(graphicscapture); +WINE_DEFAULT_DEBUG_CHANNEL(capture); HRESULT WINAPI DllGetActivationFactory( HSTRING classid, IActivationFactory **factory ) { diff --git a/dlls/graphicscapture/session.c b/dlls/graphicscapture/session.c index 8c7aecfc793..12269e55de1 100644 --- a/dlls/graphicscapture/session.c +++ b/dlls/graphicscapture/session.c @@ -20,7 +20,7 @@ #include "private.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(graphicscapture); +WINE_DEFAULT_DEBUG_CHANNEL(capture); struct session {

1 0

Zebediah Figura : vkd3d-shader: Implement remapping shader output registers to match the next shader's semantics.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: vkd3d Branch: master Commit: 11475ef62a47a2e32a4404ea6653dffabdc60a38 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/11475ef62a47a2e32a4404ea6653d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 20 21:52:25 2023 -0500 vkd3d-shader: Implement remapping shader output registers to match the next shader's semantics. --- include/vkd3d_shader.h | 76 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/ir.c | 76 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++- 4 files changed, 155 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d6653d18..1a4ad6f6 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -90,6 +90,11 @@ enum vkd3d_shader_structure_type * \since 1.9 */ VKD3D_SHADER_STRUCTURE_TYPE_SCAN_SIGNATURE_INFO, + /** + * The structure is a vkd3d_shader_next_stage_info structure. + * \since 1.9 + */ + VKD3D_SHADER_STRUCTURE_TYPE_NEXT_STAGE_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -1676,6 +1681,74 @@ struct vkd3d_shader_scan_signature_info struct vkd3d_shader_signature patch_constant; }; +/** + * Describes the mapping of a output varying register in a shader stage, + * to an input varying register in the following shader stage. + * + * This structure is used in struct vkd3d_shader_next_stage_info. + */ +struct vkd3d_shader_varying_map +{ + /** + * The signature index (in the output signature) of the output varying. + * If greater than or equal to the number of elements in the output + * signature, signifies that the varying is consumed by the next stage but + * not written by this one. + */ + unsigned int output_signature_index; + /** The register index of the input varying to map this register to. */ + unsigned int input_register_index; + /** The mask consumed by the destination register. */ + unsigned int input_mask; +}; + +/** + * A chained structure which describes the next shader in the pipeline. + * + * This structure is optional, and should only be provided if there is in fact + * another shader in the pipeline. + * However, depending on the input and output formats, this structure may be + * necessary in order to generate shaders which correctly match each other. + * If the structure or its individual fields are not provided, vkd3d-shader + * will generate shaders which may be correct in isolation, but are not + * guaranteed to correctly match each other. + * + * This structure is passed to vkd3d_shader_compile() and extends + * vkd3d_shader_compile_info. + * + * This structure contains only input parameters. + * + * \since 1.9 + */ +struct vkd3d_shader_next_stage_info +{ + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_NEXT_STAGE_INFO. */ + enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ + const void *next; + + /** + * A mapping of output varyings in this shader stage to input varyings + * in the next shader stage. + * + * This mapping should include exactly one element for each varying + * consumed by the next shader stage. + * If this shader stage outputs a varying that is not consumed by the next + * shader stage, that varying should be absent from this array. + * + * If this field is absent, vkd3d-shader will map varyings from one stage + * to another based on their register index. + * For Direct3D shader model 3.0, such a default mapping will be incorrect + * unless the registers are allocated in the same order, and hence this + * field is necessary to correctly match inter-stage varyings. + * This mapping may also be necessary under other circumstances where the + * varying interface does not match exactly. + */ + const struct vkd3d_shader_varying_map *varying_map; + /** The number of registers provided in \ref varying_map. */ + unsigned int varying_count; +}; + #ifdef LIBVKD3D_SHADER_SOURCE # define VKD3D_SHADER_API VKD3D_EXPORT #else @@ -1748,13 +1821,14 @@ VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported * * Depending on the source and target types, this function may support the * following chained structures: + * - vkd3d_shader_hlsl_source_info * - vkd3d_shader_interface_info + * - vkd3d_shader_next_stage_info * - vkd3d_shader_scan_descriptor_info * - vkd3d_shader_scan_signature_info * - vkd3d_shader_spirv_domain_shader_target_info * - vkd3d_shader_spirv_target_info * - vkd3d_shader_transform_feedback_info - * - vkd3d_shader_hlsl_source_info * * \param compile_info A chained structure containing compilation parameters. * diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index d74f81af..0ade5a07 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -85,6 +85,75 @@ static void shader_instruction_eliminate_phase_instance_id(struct vkd3d_shader_i shader_register_eliminate_phase_addressing((struct vkd3d_shader_register *)&ins->dst[i].reg, instance_id); } +static const struct vkd3d_shader_varying_map *find_varying_map( + const struct vkd3d_shader_next_stage_info *next_stage, unsigned int signature_idx) +{ + unsigned int i; + + for (i = 0; i < next_stage->varying_count; ++i) + { + if (next_stage->varying_map[i].output_signature_index == signature_idx) + return &next_stage->varying_map[i]; + } + + return NULL; +} + +static enum vkd3d_result remap_output_signature(struct vkd3d_shader_parser *parser, + const struct vkd3d_shader_compile_info *compile_info) +{ + struct shader_signature *signature = &parser->shader_desc.output_signature; + const struct vkd3d_shader_next_stage_info *next_stage; + unsigned int i; + + if (!(next_stage = vkd3d_find_struct(compile_info->next, NEXT_STAGE_INFO))) + return VKD3D_OK; + + for (i = 0; i < signature->element_count; ++i) + { + const struct vkd3d_shader_varying_map *map = find_varying_map(next_stage, i); + struct signature_element *e = &signature->elements[i]; + + if (map) + { + unsigned int input_mask = map->input_mask; + + e->target_location = map->input_register_index; + + /* It is illegal in Vulkan if the next shader uses the same varying + * location with a different mask. */ + if (input_mask && input_mask != e->mask) + { + vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, + "Aborting due to not yet implemented feature: " + "Output mask %#x does not match input mask %#x.", + e->mask, input_mask); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + } + else + { + vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, + "Aborting due to not yet implemented feature: " + "This stage outputs varyings not consumed by the next stage."); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + } + + for (i = 0; i < next_stage->varying_count; ++i) + { + if (next_stage->varying_map[i].output_signature_index >= signature->element_count) + { + vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, + "Aborting due to not yet implemented feature: " + "The next stage consumes varyings not written by this stage."); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + } + + return VKD3D_OK; +} + struct hull_flattener { struct vkd3d_shader_instruction_array instructions; @@ -1194,7 +1263,8 @@ static enum vkd3d_result instruction_array_normalise_flat_constants(struct vkd3d return VKD3D_OK; } -enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser) +enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, + const struct vkd3d_shader_compile_info *compile_info) { struct vkd3d_shader_instruction_array *instructions = &parser->instructions; enum vkd3d_result result = VKD3D_OK; @@ -1202,6 +1272,10 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser) if (parser->shader_desc.is_dxil) return result; + if (parser->shader_version.type != VKD3D_SHADER_TYPE_PIXEL + && (result = remap_output_signature(parser, compile_info)) < 0) + return result; + if (parser->shader_version.type == VKD3D_SHADER_TYPE_HULL && (result = instruction_array_flatten_hull_shader_phases(instructions)) >= 0) { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 27d95912..28825256 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9542,7 +9542,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, compiler->location.column = 0; compiler->location.line = 1; - if ((result = vkd3d_shader_normalise(parser)) < 0) + if ((result = vkd3d_shader_normalise(parser, compile_info)) < 0) return result; instructions = parser->instructions; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d2a2ffe5..188fe460 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -168,6 +168,8 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_DXIL_INVALID_BLOCK_LENGTH = 8302, VKD3D_SHADER_WARNING_DXIL_INVALID_MODULE_LENGTH = 8303, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS = 8304, + + VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED = 9000, }; enum vkd3d_shader_opcode @@ -1409,6 +1411,7 @@ void dxbc_writer_add_section(struct dxbc_writer *dxbc, uint32_t tag, const void void dxbc_writer_init(struct dxbc_writer *dxbc); int dxbc_writer_write(struct dxbc_writer *dxbc, struct vkd3d_shader_code *code); -enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser); +enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, + const struct vkd3d_shader_compile_info *compile_info); #endif /* __VKD3D_SHADER_PRIVATE_H */

1 0

Zebediah Figura : vkd3d-shader: Introduce a function to build a varying map between sm1 stages.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: vkd3d Branch: master Commit: f649db23a596c1865bc7f110ca1feb3868451375 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f649db23a596c1865bc7f110ca1fe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 00:45:54 2023 -0500 vkd3d-shader: Introduce a function to build a varying map between sm1 stages. --- include/vkd3d_shader.h | 31 ++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 38 +++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1a4ad6f6..e98aad4f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1743,6 +1743,8 @@ struct vkd3d_shader_next_stage_info * field is necessary to correctly match inter-stage varyings. * This mapping may also be necessary under other circumstances where the * varying interface does not match exactly. + * + * This mapping may be constructed by vkd3d_shader_build_varying_map(). */ const struct vkd3d_shader_varying_map *varying_map; /** The number of registers provided in \ref varying_map. */ @@ -2262,6 +2264,35 @@ VKD3D_SHADER_API int vkd3d_shader_serialize_dxbc(size_t section_count, */ VKD3D_SHADER_API void vkd3d_shader_free_scan_signature_info(struct vkd3d_shader_scan_signature_info *info); +/** + * Build a mapping of output varyings in a shader stage to input varyings in + * the following shader stage. + * + * This mapping should be used in struct vkd3d_shader_next_stage_info to + * compile the first shader. + * + * \param output_signature The output signature of the first shader. + * + * \param input_signature The input signature of the second shader. + * + * \param count On output, contains the number of entries written into + * \ref varyings. + * + * \param varyings Pointer to an output array of varyings. + * This must point to space for N varyings, where N is the number of elements + * in the input signature. + * + * \remark Valid legacy Direct3D pixel shaders have at most 12 varying inputs: + * 10 inter-stage varyings, face, and position. + * Therefore, in practice, it is safe to call this function with a + * pre-allocated array with a fixed size of 12. + * + * \since 1.9 + */ +VKD3D_SHADER_API void vkd3d_shader_build_varying_map(const struct vkd3d_shader_signature *output_signature, + const struct vkd3d_shader_signature *input_signature, + unsigned int *count, struct vkd3d_shader_varying_map *varyings); + #endif /* VKD3D_SHADER_NO_PROTOTYPES */ /** Type of vkd3d_shader_get_version(). */ diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e8259181..e6ffb84d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1891,3 +1891,41 @@ void shader_instruction_array_destroy(struct vkd3d_shader_instruction_array *ins vkd3d_free(instructions->icbs[i]); vkd3d_free(instructions->icbs); } + +void vkd3d_shader_build_varying_map(const struct vkd3d_shader_signature *output_signature, + const struct vkd3d_shader_signature *input_signature, + unsigned int *ret_count, struct vkd3d_shader_varying_map *varyings) +{ + unsigned int count = 0; + unsigned int i; + + TRACE("output_signature %p, input_signature %p, ret_count %p, varyings %p.\n", + output_signature, input_signature, ret_count, varyings); + + for (i = 0; i < input_signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *input_element, *output_element; + + input_element = &input_signature->elements[i]; + + if (input_element->sysval_semantic != VKD3D_SHADER_SV_NONE) + continue; + + varyings[count].input_register_index = input_element->register_index; + varyings[count].input_mask = input_element->mask; + + if ((output_element = vkd3d_shader_find_signature_element(output_signature, + input_element->semantic_name, input_element->semantic_index, 0))) + { + varyings[count].output_signature_index = output_element - output_signature->elements; + } + else + { + varyings[count].output_signature_index = output_signature->element_count; + } + + ++count; + } + + *ret_count = count; +}

1 0

Zebediah Figura : vkd3d-shader/spirv: Make output varyings not consumed by the next stage private variables.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: vkd3d Branch: master Commit: d932fba7c334d88a037ae7e24e5403036b3d59f9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d932fba7c334d88a037ae7e24e540… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 12:46:55 2023 -0500 vkd3d-shader/spirv: Make output varyings not consumed by the next stage private variables. --- libs/vkd3d-shader/ir.c | 5 +---- libs/vkd3d-shader/spirv.c | 6 ++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 0ade5a07..705905f7 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -133,10 +133,7 @@ static enum vkd3d_result remap_output_signature(struct vkd3d_shader_parser *pars } else { - vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, - "Aborting due to not yet implemented feature: " - "This stage outputs varyings not consumed by the next stage."); - return VKD3D_ERROR_NOT_IMPLEMENTED; + e->target_location = SIGNATURE_TARGET_LOCATION_UNUSED; } } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 28825256..2725ed80 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4978,6 +4978,12 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, spirv_compiler_emit_register_execution_mode(compiler, &dst->reg); } + else if (signature_element->target_location == SIGNATURE_TARGET_LOCATION_UNUSED) + { + storage_class = SpvStorageClassPrivate; + id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, + storage_class, component_type, output_component_count, array_sizes, 2); + } else { unsigned int location = signature_element->target_location; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 188fe460..dc43175d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -809,6 +809,8 @@ enum vkd3d_shader_input_sysval_semantic VKD3D_SIV_LINE_DENSITY_TESS_FACTOR = 22, }; +#define SIGNATURE_TARGET_LOCATION_UNUSED (~0u) + struct signature_element { unsigned int sort_index; @@ -823,7 +825,8 @@ struct signature_element unsigned int mask; unsigned int used_mask; enum vkd3d_shader_minimum_precision min_precision; - /* Register index / location in the target shader. */ + /* Register index / location in the target shader. + * If SIGNATURE_TARGET_LOCATION_UNUSED, this element should not be written. */ unsigned int target_location; };

1 0

Zebediah Figura : vkd3d-shader: Add a separate field for the target location of a signature element.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: vkd3d Branch: master Commit: cb964825000b143a5e3b35ae98c09185dd90cac9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb964825000b143a5e3b35ae98c09… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 12:40:07 2023 -0500 vkd3d-shader: Add a separate field for the target location of a signature element. We want to be able to remap input signatures based on the signature index, but signature normalization both reorders the signature, and requires the old register index, so add a new field for this. --- libs/vkd3d-shader/d3dbc.c | 1 + libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 9466ca94..35e5c454 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -557,6 +557,7 @@ static bool add_signature_element(struct vkd3d_shader_sm1_parser *sm1, bool outp element->sysval_semantic = sysval; element->component_type = VKD3D_SHADER_COMPONENT_FLOAT; element->register_index = register_index; + element->target_location = register_index; element->register_count = 1; element->mask = mask; element->used_mask = is_dcl ? 0 : mask; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 716b7bdb..cedc3da4 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -391,6 +391,7 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s read_dword(&ptr, &e[i].sysval_semantic); read_dword(&ptr, &e[i].component_type); read_dword(&ptr, &e[i].register_index); + e[i].target_location = e[i].register_index; e[i].register_count = 1; read_dword(&ptr, &mask); e[i].mask = mask & 0xff; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d71f0a69..27d95912 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4602,7 +4602,7 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler, } else { - unsigned int location = signature_element->register_index; + unsigned int location = signature_element->target_location; input_id = spirv_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, component_type, input_component_count, array_sizes, 2); @@ -4980,7 +4980,7 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, } else { - unsigned int location = signature_element->register_index; + unsigned int location = signature_element->target_location; if (is_patch_constant) location += shader_signature_next_location(&compiler->output_signature); @@ -4989,10 +4989,10 @@ static void spirv_compiler_emit_output(struct spirv_compiler *compiler, storage_class, component_type, output_component_count, array_sizes, 2); vkd3d_spirv_add_iface_variable(builder, id); - if (is_dual_source_blending(compiler) && signature_element->register_index < 2) + if (is_dual_source_blending(compiler) && location < 2) { vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, 0); - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationIndex, signature_element->register_index); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationIndex, location); } else { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d35f49a6..d2a2ffe5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -815,11 +815,14 @@ struct signature_element unsigned int stream_index; enum vkd3d_shader_sysval_semantic sysval_semantic; enum vkd3d_shader_component_type component_type; + /* Register index in the source shader. */ unsigned int register_index; unsigned int register_count; unsigned int mask; unsigned int used_mask; enum vkd3d_shader_minimum_precision min_precision; + /* Register index / location in the target shader. */ + unsigned int target_location; }; struct shader_signature

1 0

Zebediah Figura : vkd3d-shader/d3dbc: Make sure all inter-stage varyings have a unique register index.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: vkd3d Branch: master Commit: bad72d187410d207057a6d2f265b53ab4177f7d9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bad72d187410d207057a6d2f265b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 17 23:50:41 2023 -0500 vkd3d-shader/d3dbc: Make sure all inter-stage varyings have a unique register index. spirv will need this. --- libs/vkd3d-shader/d3dbc.c | 7 ++++++- tests/vkd3d_shader_api.c | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index fe739339..9466ca94 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -524,6 +524,8 @@ static struct signature_element *find_signature_element_by_register_index( return NULL; } +#define SM1_COLOR_REGISTER_OFFSET 8 + static bool add_signature_element(struct vkd3d_shader_sm1_parser *sm1, bool output, const char *name, unsigned int index, enum vkd3d_shader_sysval_semantic sysval, unsigned int register_index, bool is_dcl, unsigned int mask) @@ -606,7 +608,7 @@ static bool add_signature_element_from_register(struct vkd3d_shader_sm1_parser * return true; } return add_signature_element(sm1, false, "COLOR", register_index, - VKD3D_SHADER_SV_NONE, register_index, is_dcl, mask); + VKD3D_SHADER_SV_NONE, SM1_COLOR_REGISTER_OFFSET + register_index, is_dcl, mask); case VKD3DSPR_TEXTURE: /* For vertex shaders, this is ADDR. */ @@ -633,6 +635,9 @@ static bool add_signature_element_from_register(struct vkd3d_shader_sm1_parser * /* fall through */ case VKD3DSPR_ATTROUT: + return add_signature_element(sm1, true, "COLOR", register_index, + VKD3D_SHADER_SV_NONE, SM1_COLOR_REGISTER_OFFSET + register_index, is_dcl, mask); + case VKD3DSPR_COLOROUT: return add_signature_element(sm1, true, "COLOR", register_index, VKD3D_SHADER_SV_NONE, register_index, is_dcl, mask); diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 8bd728d9..4893f44f 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -505,7 +505,7 @@ static void test_scan_signatures(void) { {"POSITION", 0, 0, VKD3D_SHADER_SV_POSITION, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, {"TEXCOORD", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, - {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, + {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 8, 0xf, 0xf}, {"FOG", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 1, 0x1, 0x1}, {"PSIZE", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0x1, 0x1}, }; @@ -582,7 +582,7 @@ static void test_scan_signatures(void) static const struct vkd3d_shader_signature_element ps2_inputs[] = { {"TEXCOORD", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, - {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, + {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 8, 0xf, 0xf}, }; static const struct vkd3d_shader_signature_element ps2_outputs[] = @@ -603,7 +603,7 @@ static void test_scan_signatures(void) static const struct vkd3d_shader_signature_element ps3_inputs[] = { - {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, + {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 8, 0xf, 0xf}, {"TEXCOORD", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, };

1 0

Zebediah Figura : vkd3d-shader/preproc: Strip whitespace when stringifying.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: vkd3d Branch: master Commit: 250a24bd3fba3eb28a6be9fe8ca35900e8336405 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/250a24bd3fba3eb28a6be9fe8ca35… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 18:32:04 2023 -0500 vkd3d-shader/preproc: Strip whitespace when stringifying. --- libs/vkd3d-shader/preproc.l | 11 ++++++++++- tests/hlsl_d3d12.c | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 5e8ed2eb..728d6184 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -358,7 +358,16 @@ static void preproc_stringify(struct preproc_ctx *ctx, struct vkd3d_string_buffe vkd3d_string_buffer_printf(buffer, "\""); if ((expansion = find_arg_expansion(ctx, p))) { - for (i = 0; i < expansion->text.content_size; ++i) + size_t len = expansion->text.content_size; + size_t start = 0; + + while (len && strchr(" \t\r\n", expansion->text.buffer[len - 1])) + --len; + + while (start < len && strchr(" \t\r\n", expansion->text.buffer[start])) + ++start; + + for (i = start; i < len; ++i) { char c = expansion->text.buffer[i]; diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index ef41235e..ff29f1f7 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -193,6 +193,12 @@ static void test_preprocess(void) "\"apple\"", }, + { + "#define KEY(a) #a\n" + "KEY( \t\r\n apple \t\r\n )", + + "\"apple\"", + }, { "#define KEY(if) #if\n" "KEY(apple)",

1 0