June 2020 - Wine-devel - list.winehq.org

[PATCH 3/3] directmanipulation/tests: Initial tests
by Vijay Kiran Kamuju 15 Jun '20

15 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/3] directmanipulation: Implement IDirectManipulationManager2::GetUpdateManager.
by Vijay Kiran Kamuju 15 Jun '20

15 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] directmanipulation: Create DirectManipulationManager and DirectManipulationSharedManager objects
by Vijay Kiran Kamuju 15 Jun '20

15 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44865 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/3] d3drm: Set alpha to 255 for light colors.
by Jeff Smith 15 Jun '20

15 Jun '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/light.c | 2 +- dlls/d3drm/tests/d3drm.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 2f53f200aa..675dcaa0b5 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -165,7 +165,7 @@ static HRESULT WINAPI d3drm_light_SetColor(IDirect3DRMLight *iface, D3DCOLOR col TRACE("iface %p, color 0x%08x.\n", iface, color); - light->color = color; + light->color = 0xff000000 | color; return D3DRM_OK; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 25e9b4e0ac..5dda28cb8a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2589,6 +2589,11 @@ static void test_Light(void) color = IDirect3DRMLight_GetColor(light); ok(color == 0xff180587, "wrong color (%x)\n", color); + hr = IDirect3DRMLight_SetColor(light, 0x00c0c0c0); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + color = IDirect3DRMLight_GetColor(light); + ok(color == 0xffc0c0c0, "wrong color (%x)\n", color); + hr = IDirect3DRMLight_SetColorRGB(light, 0.5, 0.5, 0.5); ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); color = IDirect3DRMLight_GetColor(light); -- 2.23.0

1 2

[PATCH 1/5] wined3d: Store texture user memory pointer per sub resource.
by Paul Gofman 15 Jun '20

15 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wined3d/texture.c | 19 +++++++++++++------ dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 84020f17c95..5fa79691368 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -735,7 +735,7 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su } if (locations & WINED3D_LOCATION_USER_MEMORY) { - data->addr = texture->user_memory; + data->addr = texture->sub_resources[sub_resource_idx].user_memory; data->buffer_object = 0; return; } @@ -1416,6 +1416,7 @@ static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) { + unsigned int i, sub_resource_count; ULONG refcount; TRACE("texture %p, swapchain %p.\n", texture, texture->swapchain); @@ -1432,8 +1433,14 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) * since the application is allowed to free that memory once the * texture is destroyed. Note that this implies that * the destroy handler can't access that memory either. */ - if (texture->user_memory) + sub_resource_count = texture->layer_count * texture->level_count; + for (i = 0; i < sub_resource_count; ++i) + if (texture->sub_resources[i].user_memory) + break; + + if (i < sub_resource_count) wined3d_resource_wait_idle(&texture->resource); + texture->resource.device->adapter->adapter_ops->adapter_destroy_texture(texture); } @@ -1872,7 +1879,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } } - if ((texture->user_memory = mem)) + if ((texture->sub_resources[0].user_memory = mem)) { texture->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; valid_location = WINED3D_LOCATION_USER_MEMORY; @@ -3126,7 +3133,7 @@ static BOOL wined3d_texture_gl_prepare_location(struct wined3d_texture *texture, return wined3d_resource_prepare_sysmem(&texture->resource); case WINED3D_LOCATION_USER_MEMORY: - if (!texture->user_memory) + if (!texture->sub_resources[sub_resource_idx].user_memory) ERR("Preparing WINED3D_LOCATION_USER_MEMORY, but texture->user_memory is NULL.\n"); return TRUE; @@ -4437,7 +4444,7 @@ static BOOL wined3d_texture_no3d_prepare_location(struct wined3d_texture *textur return wined3d_resource_prepare_sysmem(&texture->resource); case WINED3D_LOCATION_USER_MEMORY: - if (!texture->user_memory) + if (!texture->sub_resources[sub_resource_idx].user_memory) ERR("Preparing WINED3D_LOCATION_USER_MEMORY, but texture->user_memory is NULL.\n"); return TRUE; @@ -5081,7 +5088,7 @@ static BOOL wined3d_texture_vk_prepare_location(struct wined3d_texture *texture, return wined3d_resource_prepare_sysmem(&texture->resource); case WINED3D_LOCATION_USER_MEMORY: - if (!texture->user_memory) + if (!texture->sub_resources[sub_resource_idx].user_memory) ERR("Preparing WINED3D_LOCATION_USER_MEMORY, but texture->user_memory is NULL.\n"); return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17acd4be4d5..dd4d34b08f7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4060,7 +4060,6 @@ struct wined3d_texture DWORD flags; DWORD update_map_binding; - void *user_memory; unsigned int row_pitch; unsigned int slice_pitch; @@ -4113,6 +4112,8 @@ struct wined3d_texture uint32_t map_flags; DWORD locations; struct wined3d_bo_gl bo; + + void *user_memory; } *sub_resources; }; -- 2.26.2

3 12

[PATCH] wined3d: Do not explicitly check 3D depth/stencil capabilities in wined3d_check_device_format().
by Henri Verbeet 15 Jun '20

15 Jun '20

WINED3D_RTYPE_NONE checks both 2D and 3D resource capabilities, but has special handling for 3D depth/stencil capabilities. For WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_DEPTH_STENCIL is not an allowed bind flag, so we never get here. This fixes a regression introduced by commit 9b8847ed7b0f15c444c34034d311a8d79b3b06c8. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f4094c8fba2..efae3444eec 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1679,13 +1679,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, for (; gl_type <= gl_type_end; ++gl_type) { - if ((format->flags[gl_type] & format_flags) != format_flags) - { - TRACE("Requested format flags %#x, but format %s only has %#x.\n", - format_flags, debug_d3dformat(check_format_id), format->flags[gl_type]); - return WINED3DERR_NOTAVAILABLE; - } - if ((bind_flags & WINED3D_BIND_RENDER_TARGET) && !adapter->adapter_ops->adapter_check_format(adapter, adapter_format, format, NULL)) { @@ -1706,6 +1699,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, return WINED3DERR_NOTAVAILABLE; } + if ((format->flags[gl_type] & format_flags) != format_flags) + { + TRACE("Requested format flags %#x, but format %s only has %#x.\n", + format_flags, debug_d3dformat(check_format_id), format->flags[gl_type]); + return WINED3DERR_NOTAVAILABLE; + } + if (!(format->flags[gl_type] & WINED3DFMT_FLAG_GEN_MIPMAP)) mipmap_gen_supported = FALSE; } -- 2.20.1

1 0

[PATCH 1/2] gdiplus/tests: Test hatch brush patterns.
by Jeff Smith 15 Jun '20

15 Jun '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/brush.c | 222 +++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index b8067c735c..35f99524b0 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1634,6 +1634,226 @@ static void test_getHatchStyle(void) GdipDeleteBrush((GpBrush *)brush); } +static void test_hatchBrushStyles(void) +{ + static const struct + { + short pattern[8]; + GpHatchStyle hs; + BOOL todo; + } + styles[] = + { + { {0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff}, HatchStyleHorizontal, TRUE }, + { {0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xc000}, HatchStyleVertical, TRUE }, + { {0x4006, 0x0019, 0x0064, 0x0190, 0x0640, 0x1900, 0x6400, 0x9001}, HatchStyleForwardDiagonal, TRUE }, + { {0x9001, 0x6400, 0x1900, 0x0640, 0x0190, 0x0064, 0x0019, 0x4006}, HatchStyleBackwardDiagonal, TRUE }, + { {0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xc000, 0xffff}, HatchStyleCross, TRUE }, + { {0x9006, 0x6419, 0x1964, 0x0690, 0x0690, 0x1964, 0x6419, 0x9006}, HatchStyleDiagonalCross, TRUE }, + { {0x0000, 0x0000, 0x0000, 0x00c0, 0x0000, 0x0000, 0x0000, 0xc000}, HatchStyle05Percent }, + { {0x0000, 0x00c0, 0x0000, 0xc000, 0x0000, 0x00c0, 0x0000, 0xc000}, HatchStyle10Percent, TRUE }, + { {0x0000, 0x0c0c, 0x0000, 0xc0c0, 0x0000, 0x0c0c, 0x0000, 0xc0c0}, HatchStyle20Percent, TRUE }, + { {0x0c0c, 0xc0c0, 0x0c0c, 0xc0c0, 0x0c0c, 0xc0c0, 0x0c0c, 0xc0c0}, HatchStyle25Percent, TRUE }, + { {0x0303, 0xcccc, 0x3030, 0xcccc, 0x0303, 0xcccc, 0x3030, 0xcccc}, HatchStyle30Percent, TRUE }, + { {0x0333, 0xcccc, 0x3333, 0xcccc, 0x3303, 0xcccc, 0x3333, 0xcccc}, HatchStyle40Percent, TRUE }, + { {0x3333, 0xcccc, 0x3333, 0xcccc, 0x3333, 0xcccc, 0x3333, 0xcccc}, HatchStyle50Percent, TRUE }, + { {0x3333, 0xcfcf, 0x3333, 0xfcfc, 0x3333, 0xcfcf, 0x3333, 0xfcfc}, HatchStyle60Percent, TRUE }, + { {0xf3f3, 0x3f3f, 0xf3f3, 0x3f3f, 0xf3f3, 0x3f3f, 0xf3f3, 0x3f3f}, HatchStyle70Percent, TRUE }, + { {0xffff, 0xf3f3, 0xffff, 0x3f3f, 0xffff, 0xf3f3, 0xffff, 0x3f3f}, HatchStyle75Percent, TRUE }, + { {0xffff, 0xfffc, 0xffff, 0xfcff, 0xffff, 0xfffc, 0xffff, 0xfcff}, HatchStyle80Percent, TRUE }, + { {0x3fff, 0xffff, 0xffff, 0xffff, 0xff3f, 0xffff, 0xffff, 0xffff}, HatchStyle90Percent, TRUE }, + { {0x0303, 0x0c0c, 0x3030, 0xc0c0, 0x0303, 0x0c0c, 0x3030, 0xc0c0}, HatchStyleLightDownwardDiagonal }, + { {0xc0c0, 0x3030, 0x0c0c, 0x0303, 0xc0c0, 0x3030, 0x0c0c, 0x0303}, HatchStyleLightUpwardDiagonal }, + { {0xc3c3, 0x0f0f, 0x3c3c, 0xf0f0, 0xc3c3, 0x0f0f, 0x3c3c, 0xf0f0}, HatchStyleDarkDownwardDiagonal }, + { {0xc3c3, 0xf0f0, 0x3c3c, 0x0f0f, 0xc3c3, 0xf0f0, 0x3c3c, 0x0f0f}, HatchStyleDarkUpwardDiagonal, TRUE }, + { {0xc00f, 0x003f, 0x00fc, 0x03f0, 0x0fc0, 0x3f00, 0xfc00, 0xf003}, HatchStyleWideDownwardDiagonal, TRUE }, + { {0xf003, 0xfc00, 0x3f00, 0x0fc0, 0x03f0, 0x00fc, 0x003f, 0xc00f}, HatchStyleWideUpwardDiagonal, TRUE }, + { {0xc0c0, 0xc0c0, 0xc0c0, 0xc0c0, 0xc0c0, 0xc0c0, 0xc0c0, 0xc0c0}, HatchStyleLightVertical }, + { {0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0xffff}, HatchStyleLightHorizontal }, + { {0x3333, 0x3333, 0x3333, 0x3333, 0x3333, 0x3333, 0x3333, 0x3333}, HatchStyleNarrowVertical, TRUE }, + { {0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff}, HatchStyleNarrowHorizontal }, + { {0xf0f0, 0xf0f0, 0xf0f0, 0xf0f0, 0xf0f0, 0xf0f0, 0xf0f0, 0xf0f0}, HatchStyleDarkVertical }, + { {0x0000, 0x0000, 0xffff, 0xffff, 0x0000, 0x0000, 0xffff, 0xffff}, HatchStyleDarkHorizontal }, + { {0x0000, 0x0000, 0x0303, 0x0c0c, 0x3030, 0xc0c0, 0x0000, 0x0000}, HatchStyleDashedDownwardDiagonal, TRUE }, + { {0x0000, 0x0000, 0xc0c0, 0x3030, 0x0c0c, 0x0303, 0x0000, 0x0000}, HatchStyleDashedUpwardDiagonal, TRUE }, + { {0x0000, 0x0000, 0x0000, 0x00ff, 0x0000, 0x0000, 0x0000, 0xff00}, HatchStyleDashedHorizontal, TRUE }, + { {0x00c0, 0x00c0, 0x00c0, 0x00c0, 0xc000, 0xc000, 0xc000, 0xc000}, HatchStyleDashedVertical, TRUE }, + { {0x0030, 0x0c00, 0x0003, 0x0300, 0x000c, 0x3000, 0x00c0, 0xc000}, HatchStyleSmallConfetti, TRUE }, + { {0xc0f3, 0x00f0, 0xf000, 0xf3c0, 0x03cf, 0x000f, 0x0f00, 0xcf03}, HatchStyleLargeConfetti, TRUE }, + { {0x03c0, 0x0c30, 0x300c, 0xc003, 0x03c0, 0x0c30, 0x300c, 0xc003}, HatchStyleZigZag, TRUE }, + { {0xf000, 0x0c33, 0x03c0, 0x0000, 0xf000, 0x0c33, 0x03c0, 0x0000}, HatchStyleWave, TRUE }, + { {0xc003, 0x300c, 0x0c30, 0x03c0, 0x00c0, 0x0030, 0x000c, 0x0003}, HatchStyleDiagonalBrick, TRUE }, + { {0x00c0, 0x00c0, 0x00c0, 0xffff, 0xc000, 0xc000, 0xc000, 0xffff}, HatchStyleHorizontalBrick, TRUE }, + { {0x3303, 0x0c0c, 0x0330, 0xc0c0, 0x3033, 0x0c0c, 0x3330, 0xc0c0}, HatchStyleWeave, TRUE }, + { {0xff00, 0xff00, 0xff00, 0xff00, 0x3333, 0xcccc, 0x3333, 0xcccc}, HatchStylePlaid, TRUE }, + { {0xc000, 0x0003, 0xc000, 0x0000, 0x0300, 0x00c0, 0x0300, 0x0000}, HatchStyleDivot, TRUE }, + { {0x0000, 0xc000, 0x0000, 0xc000, 0x0000, 0xc000, 0x0000, 0xcccc}, HatchStyleDottedGrid, TRUE }, + { {0x0000, 0x0c0c, 0x0000, 0x00c0, 0x0000, 0x0c0c, 0x0000, 0xc000}, HatchStyleDottedDiamond, TRUE }, + { {0x0003, 0x0003, 0x000c, 0x00f0, 0x0f00, 0x30c0, 0xc030, 0x000f}, HatchStyleShingle, TRUE }, + { {0xc3c3, 0xffff, 0x3c3c, 0xffff, 0xc3c3, 0xffff, 0x3c3c, 0xffff}, HatchStyleTrellis, TRUE }, + { {0xffc0, 0xffc0, 0xc3c0, 0x3f3f, 0xc0ff, 0xc0ff, 0xc0c3, 0x3f3f}, HatchStyleSphere, TRUE }, + { {0xc0c0, 0xc0c0, 0xc0c0, 0xffff, 0xc0c0, 0xc0c0, 0xc0c0, 0xffff}, HatchStyleSmallGrid, TRUE }, + { {0xc3c3, 0x3c3c, 0x3c3c, 0xc3c3, 0xc3c3, 0x3c3c, 0x3c3c, 0xc3c3}, HatchStyleSmallCheckerBoard, TRUE }, + { {0x00ff, 0x00ff, 0x00ff, 0x00ff, 0xff00, 0xff00, 0xff00, 0xff00}, HatchStyleLargeCheckerBoard, TRUE }, + { {0x0003, 0xc00c, 0x3030, 0x0cc0, 0x0300, 0x0cc0, 0x3030, 0xc00c}, HatchStyleOutlinedDiamond, TRUE }, + { {0x0000, 0x0300, 0x0fc0, 0x3ff0, 0xfffc, 0x3ff0, 0x0fc0, 0x0300}, HatchStyleSolidDiamond, TRUE }, + }; + static const ARGB colors[] = { 0xffffffff, 0xffbfbfbf, 0xff151515, 0xff000000 }; + static const int width = 16, height = 16; + GpStatus status; + GpGraphics *graphics; + GpBitmap *bitmap; + GpHatch *brush = NULL; + BOOL match; + int x, y; + int i; + + status = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppRGB, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage *)bitmap, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected the graphics context to be initialized.\n"); + status = GdipSetCompositingMode(graphics, CompositingModeSourceCopy); + expect(Ok, status); + + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + status = GdipCreateHatchBrush(styles[i].hs, colors[3], colors[0], &brush); + expect(Ok, status); + ok(brush != NULL, "Expected the brush to be initialized.\n"); + status = GdipFillRectangleI(graphics, (GpBrush *)brush, 0, 0, width, height); + expect(Ok, status); + status = GdipDeleteBrush((GpBrush *)brush); + expect(Ok, status); + brush = NULL; + + match = TRUE; + for(y = 0; y < width && match; y++) + { + for(x = 0; x < height && match; x++) + { + ARGB color; + int cindex = (styles[i].pattern[7-(y%8)] >> (2*(7-(x%8)))) & 3; + + GdipBitmapGetPixel(bitmap, x, y, &color); + if (color != colors[cindex]) + match = FALSE; + } + } + todo_wine_if(styles[i].todo) ok(match, "Unexpected pattern for hatch style %#x.\n", styles[i].hs); + } + + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + status = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, status); +} + +static void test_hatchBrushColors(void) +{ + /* Foreground color, background color, + * resulting 4 colors with non-alpha surface, + * resulting 4 colors with alpha surface + */ + static const ARGB colors[][10] = { + { 0xff000000, 0xffffffff, + 0xffffffff, 0xffbfbfbf, 0xff151515, 0xff000000, + 0xffffffff, 0xffbfbfbf, 0xff151515, 0xff000000 }, + { 0xffffffff, 0xff000000, + 0xff000000, 0xff3f3f3f, 0xffe9e9e9, 0xffffffff, + 0xff000000, 0xff3f3f3f, 0xffe9e9e9, 0xffffffff }, + { 0xffd2d2d2, 0xff000000, + 0xff000000, 0xff343434, 0xffbfbfbf, 0xffd2d2d2, + 0xff000000, 0xff343434, 0xffbfbfbf, 0xffd2d2d2 }, + { 0xfefbfbfb, 0x00070707, + 0xff000000, 0xff3e3e3e, 0xffe4e4e4, 0xfffafafa, + 0x00000000, 0x3ffafafa, 0xe8fafafa, 0xfefafafa }, + }; + static const int width = 16, height = 8; + static const int pixel_coord[][2] = { + {12, 1}, {1, 0}, {0, 0}, {8, 0} + }; + HDC hdc; + GpStatus status; + GpGraphics *graphics_hdc; + GpGraphics *graphics_image; + GpGraphics *graphics_image_a; + GpBitmap *bitmap; + GpBitmap *bitmap_a; + GpHatch *brush_diag_cross; + GpHatch *brush_cross; + int i, j; + + hdc = GetDC(hwnd); + status = GdipCreateFromHDC(hdc, &graphics_hdc); + expect(Ok, status); + status = GdipSetCompositingMode(graphics_hdc, CompositingModeSourceCopy); + expect(Ok, status); + + status = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppRGB, NULL, &bitmap); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage *)bitmap, &graphics_image); + expect(Ok, status); + status = GdipSetCompositingMode(graphics_image, CompositingModeSourceCopy); + expect(Ok, status); + + status = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppARGB, NULL, &bitmap_a); + expect(Ok, status); + status = GdipGetImageGraphicsContext((GpImage *)bitmap_a, &graphics_image_a); + expect(Ok, status); + status = GdipSetCompositingMode(graphics_image_a, CompositingModeSourceCopy); + expect(Ok, status); + + for (i = 0; i < ARRAY_SIZE(colors); i++) + { + status = GdipCreateHatchBrush(HatchStyleDiagonalCross, colors[i][0], colors[i][1], + &brush_diag_cross); + expect(Ok, status); + status = GdipCreateHatchBrush(HatchStyleCross, colors[i][0], colors[i][1], + &brush_cross); + expect(Ok, status); + + GdipFillRectangleI(graphics_hdc, (GpBrush *)brush_diag_cross, 0, 0, width/2, height); + GdipFillRectangleI(graphics_image, (GpBrush *)brush_diag_cross, 0, 0, width/2, height); + GdipFillRectangleI(graphics_image_a, (GpBrush *)brush_diag_cross, 0, 0, width/2, height); + GdipFillRectangleI(graphics_hdc, (GpBrush *)brush_cross, width/2, 0, width/2, height); + GdipFillRectangleI(graphics_image, (GpBrush *)brush_cross, width/2, 0, width/2, height); + GdipFillRectangleI(graphics_image_a, (GpBrush *)brush_cross, width/2, 0, width/2, height); + + GdipDeleteBrush((GpBrush *)brush_diag_cross); + GdipDeleteBrush((GpBrush *)brush_cross); + + for (j = 0; j < 4; j++) + { + ARGB color; + const ARGB exp_color = colors[i][j+2]; + const ARGB exp_color_a = colors[i][j+6]; + const int x = pixel_coord[j][0]; + const int y = pixel_coord[j][1]; + + color = 0xff000000 | GetPixel(hdc, x, y); + todo_wine ok(color == exp_color, "For hwnd (%d, %d) colorset %d expected %08x, got %08x.\n", + x, y, i, exp_color, color); + + GdipBitmapGetPixel(bitmap, x, y, &color); + todo_wine ok(color == exp_color, "For rgb image (%d, %d) colorset %d expected %08x, got %08x.\n", + x, y, i, exp_color, color); + + GdipBitmapGetPixel(bitmap_a, x, y, &color); + todo_wine ok(color == exp_color_a, "For argb image (%d, %d) colorset %d expected %08x, got %08x.\n", + x, y, i, exp_color_a, color); + } + } + + GdipDeleteGraphics(graphics_image); + GdipDeleteGraphics(graphics_image_a); + GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage((GpImage*)bitmap_a); + + ReleaseDC(hwnd, hdc); + GdipDeleteGraphics(graphics_hdc); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1686,6 +1906,8 @@ START_TEST(brush) test_pathgradientpresetblend(); test_pathgradientblend(); test_getHatchStyle(); + test_hatchBrushStyles(); + test_hatchBrushColors(); GdiplusShutdown(gdiplusToken); DestroyWindow(hwnd); -- 2.23.0

2 28

[PATCH] winex11.drv: Change whitelist to a more neutral word
by André Hentschel 15 Jun '20

15 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/winex11.drv/wintab.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 92f957cf8d7..5cfc2b3a38d 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -394,7 +394,7 @@ static BOOL match_token(const char *haystack, const char *needle) static BOOL is_tablet_cursor(const char *name, const char *type) { int i; - static const char *tablet_cursor_whitelist[] = { + static const char *tablet_cursor_allowlist[] = { "wacom", "wizardpen", "acecad", @@ -406,10 +406,10 @@ static BOOL is_tablet_cursor(const char *name, const char *type) NULL }; - for (i=0; tablet_cursor_whitelist[i] != NULL; i++) { - if (name && match_token(name, tablet_cursor_whitelist[i])) + for (i=0; tablet_cursor_allowlist[i] != NULL; i++) { + if (name && match_token(name, tablet_cursor_allowlist[i])) return TRUE; - if (type && match_token(type, tablet_cursor_whitelist[i])) + if (type && match_token(type, tablet_cursor_allowlist[i])) return TRUE; } return FALSE; @@ -418,7 +418,7 @@ static BOOL is_tablet_cursor(const char *name, const char *type) static UINT get_cursor_type(const char *name, const char *type) { int i; - static const char* tablet_stylus_whitelist[] = { + static const char* tablet_stylus_allowlist[] = { "stylus", "wizardpen", "acecad", @@ -427,14 +427,14 @@ static UINT get_cursor_type(const char *name, const char *type) }; /* First check device type to avoid cases where name is "Pen and Eraser" and type is "ERASER" */ - for (i=0; tablet_stylus_whitelist[i] != NULL; i++) { - if (type && match_token(type, tablet_stylus_whitelist[i])) + for (i=0; tablet_stylus_allowlist[i] != NULL; i++) { + if (type && match_token(type, tablet_stylus_allowlist[i])) return CSR_TYPE_PEN; } if (type && match_token(type, "eraser")) return CSR_TYPE_ERASER; - for (i=0; tablet_stylus_whitelist[i] != NULL; i++) { - if (name && match_token(name, tablet_stylus_whitelist[i])) + for (i=0; tablet_stylus_allowlist[i] != NULL; i++) { + if (name && match_token(name, tablet_stylus_allowlist[i])) return CSR_TYPE_PEN; } if (name && match_token(name, "eraser")) -- 2.17.1

1 0

[PATCH] winedump: Fix parsing of SLTG typelib created with some old tool.
by Dmitry Timoshkov 15 Jun '20

15 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49372 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index c55c6a9f23..6a90879572 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -1214,7 +1214,7 @@ static void print_sltg_name(const char *name) printf(")\n"); } -static int dump_sltg_header(int *sltg_first_blk, int *size_of_index) +static int dump_sltg_header(int *sltg_first_blk, int *size_of_index, int *size_of_pad) { int n_file_blocks; @@ -1222,7 +1222,7 @@ static int dump_sltg_header(int *sltg_first_blk, int *size_of_index) print_hex("magic"); n_file_blocks = print_short_dec("# file blocks"); - print_short_hex("res06"); + *size_of_pad = print_short_hex("pad"); *size_of_index = print_short_hex("size of index"); *sltg_first_blk = print_short_dec("first block"); print_guid("guid"); @@ -1254,10 +1254,10 @@ static void dump_sltg_index(int count) printf("\n"); } -static void dump_sltg_pad9(void) +static void dump_sltg_pad(int size_of_pad) { - printf("pad9:\n"); - dump_binary(9); + printf("pad:\n"); + dump_binary(size_of_pad); printf("\n"); } @@ -1937,13 +1937,13 @@ static void dump_type(int len, const char *hlp_strings) static void sltg_dump(void) { - int i, n_file_blocks, n_first_blk, size_of_index; + int i, n_file_blocks, n_first_blk, size_of_index, size_of_pad; int name_table_start, name_table_size, saved_offset; int libblk_start, libblk_len, hlpstr_len, len; const char *index, *hlp_strings; const struct block_entry *entry; - n_file_blocks = dump_sltg_header(&n_first_blk, &size_of_index); + n_file_blocks = dump_sltg_header(&n_first_blk, &size_of_index, &size_of_pad); saved_offset = offset; entry = tlb_read((n_file_blocks - 1) * sizeof(*entry)); @@ -1959,7 +1959,7 @@ static void sltg_dump(void) dump_sltg_index(n_file_blocks); assert(offset - saved_offset == size_of_index); - dump_sltg_pad9(); + dump_sltg_pad(size_of_pad); /* read the helpstrings for later decoding */ saved_offset = offset; -- 2.26.2

1 0

[PATCH 1/4] winevulkan: Thunk vkGetPhysicalDeviceProperties2 and vkGetPhysicalDeviceProperties2KHR.
by Zhiyi Zhang 15 Jun '20

15 Jun '20

So that user graphics drivers can fill in LUID property. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/vulkan.c | 66 +++++++++++++++++++++++++----------- dlls/winevulkan/make_vulkan | 4 ++- dlls/winex11.drv/vulkan.c | 65 ++++++++++++++++++++++++----------- include/wine/vulkan_driver.h | 8 ++++- 4 files changed, 101 insertions(+), 42 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index dd92231d3ea..d06b19b7a0c 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -85,6 +85,8 @@ static void (*pvkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocati static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); +static void (*pvkGetPhysicalDeviceProperties2)(VkPhysicalDevice, VkPhysicalDeviceProperties2 *); +static void (*pvkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2 *); static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, VkSurfaceCapabilities2KHR *); static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *); static VkResult (*pvkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, uint32_t *, VkSurfaceFormat2KHR *); @@ -113,6 +115,7 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) } #define LOAD_FUNCPTR(f) if ((p##f = dlsym(vulkan_handle, #f)) == NULL) goto fail; +#define LOAD_OPTIONAL_FUNCPTR(f) p##f = dlsym(vulkan_handle, #f); LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) LOAD_FUNCPTR(vkCreateMacOSSurfaceMVK) @@ -123,6 +126,8 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties) LOAD_FUNCPTR(vkGetDeviceProcAddr) LOAD_FUNCPTR(vkGetInstanceProcAddr) + LOAD_FUNCPTR(vkGetPhysicalDeviceProperties2) + LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDeviceProperties2KHR) LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilities2KHR) LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceFormats2KHR) @@ -444,6 +449,25 @@ static void *macdrv_vkGetInstanceProcAddr(VkInstance instance, const char *name) return pvkGetInstanceProcAddr(instance, name); } +static void macdrv_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties) +{ + TRACE("%p, %p\n", phys_dev, properties); + + pvkGetPhysicalDeviceProperties2(phys_dev, properties); +} + +static void macdrv_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties) +{ + TRACE("%p, %p\n", phys_dev, properties); + + if (pvkGetPhysicalDeviceProperties2KHR) + pvkGetPhysicalDeviceProperties2KHR(phys_dev, properties); + else + pvkGetPhysicalDeviceProperties2(phys_dev, properties); +} + static VkResult macdrv_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities) { @@ -560,26 +584,28 @@ static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * static const struct vulkan_funcs vulkan_funcs = { - macdrv_vkCreateInstance, - macdrv_vkCreateSwapchainKHR, - macdrv_vkCreateWin32SurfaceKHR, - macdrv_vkDestroyInstance, - macdrv_vkDestroySurfaceKHR, - macdrv_vkDestroySwapchainKHR, - macdrv_vkEnumerateInstanceExtensionProperties, - NULL, - macdrv_vkGetDeviceProcAddr, - macdrv_vkGetInstanceProcAddr, - NULL, - macdrv_vkGetPhysicalDeviceSurfaceCapabilities2KHR, - macdrv_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, - macdrv_vkGetPhysicalDeviceSurfaceFormats2KHR, - macdrv_vkGetPhysicalDeviceSurfaceFormatsKHR, - macdrv_vkGetPhysicalDeviceSurfacePresentModesKHR, - macdrv_vkGetPhysicalDeviceSurfaceSupportKHR, - macdrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, - macdrv_vkGetSwapchainImagesKHR, - macdrv_vkQueuePresentKHR, + .p_vkCreateInstance = macdrv_vkCreateInstance, + .p_vkCreateSwapchainKHR = macdrv_vkCreateSwapchainKHR, + .p_vkCreateWin32SurfaceKHR = macdrv_vkCreateWin32SurfaceKHR, + .p_vkDestroyInstance = macdrv_vkDestroyInstance, + .p_vkDestroySurfaceKHR = macdrv_vkDestroySurfaceKHR, + .p_vkDestroySwapchainKHR = macdrv_vkDestroySwapchainKHR, + .p_vkEnumerateInstanceExtensionProperties = macdrv_vkEnumerateInstanceExtensionProperties, + .p_vkGetDeviceGroupSurfacePresentModesKHR = NULL, + .p_vkGetDeviceProcAddr = macdrv_vkGetDeviceProcAddr, + .p_vkGetInstanceProcAddr = macdrv_vkGetInstanceProcAddr, + .p_vkGetPhysicalDevicePresentRectanglesKHR = NULL, + .p_vkGetPhysicalDeviceProperties2 = macdrv_vkGetPhysicalDeviceProperties2, + .p_vkGetPhysicalDeviceProperties2KHR = macdrv_vkGetPhysicalDeviceProperties2KHR, + .p_vkGetPhysicalDeviceSurfaceCapabilities2KHR = macdrv_vkGetPhysicalDeviceSurfaceCapabilities2KHR, + .p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR = macdrv_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, + .p_vkGetPhysicalDeviceSurfaceFormats2KHR = macdrv_vkGetPhysicalDeviceSurfaceFormats2KHR, + .p_vkGetPhysicalDeviceSurfaceFormatsKHR = macdrv_vkGetPhysicalDeviceSurfaceFormatsKHR, + .p_vkGetPhysicalDeviceSurfacePresentModesKHR = macdrv_vkGetPhysicalDeviceSurfacePresentModesKHR, + .p_vkGetPhysicalDeviceSurfaceSupportKHR = macdrv_vkGetPhysicalDeviceSurfaceSupportKHR, + .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = macdrv_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_vkGetSwapchainImagesKHR = macdrv_vkGetSwapchainImagesKHR, + .p_vkQueuePresentKHR = macdrv_vkQueuePresentKHR, }; static void *macdrv_get_vk_device_proc_addr(const char *name) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1dee769836f..36de61501cb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -138,7 +138,7 @@ CORE_EXTENSIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 8 +DRIVER_VERSION = 9 # Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -165,6 +165,8 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceExternalFenceProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetPhysicalDeviceExternalSemaphoreProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetPhysicalDeviceImageFormatProperties2" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, + "vkGetPhysicalDeviceProperties2" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetPhysicalDeviceProperties2KHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 4de82586906..c988b1a6b27 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -84,6 +84,8 @@ static VkResult (*pvkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKH static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); static VkResult (*pvkGetPhysicalDevicePresentRectanglesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkRect2D *); +static void (*pvkGetPhysicalDeviceProperties2)(VkPhysicalDevice, VkPhysicalDeviceProperties2 *); +static void (*pvkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2 *); static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, VkSurfaceCapabilities2KHR *); static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *); static VkResult (*pvkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, uint32_t *, VkSurfaceFormat2KHR *); @@ -123,6 +125,8 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) LOAD_FUNCPTR(vkEnumerateInstanceExtensionProperties); LOAD_FUNCPTR(vkGetDeviceProcAddr); LOAD_FUNCPTR(vkGetInstanceProcAddr); + LOAD_FUNCPTR(vkGetPhysicalDeviceProperties2); + LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDeviceProperties2KHR); LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilities2KHR); LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilitiesKHR); LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDeviceSurfaceFormats2KHR); @@ -459,6 +463,25 @@ static VkResult X11DRV_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice return pvkGetPhysicalDevicePresentRectanglesKHR(phys_dev, x11_surface->surface, count, rects); } +static void X11DRV_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties) +{ + TRACE("%p, %p\n", phys_dev, properties); + + pvkGetPhysicalDeviceProperties2(phys_dev, properties); +} + +static void X11DRV_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties) +{ + TRACE("%p, %p\n", phys_dev, properties); + + if (pvkGetPhysicalDeviceProperties2KHR) + pvkGetPhysicalDeviceProperties2KHR(phys_dev, properties); + else + pvkGetPhysicalDeviceProperties2(phys_dev, properties); +} + static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, VkSurfaceCapabilities2KHR *capabilities) { @@ -603,26 +626,28 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * static const struct vulkan_funcs vulkan_funcs = { - X11DRV_vkCreateInstance, - X11DRV_vkCreateSwapchainKHR, - X11DRV_vkCreateWin32SurfaceKHR, - X11DRV_vkDestroyInstance, - X11DRV_vkDestroySurfaceKHR, - X11DRV_vkDestroySwapchainKHR, - X11DRV_vkEnumerateInstanceExtensionProperties, - X11DRV_vkGetDeviceGroupSurfacePresentModesKHR, - X11DRV_vkGetDeviceProcAddr, - X11DRV_vkGetInstanceProcAddr, - X11DRV_vkGetPhysicalDevicePresentRectanglesKHR, - X11DRV_vkGetPhysicalDeviceSurfaceCapabilities2KHR, - X11DRV_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, - X11DRV_vkGetPhysicalDeviceSurfaceFormats2KHR, - X11DRV_vkGetPhysicalDeviceSurfaceFormatsKHR, - X11DRV_vkGetPhysicalDeviceSurfacePresentModesKHR, - X11DRV_vkGetPhysicalDeviceSurfaceSupportKHR, - X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR, - X11DRV_vkGetSwapchainImagesKHR, - X11DRV_vkQueuePresentKHR, + .p_vkCreateInstance = X11DRV_vkCreateInstance, + .p_vkCreateSwapchainKHR = X11DRV_vkCreateSwapchainKHR, + .p_vkCreateWin32SurfaceKHR = X11DRV_vkCreateWin32SurfaceKHR, + .p_vkDestroyInstance = X11DRV_vkDestroyInstance, + .p_vkDestroySurfaceKHR = X11DRV_vkDestroySurfaceKHR, + .p_vkDestroySwapchainKHR = X11DRV_vkDestroySwapchainKHR, + .p_vkEnumerateInstanceExtensionProperties = X11DRV_vkEnumerateInstanceExtensionProperties, + .p_vkGetDeviceGroupSurfacePresentModesKHR = X11DRV_vkGetDeviceGroupSurfacePresentModesKHR, + .p_vkGetDeviceProcAddr = X11DRV_vkGetDeviceProcAddr, + .p_vkGetInstanceProcAddr = X11DRV_vkGetInstanceProcAddr, + .p_vkGetPhysicalDevicePresentRectanglesKHR = X11DRV_vkGetPhysicalDevicePresentRectanglesKHR, + .p_vkGetPhysicalDeviceProperties2 = X11DRV_vkGetPhysicalDeviceProperties2, + .p_vkGetPhysicalDeviceProperties2KHR = X11DRV_vkGetPhysicalDeviceProperties2KHR, + .p_vkGetPhysicalDeviceSurfaceCapabilities2KHR = X11DRV_vkGetPhysicalDeviceSurfaceCapabilities2KHR, + .p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR = X11DRV_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, + .p_vkGetPhysicalDeviceSurfaceFormats2KHR = X11DRV_vkGetPhysicalDeviceSurfaceFormats2KHR, + .p_vkGetPhysicalDeviceSurfaceFormatsKHR = X11DRV_vkGetPhysicalDeviceSurfaceFormatsKHR, + .p_vkGetPhysicalDeviceSurfacePresentModesKHR = X11DRV_vkGetPhysicalDeviceSurfacePresentModesKHR, + .p_vkGetPhysicalDeviceSurfaceSupportKHR = X11DRV_vkGetPhysicalDeviceSurfaceSupportKHR, + .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_vkGetSwapchainImagesKHR = X11DRV_vkGetSwapchainImagesKHR, + .p_vkQueuePresentKHR = X11DRV_vkQueuePresentKHR, }; static void *X11DRV_get_vk_device_proc_addr(const char *name) diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 90e5dd1804d..004ae8879ef 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -39,7 +39,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 8 +#define WINE_VULKAN_DRIVER_VERSION 9 struct vulkan_funcs { @@ -58,6 +58,8 @@ struct vulkan_funcs void * (*p_vkGetDeviceProcAddr)(VkDevice, const char *); void * (*p_vkGetInstanceProcAddr)(VkInstance, const char *); VkResult (*p_vkGetPhysicalDevicePresentRectanglesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkRect2D *); + void (*p_vkGetPhysicalDeviceProperties2)(VkPhysicalDevice, VkPhysicalDeviceProperties2 *); + void (*p_vkGetPhysicalDeviceProperties2KHR)(VkPhysicalDevice, VkPhysicalDeviceProperties2 *); VkResult (*p_vkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, VkSurfaceCapabilities2KHR *); VkResult (*p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *); VkResult (*p_vkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, uint32_t *, VkSurfaceFormat2KHR *); @@ -118,6 +120,10 @@ static inline void *get_vulkan_driver_instance_proc_addr( return vulkan_funcs->p_vkGetInstanceProcAddr; if (!strcmp(name, "GetPhysicalDevicePresentRectanglesKHR")) return vulkan_funcs->p_vkGetPhysicalDevicePresentRectanglesKHR; + if (!strcmp(name, "GetPhysicalDeviceProperties2")) + return vulkan_funcs->p_vkGetPhysicalDeviceProperties2; + if (!strcmp(name, "GetPhysicalDeviceProperties2KHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceProperties2KHR; if (!strcmp(name, "GetPhysicalDeviceSurfaceCapabilities2KHR")) return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceCapabilities2KHR; if (!strcmp(name, "GetPhysicalDeviceSurfaceCapabilitiesKHR")) -- 2.25.1

2 2