April 2024 - Wine-commits - list.winehq.org

Giovanni Mascellani : tests: Skip some tests that crash on llvmpipe.
by Alexandre Julliard 11 Apr '24

11 Apr '24

Module: vkd3d Branch: master Commit: 7cfb02cfd365d59d7af3aa6c3113a04dc9e3cc91 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7cfb02cfd365d59d7af3aa6c3113a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 5 23:08:35 2024 +0200 tests: Skip some tests that crash on llvmpipe. --- tests/d3d12.c | 18 +++++++++++++++++ tests/d3d12_crosstest.h | 52 +++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1222ed05..0a55cddb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19588,6 +19588,15 @@ static void test_null_srv(void) queue = context.queue; device = context.device; + if (is_llvmpipe_device_gte(device, 23, 2, 1)) + { + /* llvmpipe crashes when mutable descriptors are used. I don't + * know yet whether this is a bug in vkd3d or Mesa. */ + skip("Test crashes on llvmpipe, skipping.\n"); + destroy_test_context(&context); + return; + } + context.root_signature = create_texture_root_signature(context.device, D3D12_SHADER_VISIBILITY_PIXEL, 4, 0); @@ -19803,6 +19812,15 @@ static void test_null_uav(void) command_list = context.list; queue = context.queue; + if (is_llvmpipe_device_gte(device, 23, 2, 1)) + { + /* llvmpipe crashes when mutable descriptors are used. I don't + * know yet whether this is a bug in vkd3d or Mesa. */ + skip("Test crashes on llvmpipe, skipping.\n"); + destroy_test_context(&context); + return; + } + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; descriptor_ranges[0].NumDescriptors = 1; descriptor_ranges[0].BaseShaderRegister = 1; diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index e2401645..a27b62e7 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -406,6 +406,12 @@ static inline bool is_llvmpipe_device(ID3D12Device *device) return false; } +static inline bool is_llvmpipe_device_gte(ID3D12Device *device, + uint32_t major, uint32_t minor, uint32_t patch) +{ + return false; +} + static inline bool is_nvidia_device(ID3D12Device *device) { return false; @@ -564,7 +570,8 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } -static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceDriverPropertiesKHR *driver_properties) +static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceProperties *device_properties, + VkPhysicalDeviceDriverPropertiesKHR *driver_properties) { PFN_vkGetPhysicalDeviceProperties2KHR pfn_vkGetPhysicalDeviceProperties2KHR; VkPhysicalDeviceProperties2 device_properties2; @@ -588,6 +595,8 @@ static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceDriverPr device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; device_properties2.pNext = driver_properties; pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); + if (device_properties) + *device_properties = device_properties2.properties; return true; } @@ -618,7 +627,7 @@ LOAD_VK_PFN(vkGetInstanceProcAddr) if (SUCCEEDED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) { - if (get_driver_properties(device, &driver_properties)) + if (get_driver_properties(device, NULL, &driver_properties)) trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); ID3D12Device_Release(device); @@ -641,7 +650,7 @@ static inline bool is_mesa_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR || properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; } @@ -650,7 +659,7 @@ static inline bool is_mesa_intel_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; } @@ -658,15 +667,42 @@ static inline bool is_llvmpipe_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_MESA_LLVMPIPE; } +static inline bool is_llvmpipe_device_gte(ID3D12Device *device, + uint32_t major, uint32_t minor, uint32_t patch) +{ + VkPhysicalDeviceDriverPropertiesKHR driver_properties; + VkPhysicalDeviceProperties device_properties; + + get_driver_properties(device, &device_properties, &driver_properties); + if (driver_properties.driverID != VK_DRIVER_ID_MESA_LLVMPIPE) + return false; + + if (device_properties.driverVersion == 1) + { + uint32_t driver_major, driver_minor, driver_patch; + + /* llvmpipe doesn't provide a valid driverVersion value, so we resort to parsing the + * driverInfo string. */ + if (sscanf(driver_properties.driverInfo, "Mesa %u.%u.%u", + &driver_major, &driver_minor, &driver_patch) == 3) + { + device_properties.driverVersion = VK_MAKE_API_VERSION(0, + driver_major, driver_minor, driver_patch); + } + } + + return device_properties.driverVersion >= VK_MAKE_API_VERSION(0, major, minor, patch); +} + static inline bool is_nvidia_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; } @@ -674,7 +710,7 @@ static inline bool is_radv_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR; } @@ -682,7 +718,7 @@ static inline bool is_mvk_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_MOLTENVK; }

1 0

Giovanni Mascellani : tests: Print the device name.
by Alexandre Julliard 11 Apr '24

11 Apr '24

Module: vkd3d Branch: master Commit: ecd38f3d1bbd0330fb9b6bd866361dcde14f9c4d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ecd38f3d1bbd0330fb9b6bd866361… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 5 23:08:35 2024 +0200 tests: Print the device name. --- tests/d3d12_crosstest.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index a27b62e7..6b532bda 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -606,6 +606,7 @@ static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceProperti static void init_adapter_info(void) { VkPhysicalDeviceDriverPropertiesKHR driver_properties; + VkPhysicalDeviceProperties device_properties; struct vkd3d_instance *instance; ID3D12Device *device; void *libvulkan; @@ -627,8 +628,9 @@ LOAD_VK_PFN(vkGetInstanceProcAddr) if (SUCCEEDED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) { - if (get_driver_properties(device, NULL, &driver_properties)) - trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + if (get_driver_properties(device, &device_properties, &driver_properties)) + trace("Driver name: %s, driver info: %s, device name: %s.\n", driver_properties.driverName, + driver_properties.driverInfo, device_properties.deviceName); ID3D12Device_Release(device); }

1 0

Giovanni Mascellani : tests: Add llvmpipe among the Mesa drivers.
by Alexandre Julliard 11 Apr '24

11 Apr '24

Module: vkd3d Branch: master Commit: 59a5d8f852966713979060b901eaf362874c4994 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/59a5d8f852966713979060b901eaf… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 5 23:08:35 2024 +0200 tests: Add llvmpipe among the Mesa drivers. --- tests/d3d12_crosstest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 6b532bda..99641425 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -654,6 +654,7 @@ static inline bool is_mesa_device(ID3D12Device *device) get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR + || properties.driverID == VK_DRIVER_ID_MESA_LLVMPIPE || properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; }

1 0

Giovanni Mascellani : tests: Pop the test context when leaving its scope.
by Alexandre Julliard 11 Apr '24

11 Apr '24

Module: vkd3d Branch: master Commit: 0be29f78c0b0d321665b12d2458c06a168c763f9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0be29f78c0b0d321665b12d2458c0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 5 23:16:38 2024 +0200 tests: Pop the test context when leaving its scope. --- tests/d3d12.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0a55cddb..7108068b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32472,7 +32472,10 @@ static void test_resource_allocation_info(void) ok(infos1[i].SizeInBytes == sizes[i], "Got unexpected size %"PRIu64".\n", infos1[i].SizeInBytes); if (!i) + { + vkd3d_test_pop_context(); continue; + } ok(infos1[i].Offset - infos1[i - 1].Offset >= infos1[i - 1].SizeInBytes, "Got unexpected prev size %"PRIu64", prev offset %"PRIu64", offset %"PRIu64".\n",

1 0

Giovanni Mascellani : ci: Build Mesa for release.
by Alexandre Julliard 11 Apr '24

11 Apr '24

Module: vkd3d Branch: master Commit: 42f07352a071924d4ddf82a5f05741878b55ee8e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/42f07352a071924d4ddf82a5f0574… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 8 15:49:00 2024 +0200 ci: Build Mesa for release. Otherwise it trips on a few failed assertions in d3d12.c. --- gitlab/image.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/image.docker b/gitlab/image.docker index fb3ed626..9807e306 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -75,7 +75,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cd mesa && \ mkdir build && \ cd build && \ - meson setup -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \ + meson setup --buildtype release -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \ meson install && \ cd ../.. && \ rm -fr mesa && \

1 0

Paul Gofman : mmdevapi: Implement SAC_IsAudioObjectFormatSupported().
by Alexandre Julliard 11 Apr '24

11 Apr '24

Module: wine Branch: master Commit: aaad795901d8fe59fd94f9ff2390f4a32d6a4ad7 URL: https://gitlab.winehq.org/wine/wine/-/commit/aaad795901d8fe59fd94f9ff2390f4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Apr 2 20:16:29 2024 -0600 mmdevapi: Implement SAC_IsAudioObjectFormatSupported(). --- dlls/mmdevapi/spatialaudio.c | 67 +++++++++++++++++++++++++------------- dlls/mmdevapi/tests/spatialaudio.c | 21 ++++++++++++ 2 files changed, 66 insertions(+), 22 deletions(-) diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 23f3de31428..b721af6229b 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -49,6 +49,36 @@ static UINT32 AudioObjectType_to_index(AudioObjectType type) return o - 2; } +static const char *debugstr_fmtex(const WAVEFORMATEX *fmt) +{ + static char buf[2048]; + + if (!fmt) + { + strcpy(buf, "(null)"); + } + else if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + { + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%lx), rate: %lu, depth: %u", + fmt->wFormatTag, debugstr_guid(&fmtex->SubFormat), + fmt->nChannels, fmtex->dwChannelMask, fmt->nSamplesPerSec, + fmt->wBitsPerSample); + } + else + { + snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %lu, depth: %u", + fmt->wFormatTag, fmt->nChannels, fmt->nSamplesPerSec, + fmt->wBitsPerSample); + } + return buf; +} + +static BOOL formats_equal(const WAVEFORMATEX *fmt1, const WAVEFORMATEX *fmt2) +{ + return !memcmp(fmt1, fmt2, sizeof(*fmt1)) && !memcmp(fmt1 + 1, fmt2 + 1, fmt1->cbSize); +} + typedef struct SpatialAudioImpl SpatialAudioImpl; typedef struct SpatialAudioStreamImpl SpatialAudioStreamImpl; typedef struct SpatialAudioObjectImpl SpatialAudioObjectImpl; @@ -610,9 +640,20 @@ static HRESULT WINAPI SAC_GetMaxFrameCount(ISpatialAudioClient *iface, static HRESULT WINAPI SAC_IsAudioObjectFormatSupported(ISpatialAudioClient *iface, const WAVEFORMATEX *format) { - SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); - FIXME("(%p)->(%p)\n", This, format); - return E_NOTIMPL; + SpatialAudioImpl *sac = impl_from_ISpatialAudioClient(iface); + + TRACE("sac %p, format %s.\n", sac, debugstr_fmtex(format)); + + if (!format) + return E_POINTER; + + if (!formats_equal(&sac->object_fmtex.Format, format)) + { + FIXME("Reporting format %s as unsupported.\n", debugstr_fmtex(format)); + return E_INVALIDARG; + } + + return S_OK; } static HRESULT WINAPI SAC_IsSpatialAudioStreamAvailable(ISpatialAudioClient *iface, @@ -630,23 +671,6 @@ static WAVEFORMATEX *clone_fmtex(const WAVEFORMATEX *src) return r; } -static const char *debugstr_fmtex(const WAVEFORMATEX *fmt) -{ - static char buf[2048]; - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; - snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%lx), rate: %lu, depth: %u", - fmt->wFormatTag, debugstr_guid(&fmtex->SubFormat), - fmt->nChannels, fmtex->dwChannelMask, fmt->nSamplesPerSec, - fmt->wBitsPerSample); - }else{ - snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %lu, depth: %u", - fmt->wFormatTag, fmt->nChannels, fmt->nSamplesPerSec, - fmt->wBitsPerSample); - } - return buf; -} - static void static_mask_to_channels(AudioObjectType static_mask, WORD *count, DWORD *mask, UINT32 *map) { UINT32 out_chan = 0, map_idx = 0; @@ -776,8 +800,7 @@ static HRESULT WINAPI SAC_ActivateSpatialAudioStream(ISpatialAudioClient *iface, return E_INVALIDARG; } - if(!params->ObjectFormat || - memcmp(params->ObjectFormat, &This->object_fmtex.Format, sizeof(*params->ObjectFormat) + params->ObjectFormat->cbSize)){ + if(!(params->ObjectFormat && formats_equal(params->ObjectFormat, &This->object_fmtex.Format))) { *stream = NULL; return AUDCLNT_E_UNSUPPORTED_FORMAT; } diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c index a382b57e7a2..4d8073d49ce 100644 --- a/dlls/mmdevapi/tests/spatialaudio.c +++ b/dlls/mmdevapi/tests/spatialaudio.c @@ -64,6 +64,27 @@ static void test_formats(void) ok(fmt->nAvgBytesPerSec == 192000, "Wrong avg bytes per sec, expected 192000 got %lu\n", fmt->nAvgBytesPerSec); ok(fmt->cbSize == 0, "Wrong cbSize for simple format, expected 0, got %hu\n", fmt->cbSize); + hr = ISpatialAudioClient_IsAudioObjectFormatSupported(sac, NULL); + ok(hr == E_POINTER, "Got %#lx.\n", hr); + + memcpy(&format, fmt, sizeof(format)); + hr = ISpatialAudioClient_IsAudioObjectFormatSupported(sac, &format); + ok(hr == S_OK, "Got %#lx.\n", hr); + + format.nBlockAlign *= 2; + hr = ISpatialAudioClient_IsAudioObjectFormatSupported(sac, &format); + todo_wine ok(hr == S_OK, "Got %#lx.\n", hr); + + memcpy(&format, fmt, sizeof(format)); + format.wBitsPerSample *= 2; + hr = ISpatialAudioClient_IsAudioObjectFormatSupported(sac, &format); + ok(hr == E_INVALIDARG, "Got %#lx.\n", hr); + + memcpy(&format, fmt, sizeof(format)); + format.nChannels = 2; + hr = ISpatialAudioClient_IsAudioObjectFormatSupported(sac, &format); + ok(hr == E_INVALIDARG, "Got %#lx.\n", hr); + memcpy(&format, fmt, sizeof(format)); IAudioFormatEnumerator_Release(afe);

1 0

Zhiyi Zhang : opengl32/tests: Add default framebuffer tests.
by Alexandre Julliard 11 Apr '24

11 Apr '24

Module: wine Branch: master Commit: 1cbc85c436ee82e8bbe86bb938aa75463aec6620 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cbc85c436ee82e8bbe86bb938aa75… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 11 14:57:48 2024 +0800 opengl32/tests: Add default framebuffer tests. --- dlls/opengl32/tests/opengl.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 74aff6b4bbd..7647ae6aa11 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -53,8 +53,29 @@ static void (WINAPI *pglDebugMessageCallbackARB)(void *, void *); static void (WINAPI *pglDebugMessageControlARB)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); static void (WINAPI *pglDebugMessageInsertARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const char *); +/* GL_ARB_framebuffer_object */ +static void (WINAPI *pglBindFramebuffer)(GLenum target, GLuint framebuffer); +static GLenum (WINAPI *pglCheckFramebufferStatus)(GLenum target); + static const char* wgl_extensions = NULL; +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + static void init_functions(void) { #define GET_PROC(func) \ @@ -90,6 +111,10 @@ static void init_functions(void) GET_PROC(glDebugMessageControlARB) GET_PROC(glDebugMessageInsertARB) + /* GL_ARB_framebuffer_object */ + GET_PROC(glBindFramebuffer) + GET_PROC(glCheckFramebufferStatus) + #undef GET_PROC } @@ -1335,6 +1360,72 @@ static void test_minimized(void) DestroyWindow(window); } +static void test_framebuffer(void) +{ + static const PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + GLenum status; + HWND window; + HGLRC ctx; + BOOL ret; + HDC dc; + + /* Test the default framebuffer status for a window that becomes visible after wglMakeCurrent() */ + window = CreateWindowA("static", "opengl32_test", WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create window, last error %#lx.\n", GetLastError()); + dc = GetDC(window); + ok(!!dc, "Failed to get DC.\n"); + pixel_format = ChoosePixelFormat(dc, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window, dc); + DestroyWindow(window); + return; + } + + ret = SetPixelFormat(dc, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#lx.\n", GetLastError()); + ctx = wglCreateContext(dc); + ok(!!ctx, "Failed to create GL context, last error %#lx.\n", GetLastError()); + ret = wglMakeCurrent(dc, ctx); + ok(ret, "Failed to make context current, last error %#lx.\n", GetLastError()); + + ShowWindow(window, SW_SHOW); + flush_events(); + + pglBindFramebuffer(GL_FRAMEBUFFER, 0); + + status = pglCheckFramebufferStatus(GL_FRAMEBUFFER); + todo_wine_if(status == GL_FRAMEBUFFER_UNDEFINED) /* macOS */ + ok(status == GL_FRAMEBUFFER_COMPLETE, "Expected %#x, got %#x.\n", GL_FRAMEBUFFER_COMPLETE, status); + + ret = wglMakeCurrent(NULL, NULL); + ok(ret, "Failed to clear current context, last error %#lx.\n", GetLastError()); + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#lx.\n", GetLastError()); + ReleaseDC(window, dc); + DestroyWindow(window); +} + static void test_window_dc(void) { PIXELFORMATDESCRIPTOR pf_desc = @@ -2162,6 +2253,7 @@ START_TEST(opengl) test_colorbits(hdc); test_gdi_dbuf(hdc); test_acceleration(hdc); + test_framebuffer(); wgl_extensions = pwglGetExtensionsStringARB(hdc); if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n");

1 0

Zhiyi Zhang : winemac.drv: Update OpenGL context immediately after the window content view is visible.
by Alexandre Julliard 11 Apr '24

11 Apr '24

Module: wine Branch: master Commit: ceefcca7ad4cf8dee0dd1344b22b90d6e2344973 URL: https://gitlab.winehq.org/wine/wine/-/commit/ceefcca7ad4cf8dee0dd1344b22b90… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 11 10:00:47 2024 +0800 winemac.drv: Update OpenGL context immediately after the window content view is visible. Fix errors such as GL_FRAMEBUFFER_UNDEFINED and GL_INVALID_FRAMEBUFFER_OPERATION for OpenGL functions when the default framebuffer 0 is bound on macOS. These errors happen because the NSOpenGLContext doesn't have a view bound at the time of an OpenGL call. The view could not be set for the NSOpenGLContext because the window or view can still be invisible. Setting an invisible view for the NSOpenGLContext can generate invalid drawable messages as 682ed910 has shown. Thus setting the view could be deferred because the NSOpenGLContext needs a visible view. However, right after the window becomes visible, an OpenGL function that involves the default framebuffer can be called. And when the view is still not set at the time of the OpenGL call, errors such as GL_FRAMEBUFFER_UNDEFINED and GL_INVALID_FRAMEBUFFER_OPERATION could happen and result in rendering errors such as black screen. So we need to set the view for the NSOpenGLContext as soon as the view becomes visible. It's possible that the window and view are still invisible when OpenGL functions involving the default framebuffer get called. In such cases, I think errors like GL_FRAMEBUFFER_UNDEFINED are justified on macOS. Fix Active Trader Pro black screen at launch on macOS. The application creates a d3d9 device with an invisible window. And then it shows the window before calling d3d9_swapchain_Present(). So all the [NSOpenGLContext setView] opportunities are missed and no view is set. Then when glBlitFramebuffer() gets called, GL_FRAMEBUFFER_UNDEFINED happens and so nothing is rendered. The application only renders one frame before login so the window remains black. --- dlls/opengl32/tests/opengl.c | 1 - dlls/winemac.drv/cocoa_opengl.m | 7 ++++++- dlls/winemac.drv/cocoa_window.m | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 7647ae6aa11..ebeefffb72c 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1415,7 +1415,6 @@ static void test_framebuffer(void) pglBindFramebuffer(GL_FRAMEBUFFER, 0); status = pglCheckFramebufferStatus(GL_FRAMEBUFFER); - todo_wine_if(status == GL_FRAMEBUFFER_UNDEFINED) /* macOS */ ok(status == GL_FRAMEBUFFER_COMPLETE, "Expected %#x, got %#x.\n", GL_FRAMEBUFFER_COMPLETE, status); ret = wglMakeCurrent(NULL, NULL); diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 31a1f28970b..fa69be7d927 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -83,7 +83,12 @@ macdrv_set_view_backing_size((macdrv_view)self.view, view_backing); NSView* save = self.view; - OnMainThread(^{ + if ([NSThread isMainThread]) + { + [super clearDrawable]; + [super setView:save]; + } + else OnMainThread(^{ [super clearDrawable]; [super setView:save]; }); diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1655ea98ef7..9d2a53c60ae 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -570,6 +570,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi clearedGlSurface = TRUE; } context.needsUpdate = TRUE; + macdrv_update_opengl_context(context); } [glContexts addObjectsFromArray:pendingGlContexts]; [pendingGlContexts removeAllObjects];

1 0

Nikolay Sivov : d2d1: Implement GetEffectProperties().
by Alexandre Julliard 11 Apr '24

11 Apr '24

Module: wine Branch: master Commit: ce3d3f751a804a7c805bd77dc0e959ee234da72e URL: https://gitlab.winehq.org/wine/wine/-/commit/ce3d3f751a804a7c805bd77dc0e959… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 10 14:56:07 2024 +0200 d2d1: Implement GetEffectProperties(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 4 ++- dlls/d2d1/effect.c | 61 +++++++++++++++++--------------- dlls/d2d1/factory.c | 65 +++++++++++++++++++++++----------- dlls/d2d1/tests/d2d1.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+), 51 deletions(-)

1 0

Nikolay Sivov : d2d1/effect: Add 'Rect' property to the Crop effect description.
by Alexandre Julliard 11 Apr '24

11 Apr '24

Module: wine Branch: master Commit: d05cfdd7776c73db8e7088a11cee54b97f6c2cc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d05cfdd7776c73db8e7088a11cee54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 10 23:31:51 2024 +0200 d2d1/effect: Add 'Rect' property to the Crop effect description. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 1 + dlls/d2d1/tests/d2d1.c | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index f2d6ffb9aec..b6ef46652af 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -904,6 +904,7 @@ L"<?xml version='1.0'?> \ <Inputs > \ <Input name='Source'/> \ </Inputs> \ + <Property name='Rect' type='vector4' /> \ </Effect>"; static const WCHAR shadow_description[] = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4c544d90347..7bf1f8390e3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -14746,17 +14746,14 @@ static void test_get_effect_properties(BOOL d3d11) ok(count == 2, "Unexpected property count %u.\n", count); hr = ID2D1Properties_GetPropertyName(properties, 0, buffW, ARRAY_SIZE(buffW)); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ok(!wcscmp(buffW, L"Rect"), "Unexpected name %s.\n", debugstr_w(buffW)); + ok(!wcscmp(buffW, L"Rect"), "Unexpected name %s.\n", debugstr_w(buffW)); count = ID2D1Properties_GetPropertyNameLength(properties, 0); todo_wine ok(count == 4, "Unexpected name length %u.\n", count); type = ID2D1Properties_GetType(properties, 0); - todo_wine ok(type == D2D1_PROPERTY_TYPE_VECTOR4, "Unexpected property type %u.\n", type); index = ID2D1Properties_GetPropertyIndex(properties, L"prop"); @@ -14765,7 +14762,6 @@ static void test_get_effect_properties(BOOL d3d11) set_vec4(&rect, 0.0f, 2.0f, 10.0f, 20.0f); hr = ID2D1Properties_SetValue(properties, D2D1_CROP_PROP_RECT, D2D1_PROPERTY_TYPE_VECTOR4, (const BYTE *)&rect, sizeof(rect)); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = ID2D1Properties_SetValue(properties, 1000, D2D1_PROPERTY_TYPE_VECTOR4, @@ -14776,10 +14772,8 @@ static void test_get_effect_properties(BOOL d3d11) set_vec4(&rect, 0.0f, .0f, 0.0f, 0.0f); hr = ID2D1Properties_GetValue(properties, D2D1_CROP_PROP_RECT, D2D1_PROPERTY_TYPE_VECTOR4, (BYTE *)&rect2, sizeof(rect2)); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - ok(!memcmp(&rect, &rect2, sizeof(rect)), "Unexpected value.\n"); + ok(!memcmp(&rect, &rect2, sizeof(rect)), "Unexpected value.\n"); ID2D1Properties_Release(properties);

1 0