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

Louis Lenders : wmic: Support interactive mode and piped commands.
by Alexandre Julliard March 29, 2024

March 29, 2024

1 0

Dmitry Timoshkov : windowscodecs: Silence fixme for IID_CMetaBitmapRenderTarget.
by Alexandre Julliard March 29, 2024

March 29, 2024

Module: wine Branch: master Commit: 8568848ba836d696c04ea99279a772d5ce8419a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/8568848ba836d696c04ea99279a772… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 29 18:59:50 2024 +0300 windowscodecs: Silence fixme for IID_CMetaBitmapRenderTarget. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bitmap.c | 8 +++++++- dlls/windowscodecs/tests/bitmap.c | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index 53d3361d346..e7d8b27d94a 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -30,6 +30,9 @@ #include "wine/asm.h" #include "wine/debug.h" +#include "initguid.h" +DEFINE_GUID(IID_CMetaBitmapRenderTarget, 0x0ccd7824,0xdc16,0x4d09,0xbc,0xa8,0x6b,0x09,0xc4,0xef,0x55,0x35); + WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); /* WARNING: .NET Media Integration Layer (MIL) directly dereferences @@ -253,7 +256,10 @@ static HRESULT WINAPI BitmapImpl_QueryInterface(IWICBitmap *iface, REFIID iid, } else { - FIXME("unknown interface %s\n", debugstr_guid(iid)); + if (IsEqualIID(&IID_CMetaBitmapRenderTarget, iid)) + WARN("Ignoring interface %s\n", debugstr_guid(iid)); + else + FIXME("unknown interface %s\n", debugstr_guid(iid)); *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 3ddd3bbdbae..f070eaeb47f 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -30,6 +30,9 @@ #include "wincodec.h" #include "wine/test.h" +#include "initguid.h" +DEFINE_GUID(IID_CMetaBitmapRenderTarget, 0x0ccd7824,0xdc16,0x4d09,0xbc,0xa8,0x6b,0x09,0xc4,0xef,0x55,0x35); + extern IID IID_IMILBitmap; extern IID IID_IMILBitmapSource; extern IID IID_IMILBitmapLock; @@ -1464,6 +1467,12 @@ static void test_IMILBitmap(void) IWICBitmapScaler_Release(scaler); mil_source->lpVtbl->Release(mil_source); mil_bitmap->lpVtbl->Release(mil_bitmap); + + mil_unknown = (void *)0xdeadbeef; + hr = IWICBitmap_QueryInterface(bitmap, &IID_CMetaBitmapRenderTarget, (void **)&mil_unknown); + ok(hr == E_NOINTERFACE, "got %#lx\n", hr); + ok(!mil_unknown, "got %p\n", mil_unknown); + IWICBitmap_Release(bitmap); }

1 0

Nikolay Sivov : d2d1/tests: Get rid of test shader blobs.
by Alexandre Julliard March 29, 2024

March 29, 2024

Module: wine Branch: master Commit: 87ebccc37d2afb8f3b1bb8bd4a78f490a116411c URL: https://gitlab.winehq.org/wine/wine/-/commit/87ebccc37d2afb8f3b1bb8bd4a78f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 29 00:25:06 2024 +0100 d2d1/tests: Get rid of test shader blobs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/Makefile.in | 2 +- dlls/d2d1/tests/d2d1.c | 67 ++++++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 38 deletions(-) diff --git a/dlls/d2d1/tests/Makefile.in b/dlls/d2d1/tests/Makefile.in index 5c7fe78491e..2f6fd2843ce 100644 --- a/dlls/d2d1/tests/Makefile.in +++ b/dlls/d2d1/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d2d1.dll -IMPORTS = d2d1 d3d10_1 d3d11 dwrite dxguid uuid user32 advapi32 ole32 gdi32 +IMPORTS = d2d1 d3d10_1 d3d11 dwrite dxguid uuid user32 advapi32 ole32 gdi32 d3dcompiler SOURCES = \ d2d1.c diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0059b2b8bd1..4d17c126ee3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -20,6 +20,7 @@ #include <limits.h> #include <math.h> #include <float.h> +#include "d3dcompiler.h" #include "d2d1_3.h" #include "d2d1effectauthor.h" #include "d3d11.h" @@ -247,38 +248,17 @@ L"<?xml version='1.0'?> \ </Effect> \ "; -static const DWORD test_vs[] = -{ -#if 0 - void main(float4 pos : Position, out float4 output : SV_Position) - { - output = pos; - } -#endif - 0x43425844, 0xa84b398b, 0xc4047d32, 0xc19c67bb, 0x4644285e, 0x00000001, 0x000000d8, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x69736f50, 0x6e6f6974, 0xababab00, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, - 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, - 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, - 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, -}; +static const char test_vs_code[] = + "void main(float4 pos : Position, out float4 output : SV_Position)\n" + "{\n" + " output = pos;\n" + "}"; -static const DWORD test_ps[] = -{ -#if 0 - float4 main() : SV_Target - { - return float4(0.1, 0.2, 0.3, 0.4); - } -#endif - 0x43425844, 0xf34300ae, 0x22fc6d56, 0x5cca66fa, 0x86ae3266, 0x00000001, 0x000000b0, 0x00000003, - 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, - 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3dcccccd, - 0x3e4ccccd, 0x3e99999a, 0x3ecccccd, 0x0100003e, -}; +static const char test_ps_code[] = + "float4 main() : SV_Target\n" + "{\n" + " return float4(0.1, 0.2, 0.3, 0.4);\n" + "}"; static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); @@ -11525,6 +11505,7 @@ static void test_effect_context(BOOL d3d11) struct d2d1_test_context ctx; ID2D1Factory1 *factory; ID2D1Device *device; + ID3D10Blob *vs, *ps; ULONG refcount; BOOL loaded; HRESULT hr; @@ -11540,6 +11521,14 @@ static void test_effect_context(BOOL d3d11) return; } + hr = D3DCompile(test_vs_code, sizeof(test_vs_code) - 1, "test_vs", NULL, NULL, + "main", "vs_4_0", 0, 0, &vs, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = D3DCompile(test_ps_code, sizeof(test_ps_code) - 1, "test_ps", NULL, NULL, + "main", "ps_4_0", 0, 0, &ps, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + binding.propertyName = L"Context"; binding.setFunction = NULL; binding.getFunction = effect_impl_get_context; @@ -11562,26 +11551,26 @@ static void test_effect_context(BOOL d3d11) ok(!loaded, "Unexpected shader loaded state.\n"); hr = ID2D1EffectContext_LoadVertexShader(effect_context, - &GUID_TestVertexShader, (const BYTE *)test_ps, sizeof(test_ps)); + &GUID_TestVertexShader, ID3D10Blob_GetBufferPointer(ps), ID3D10Blob_GetBufferSize(ps)); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1EffectContext_LoadVertexShader(effect_context, - &GUID_TestVertexShader, (const BYTE *)test_vs, sizeof(test_vs)); + &GUID_TestVertexShader, ID3D10Blob_GetBufferPointer(vs), ID3D10Blob_GetBufferSize(vs)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestVertexShader); ok(loaded, "Unexpected shader loaded state.\n"); hr = ID2D1EffectContext_LoadVertexShader(effect_context, - &GUID_TestVertexShader, (const BYTE *)test_ps, sizeof(test_ps)); + &GUID_TestVertexShader, ID3D10Blob_GetBufferPointer(ps), ID3D10Blob_GetBufferSize(ps)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1EffectContext_LoadVertexShader(effect_context, - &GUID_TestVertexShader, (const BYTE *)test_vs, sizeof(test_vs)); + &GUID_TestVertexShader, ID3D10Blob_GetBufferPointer(vs), ID3D10Blob_GetBufferSize(vs)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1EffectContext_LoadPixelShader(effect_context, - &GUID_TestPixelShader, (const BYTE *)test_vs, sizeof(test_vs)); + &GUID_TestPixelShader, ID3D10Blob_GetBufferPointer(vs), ID3D10Blob_GetBufferSize(vs)); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1EffectContext_LoadPixelShader(effect_context, - &GUID_TestPixelShader, (const BYTE *)test_ps, sizeof(test_ps)); + &GUID_TestPixelShader, ID3D10Blob_GetBufferPointer(ps), ID3D10Blob_GetBufferSize(ps)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); loaded = ID2D1EffectContext_IsShaderLoaded(effect_context, &GUID_TestPixelShader); ok(loaded, "Unexpected shader loaded state.\n"); @@ -11642,6 +11631,10 @@ static void test_effect_context(BOOL d3d11) hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID3D10Blob_Release(vs); + ID3D10Blob_Release(ps); + release_test_context(&ctx); }

1 0

Zebediah Figura : wined3d: Remove the OffscreenRenderingMode setting.
by Alexandre Julliard March 29, 2024

March 29, 2024

Module: wine Branch: master Commit: c9b72d2d2fad2322976afc15eca166c3d87c5f20 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9b72d2d2fad2322976afc15eca166… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 7 18:47:18 2024 -0600 wined3d: Remove the OffscreenRenderingMode setting. FBOs are required now. --- dlls/wined3d/adapter_gl.c | 4 ---- dlls/wined3d/wined3d_main.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 815879e356e..46e580b0ce6 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5400,10 +5400,6 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", driver_info->version_high, driver_info->version_low); - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) - ERR_(winediag)("You are using the backbuffer for offscreen rendering. " - "This is unsupported, and will be removed in a future version.\n"); - wined3d_adapter_init_fb_cfgs(adapter_gl, caps_gl_ctx.dc); /* We haven't found any suitable formats. This should only happen in * case of GDI software rendering, which is pretty useless anyway. */ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0dd2c59844e..2bc54299ce1 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -375,9 +375,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); TRACE("Use of GL Shading Language disabled.\n"); } - if (!get_config_key(hkey, appkey, env, "OffscreenRenderingMode", buffer, size) - && !strcmp(buffer,"backbuffer")) - wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; if (!get_config_key_dword(hkey, appkey, env, "VideoPciDeviceID", &tmpvalue)) { int pci_device_id = tmpvalue;

1 0

Zebediah Figura : wined3d: Use dynamic state for patch vertex count if possible.
by Alexandre Julliard March 29, 2024

March 29, 2024

Module: wine Branch: master Commit: b9d2885148050e9b4ec9a5cbc5f4ecfd9ff83e85 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9d2885148050e9b4ec9a5cbc5f4ec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 11 22:16:17 2023 -0500 wined3d: Use dynamic state for patch vertex count if possible. --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/context.c | 1 + dlls/wined3d/context_vk.c | 12 +++++++++++- dlls/wined3d/cs.c | 5 +++++ dlls/wined3d/wined3d_private.h | 3 ++- dlls/wined3d/wined3d_vk.h | 4 +++- 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index af27bcfbb05..7b4bf898fd1 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2350,6 +2350,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ vk_info->multiple_viewports = device_info.features2.features.multiViewport; vk_info->dynamic_state2 = device_info.dynamic_state2_features.extendedDynamicState2; + vk_info->dynamic_patch_vertex_count = device_info.dynamic_state2_features.extendedDynamicState2PatchControlPoints; } static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk *adapter_vk) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7a82d74edf8..d0193237d25 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -115,6 +115,7 @@ void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapch | (1u << WINED3D_SHADER_TYPE_COMPUTE); context->update_primitive_type = 1; + context->update_patch_vertex_count = 1; } HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 55d6be8704e..e59069ab809 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1906,6 +1906,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_vk->c.update_unordered_access_view_bindings = 1; context_vk->c.update_compute_unordered_access_view_bindings = 1; context_vk->c.update_primitive_type = 1; + context_vk->c.update_patch_vertex_count = 1; context_invalidate_state(&context_vk->c, STATE_STREAMSRC); context_invalidate_state(&context_vk->c, STATE_INDEXBUFFER); context_invalidate_state(&context_vk->c, STATE_BLEND_FACTOR); @@ -2142,6 +2143,8 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context if (!(context_vk->c.d3d_info->wined3d_creation_flags & WINED3D_NO_PRIMITIVE_RESTART)) dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT; } + if (vk_info->dynamic_patch_vertex_count) + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT; key = &context_vk->graphics.pipeline_key_vk; memset(key, 0, sizeof(*key)); @@ -2508,7 +2511,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte } } - if (key->ts_desc.patchControlPoints != state->patch_vertex_count) + if (!vk_info->dynamic_patch_vertex_count && key->ts_desc.patchControlPoints != state->patch_vertex_count) { key->ts_desc.patchControlPoints = state->patch_vertex_count; @@ -3868,6 +3871,13 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c context_vk->c.update_primitive_type = 0; } + if (vk_info->dynamic_patch_vertex_count && context_vk->c.update_patch_vertex_count) + { + if (state->patch_vertex_count) + VK_CALL(vkCmdSetPatchControlPointsEXT(vk_command_buffer, state->patch_vertex_count)); + context_vk->c.update_patch_vertex_count = 0; + } + if (vk_info->supported[WINED3D_VK_EXT_EXTENDED_DYNAMIC_STATE] && (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_DEPTH_STENCIL) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER))) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8a7e859daea..3b1891321a4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1047,6 +1047,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) for (i = 0; i < device->context_count; ++i) device->contexts[i]->update_primitive_type = 1; } + if (state->patch_vertex_count != op->patch_vertex_count) + { + for (i = 0; i < device->context_count; ++i) + device->contexts[i]->update_patch_vertex_count = 1; + } state->patch_vertex_count = op->patch_vertex_count; cs->c.device->adapter->adapter_ops->adapter_draw_primitive(cs->c.device, state, &op->parameters); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6e7bffecb0..b0663e67d7e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1968,7 +1968,8 @@ struct wined3d_context DWORD destroy_delayed : 1; DWORD namedArraysLoaded : 1; DWORD update_primitive_type : 1; - DWORD padding : 4; + DWORD update_patch_vertex_count : 1; + DWORD padding : 3; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 0f0e51baa0f..e995ef3c408 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -187,6 +187,7 @@ struct wined3d_device_vk; VK_DEVICE_EXT_PFN(vkCmdSetStencilOpEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetStencilTestEnableEXT) \ /* VK_EXT_extended_dynamic_state2 */ \ + VK_DEVICE_EXT_PFN(vkCmdSetPatchControlPointsEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetPrimitiveRestartEnableEXT) \ /* VK_EXT_transform_feedback */ \ VK_DEVICE_EXT_PFN(vkCmdBeginQueryIndexedEXT) \ @@ -247,6 +248,7 @@ struct wined3d_vk_info bool multiple_viewports; bool dynamic_state2; + bool dynamic_patch_vertex_count; }; #define VK_CALL(f) (vk_info->vk_ops.f) @@ -569,7 +571,7 @@ struct wined3d_context_vk const struct wined3d_vk_info *vk_info; - VkDynamicState dynamic_states[13]; + VkDynamicState dynamic_states[14]; uint32_t update_compute_pipeline : 1; uint32_t update_stream_output : 1;

1 0

Zebediah Figura : wined3d: Enable EXT_extended_dynamic_state2.
by Alexandre Julliard March 29, 2024

March 29, 2024

Module: wine Branch: master Commit: 48d68e0c50db27f43c530d1bd5aa1196aca50398 URL: https://gitlab.winehq.org/wine/wine/-/commit/48d68e0c50db27f43c530d1bd5aa11… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 10 23:42:46 2023 -0500 wined3d: Enable EXT_extended_dynamic_state2. --- dlls/wined3d/adapter_vk.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 45d92e907b3..5b1437337c1 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -242,6 +242,7 @@ static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_v struct wined3d_physical_device_info { VkPhysicalDeviceExtendedDynamicStateFeaturesEXT dynamic_state_features; + VkPhysicalDeviceExtendedDynamicState2FeaturesEXT dynamic_state2_features; VkPhysicalDeviceHostQueryResetFeatures host_query_reset_features; VkPhysicalDeviceShaderDrawParametersFeatures draw_parameters_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; @@ -338,6 +339,7 @@ static const struct wined3d_allocator_ops wined3d_allocator_vk_ops = static void get_physical_device_info(const struct wined3d_adapter_vk *adapter_vk, struct wined3d_physical_device_info *info) { VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features = &info->vertex_divisor_features; + VkPhysicalDeviceExtendedDynamicState2FeaturesEXT *dynamic_state2_features = &info->dynamic_state2_features; VkPhysicalDeviceShaderDrawParametersFeatures *draw_parameters_features = &info->draw_parameters_features; VkPhysicalDeviceExtendedDynamicStateFeaturesEXT *dynamic_state_features = &info->dynamic_state_features; VkPhysicalDeviceHostQueryResetFeatures *host_query_reset_features = &info->host_query_reset_features; @@ -363,8 +365,11 @@ static void get_physical_device_info(const struct wined3d_adapter_vk *adapter_vk host_query_reset_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES; host_query_reset_features->pNext = vertex_divisor_features; + dynamic_state2_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT; + dynamic_state2_features->pNext = host_query_reset_features; + dynamic_state_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT; - dynamic_state_features->pNext = host_query_reset_features; + dynamic_state_features->pNext = dynamic_state2_features; features2->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; features2->pNext = dynamic_state_features; @@ -2366,6 +2371,7 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk info[] = { {VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME, VK_API_VERSION_1_3}, + {VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME, VK_API_VERSION_1_3}, {VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, VK_API_VERSION_1_2}, {VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME, ~0u}, {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, ~0u},

1 0

Zebediah Figura : wined3d: Use dynamic state for primitive type if possible.
by Alexandre Julliard March 29, 2024

March 29, 2024

Module: wine Branch: master Commit: 6f6ef6cd04aa29b837c72475146ccf414412558c URL: https://gitlab.winehq.org/wine/wine/-/commit/6f6ef6cd04aa29b837c72475146ccf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 11 22:09:48 2023 -0500 wined3d: Use dynamic state for primitive type if possible. --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/context.c | 2 ++ dlls/wined3d/context_vk.c | 71 ++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/cs.c | 2 ++ dlls/wined3d/wined3d_private.h | 3 +- dlls/wined3d/wined3d_vk.h | 8 +++-- 6 files changed, 78 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5b1437337c1..af27bcfbb05 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2349,6 +2349,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; vk_info->multiple_viewports = device_info.features2.features.multiViewport; + vk_info->dynamic_state2 = device_info.dynamic_state2_features.extendedDynamicState2; } static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk *adapter_vk) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 90a588415ea..7a82d74edf8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -113,6 +113,8 @@ void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapch | (1u << WINED3D_SHADER_TYPE_HULL) | (1u << WINED3D_SHADER_TYPE_DOMAIN) | (1u << WINED3D_SHADER_TYPE_COMPUTE); + + context->update_primitive_type = 1; } HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 3f13e66e2fd..55d6be8704e 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -216,6 +216,36 @@ static VkPrimitiveTopology vk_topology_from_wined3d(enum wined3d_primitive_type } } +static VkPrimitiveTopology vk_topology_class_from_wined3d(enum wined3d_primitive_type t) +{ + switch (t) + { + case WINED3D_PT_POINTLIST: + return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; + + case WINED3D_PT_LINELIST: + case WINED3D_PT_LINELIST_ADJ: + case WINED3D_PT_LINESTRIP: + case WINED3D_PT_LINESTRIP_ADJ: + return VK_PRIMITIVE_TOPOLOGY_LINE_LIST; + + case WINED3D_PT_TRIANGLEFAN: + case WINED3D_PT_TRIANGLELIST: + case WINED3D_PT_TRIANGLELIST_ADJ: + case WINED3D_PT_TRIANGLESTRIP: + case WINED3D_PT_TRIANGLESTRIP_ADJ: + return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; + + case WINED3D_PT_PATCH: + return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; + + default: + FIXME("Unhandled primitive type %s.\n", debug_d3dprimitivetype(t)); + case WINED3D_PT_UNDEFINED: + return ~0u; + } +} + static VkStencilOp vk_stencil_op_from_wined3d(enum wined3d_stencil_op op) { switch (op) @@ -1875,6 +1905,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_vk->c.update_compute_shader_resource_bindings = 1; context_vk->c.update_unordered_access_view_bindings = 1; context_vk->c.update_compute_unordered_access_view_bindings = 1; + context_vk->c.update_primitive_type = 1; context_invalidate_state(&context_vk->c, STATE_STREAMSRC); context_invalidate_state(&context_vk->c, STATE_INDEXBUFFER); context_invalidate_state(&context_vk->c, STATE_BLEND_FACTOR); @@ -2105,6 +2136,12 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK; dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_STENCIL_WRITE_MASK; } + if (vk_info->dynamic_state2) + { + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT; + if (!(context_vk->c.d3d_info->wined3d_creation_flags & WINED3D_NO_PRIMITIVE_RESTART)) + dynamic_states[dynamic_state_count++] = VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT; + } key = &context_vk->graphics.pipeline_key_vk; memset(key, 0, sizeof(*key)); @@ -2449,14 +2486,26 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - vk_topology = vk_topology_from_wined3d(state->primitive_type); - if (key->ia_desc.topology != vk_topology) + if (vk_info->dynamic_state2) { - key->ia_desc.topology = vk_topology; - key->ia_desc.primitiveRestartEnable = !(d3d_info->wined3d_creation_flags & WINED3D_NO_PRIMITIVE_RESTART) - && !wined3d_primitive_type_is_list(state->primitive_type); + vk_topology = vk_topology_class_from_wined3d(state->primitive_type); + if (key->ia_desc.topology != vk_topology) + { + key->ia_desc.topology = vk_topology; + update = true; + } + } + else + { + vk_topology = vk_topology_from_wined3d(state->primitive_type); + if (key->ia_desc.topology != vk_topology) + { + key->ia_desc.topology = vk_topology; + key->ia_desc.primitiveRestartEnable = !(d3d_info->wined3d_creation_flags & WINED3D_NO_PRIMITIVE_RESTART) + && !wined3d_primitive_type_is_list(state->primitive_type); - update = true; + update = true; + } } if (key->ts_desc.patchControlPoints != state->patch_vertex_count) @@ -3539,6 +3588,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c const struct wined3d_state *state, struct wined3d_buffer_vk *indirect_vk, bool indexed) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_d3d_info *d3d_info = context_vk->c.d3d_info; const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_blend_state *b = state->blend_state; bool dual_source_blend = b && b->dual_source; @@ -3809,6 +3859,15 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c VK_CALL(vkCmdSetScissor(vk_command_buffer, 0, viewport_count, scissors)); } + if (vk_info->dynamic_state2 && context_vk->c.update_primitive_type) + { + VK_CALL(vkCmdSetPrimitiveTopologyEXT(vk_command_buffer, vk_topology_from_wined3d(state->primitive_type))); + if (!(d3d_info->wined3d_creation_flags & WINED3D_NO_PRIMITIVE_RESTART)) + VK_CALL(vkCmdSetPrimitiveRestartEnableEXT(vk_command_buffer, + !wined3d_primitive_type_is_list(state->primitive_type))); + context_vk->c.update_primitive_type = 0; + } + if (vk_info->supported[WINED3D_VK_EXT_EXTENDED_DYNAMIC_STATE] && (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_DEPTH_STENCIL) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER))) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 091b461fbbf..8a7e859daea 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1044,6 +1044,8 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->primitive_type == WINED3D_PT_POINTLIST || op->primitive_type == WINED3D_PT_POINTLIST) device_invalidate_state(cs->c.device, STATE_POINT_ENABLE); state->primitive_type = op->primitive_type; + for (i = 0; i < device->context_count; ++i) + device->contexts[i]->update_primitive_type = 1; } state->patch_vertex_count = op->patch_vertex_count; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4b928781117..f6e7bffecb0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1967,7 +1967,8 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD namedArraysLoaded : 1; - DWORD padding : 5; + DWORD update_primitive_type : 1; + DWORD padding : 4; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 280f36f692a..0f0e51baa0f 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -183,8 +183,11 @@ struct wined3d_device_vk; VK_DEVICE_EXT_PFN(vkCmdSetDepthCompareOpEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetDepthTestEnableEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetDepthWriteEnableEXT) \ + VK_DEVICE_EXT_PFN(vkCmdSetPrimitiveTopologyEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetStencilOpEXT) \ VK_DEVICE_EXT_PFN(vkCmdSetStencilTestEnableEXT) \ + /* VK_EXT_extended_dynamic_state2 */ \ + VK_DEVICE_EXT_PFN(vkCmdSetPrimitiveRestartEnableEXT) \ /* VK_EXT_transform_feedback */ \ VK_DEVICE_EXT_PFN(vkCmdBeginQueryIndexedEXT) \ VK_DEVICE_EXT_PFN(vkCmdBeginTransformFeedbackEXT) \ @@ -242,7 +245,8 @@ struct wined3d_vk_info BOOL supported[WINED3D_VK_EXT_COUNT]; HMODULE vulkan_lib; - unsigned int multiple_viewports : 1; + bool multiple_viewports; + bool dynamic_state2; }; #define VK_CALL(f) (vk_info->vk_ops.f) @@ -565,7 +569,7 @@ struct wined3d_context_vk const struct wined3d_vk_info *vk_info; - VkDynamicState dynamic_states[11]; + VkDynamicState dynamic_states[13]; uint32_t update_compute_pipeline : 1; uint32_t update_stream_output : 1;

1 0

Zebediah Figura : wined3d: Require EXT_framebuffer_object.
by Alexandre Julliard March 29, 2024

March 29, 2024

Module: wine Branch: master Commit: 437eb42ad215e7a6c48f03db20527c18f30da266 URL: https://gitlab.winehq.org/wine/wine/-/commit/437eb42ad215e7a6c48f03db20527c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 7 18:46:08 2024 -0600 wined3d: Require EXT_framebuffer_object. --- dlls/wined3d/adapter_gl.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2d8018f8cc9..815879e356e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3783,6 +3783,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter_gl *adapter_gl, gl_info->fbo_ops.glBlitFramebuffer = gl_info->gl_ops.ext.p_glBlitFramebuffer; gl_info->fbo_ops.glGenerateMipmap = gl_info->gl_ops.ext.p_glGenerateMipmap; gl_info->fbo_ops.glFramebufferTexture = gl_info->gl_ops.ext.p_glFramebufferTexture; + + gl_info->supported[EXT_FRAMEBUFFER_OBJECT] = TRUE; } else { @@ -5299,6 +5301,16 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, LUID primary_luid, *luid = NULL; unsigned int i; + static const struct + { + enum wined3d_gl_extension extension; + const char *string; + } + required_extensions[] = + { + {EXT_FRAMEBUFFER_OBJECT, "EXT_framebuffer_object"}, + }; + TRACE("adapter_gl %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_gl, ordinal, wined3d_creation_flags); @@ -5357,6 +5369,16 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, return FALSE; } + for (unsigned int i = 0; i < ARRAY_SIZE(required_extensions); ++i) + { + if (!gl_info->supported[required_extensions[i].extension]) + { + ERR("Required extension %s is not supported.\n", required_extensions[i].string); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); + return FALSE; + } + } + gl_info->filling_convention_offset = wined3d_adapter_find_fill_offset(&caps_gl_ctx); wined3d_adapter_gl_init_d3d_info(adapter_gl, wined3d_creation_flags);

1 0

Alexandre Julliard : rpcrt4: Make sure that the stack is set when catching an exception.
by Alexandre Julliard March 29, 2024

March 29, 2024

Module: wine Branch: master Commit: 8bac669056d2e810e6969ad7339fdc572b0ce93b URL: https://gitlab.winehq.org/wine/wine/-/commit/8bac669056d2e810e6969ad7339fdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 12:27:32 2024 +0100 rpcrt4: Make sure that the stack is set when catching an exception. Fixes a test crash in interpreted mode. --- dlls/rpcrt4/ndr_stubless.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index cb77b8a06d3..6b23f699d2b 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -947,6 +947,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma { /* 7. FREE */ TRACE( "FREE\n" ); + stubMsg.StackTop = (unsigned char *)stack_top; client_do_args(&stubMsg, pFormat, STUBLESS_FREE, fpu_stack, number_of_params, (unsigned char *)&RetVal); RetVal = NdrProxyErrorHandler(GetExceptionCode());

1 0

Alexandre Julliard : rpcrt4: Return the correct failure for a NULL binding handle.
by Alexandre Julliard March 29, 2024

March 29, 2024

Module: wine Branch: master Commit: 2d801c46c76bbf6fa9fed9988222aa5cfb249b57 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d801c46c76bbf6fa9fed9988222aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 11:24:46 2024 +0100 rpcrt4: Return the correct failure for a NULL binding handle. Fixes a test crash in interpreted mode. --- dlls/rpcrt4/ndr_stubless.c | 5 +---- dlls/rpcrt4/rpc_message.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 7aa2f79d10b..cb77b8a06d3 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -346,9 +346,9 @@ static handle_t client_get_handle(const MIDL_STUB_MESSAGE *pStubMsg, { ERR("null context handle isn't allowed\n"); RpcRaiseException(RPC_X_SS_IN_NULL_CONTEXT); - return NULL; } /* FIXME: should we store this structure in stubMsg.pContext? */ + return NULL; } default: ERR("bad explicit binding handle type (0x%02x)\n", pProcHeader->handle_type); @@ -745,10 +745,7 @@ static LONG_PTR do_ndr_client_call( const MIDL_STUB_DESC *stub_desc, const PFORM /* we only need a handle if this isn't an object method */ if (!(proc_header->Oi_flags & Oi_OBJECT_PROC)) - { hbinding = client_get_handle(stub_msg, proc_header, handle_format); - if (!hbinding) return 0; - } stub_msg->BufferLength = 0; diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 46736c21fc1..5ef2ee8edc5 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1638,7 +1638,7 @@ RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) if (!bind) { - ERR("no binding\n"); + WARN("no binding\n"); return RPC_S_INVALID_BINDING; }

1 0