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

Zhiyi Zhang : winedump: Support dumping Windows Metafiles.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 788fd4ee44fc9877b01888fdd3cd72b9ac88228e URL: https://source.winehq.org/git/wine.git/?a=commit;h=788fd4ee44fc9877b01888fd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 19 15:17:48 2021 +0800 winedump: Support dumping Windows Metafiles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/Makefile.in | 1 + tools/winedump/dump.c | 1 + tools/winedump/mf.c | 219 +++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/winedump.h | 4 +- 4 files changed, 224 insertions(+), 1 deletion(-) diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index 43e200ab6ed..54028024b0d 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ lib.c \ lnk.c \ main.c \ + mf.c \ minidump.c \ misc.c \ msc.c \ diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 412880c4bd6..d2e920ef6cb 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -265,6 +265,7 @@ dumpers[] = {SIG_MDMP, get_kind_mdmp, mdmp_dump}, {SIG_LNK, get_kind_lnk, lnk_dump}, {SIG_EMF, get_kind_emf, emf_dump}, + {SIG_MF, get_kind_mf, mf_dump}, {SIG_FNT, get_kind_fnt, fnt_dump}, {SIG_TLB, get_kind_tlb, tlb_dump}, {SIG_NLS, get_kind_nls, nls_dump}, diff --git a/tools/winedump/mf.c b/tools/winedump/mf.c new file mode 100644 index 00000000000..37869d3bb8a --- /dev/null +++ b/tools/winedump/mf.c @@ -0,0 +1,219 @@ +/* + * Dump a Windows Metafile + * + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" +#include "winedump.h" + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" + +#define META_EOF 0 +#define METAFILE_MEMORY 1 +#define METAFILE_DISK 2 + +static unsigned offset = 0; + +static unsigned short read_word(const unsigned char *buffer) +{ + return buffer[0] + (buffer[1] << 8); +} + +static unsigned int read_int(const unsigned char *buffer) +{ + return buffer[0] + (buffer[1] << 8) + (buffer[2] << 16) + (buffer[3] << 24); +} + +static int dump_mfrecord(void) +{ + unsigned int type, size, i; + const unsigned char *ptr; + + ptr = PRD(offset, 6); + if (!ptr) + return -1; + + /* METAHEADER */ + if (offset == 0) + { + type = read_word(ptr); + /* mtHeaderSize is in words */ + size = read_word(ptr + 2) * 2; + } + /* METARECORD */ + else + { + /* rdSize is in words */ + size = read_int(ptr) * 2; + type = read_word(ptr + 4); + } + +#define MRCASE(x) \ + case x: \ + printf("%-20s %08x\n", #x, size); \ + break + + switch (type) + { + case METAFILE_MEMORY: + case METAFILE_DISK: + { + const METAHEADER *header = PRD(offset, sizeof(*header)); + + printf("%-20s %08x\n", "METAHEADER", size); + printf("type %d header_size %#x version %#x size %#x object_count %d max_record_size %#x " + "parameter_count %d\n", + header->mtType, header->mtHeaderSize * 2, header->mtVersion, header->mtSize * 2, + header->mtNoObjects, header->mtMaxRecord * 2, header->mtNoParameters); + break; + } + MRCASE(META_SETBKCOLOR); + MRCASE(META_SETBKMODE); + MRCASE(META_SETMAPMODE); + MRCASE(META_SETROP2); + MRCASE(META_SETRELABS); + MRCASE(META_SETPOLYFILLMODE); + MRCASE(META_SETSTRETCHBLTMODE); + MRCASE(META_SETTEXTCHAREXTRA); + MRCASE(META_SETTEXTCOLOR); + MRCASE(META_SETTEXTJUSTIFICATION); + MRCASE(META_SETWINDOWORG); + MRCASE(META_SETWINDOWEXT); + MRCASE(META_SETVIEWPORTORG); + MRCASE(META_SETVIEWPORTEXT); + MRCASE(META_OFFSETWINDOWORG); + MRCASE(META_SCALEWINDOWEXT); + MRCASE(META_OFFSETVIEWPORTORG); + MRCASE(META_SCALEVIEWPORTEXT); + MRCASE(META_LINETO); + MRCASE(META_MOVETO); + MRCASE(META_EXCLUDECLIPRECT); + MRCASE(META_INTERSECTCLIPRECT); + MRCASE(META_ARC); + MRCASE(META_ELLIPSE); + MRCASE(META_FLOODFILL); + MRCASE(META_PIE); + MRCASE(META_RECTANGLE); + MRCASE(META_ROUNDRECT); + MRCASE(META_PATBLT); + MRCASE(META_SAVEDC); + MRCASE(META_SETPIXEL); + MRCASE(META_OFFSETCLIPRGN); + MRCASE(META_TEXTOUT); + MRCASE(META_BITBLT); + MRCASE(META_STRETCHBLT); + MRCASE(META_POLYGON); + MRCASE(META_POLYLINE); + MRCASE(META_ESCAPE); + MRCASE(META_RESTOREDC); + MRCASE(META_FILLREGION); + MRCASE(META_FRAMEREGION); + MRCASE(META_INVERTREGION); + MRCASE(META_PAINTREGION); + MRCASE(META_SELECTCLIPREGION); + MRCASE(META_SELECTOBJECT); + MRCASE(META_SETTEXTALIGN); + MRCASE(META_DRAWTEXT); + MRCASE(META_CHORD); + MRCASE(META_SETMAPPERFLAGS); + MRCASE(META_EXTTEXTOUT); + MRCASE(META_SETDIBTODEV); + MRCASE(META_SELECTPALETTE); + MRCASE(META_REALIZEPALETTE); + MRCASE(META_ANIMATEPALETTE); + MRCASE(META_SETPALENTRIES); + MRCASE(META_POLYPOLYGON); + MRCASE(META_RESIZEPALETTE); + MRCASE(META_DIBBITBLT); + MRCASE(META_DIBSTRETCHBLT); + MRCASE(META_DIBCREATEPATTERNBRUSH); + MRCASE(META_STRETCHDIB); + MRCASE(META_EXTFLOODFILL); + MRCASE(META_RESETDC); + MRCASE(META_STARTDOC); + MRCASE(META_STARTPAGE); + MRCASE(META_ENDPAGE); + MRCASE(META_ABORTDOC); + MRCASE(META_ENDDOC); + MRCASE(META_SETLAYOUT); + MRCASE(META_DELETEOBJECT); + MRCASE(META_CREATEPALETTE); + MRCASE(META_CREATEBRUSH); + MRCASE(META_CREATEPATTERNBRUSH); + MRCASE(META_CREATEPENINDIRECT); + MRCASE(META_CREATEFONTINDIRECT); + MRCASE(META_CREATEBRUSHINDIRECT); + MRCASE(META_CREATEBITMAPINDIRECT); + MRCASE(META_CREATEBITMAP); + MRCASE(META_CREATEREGION); + MRCASE(META_UNKNOWN); + MRCASE(META_EOF); + + default: + printf("%u %08x\n", type, size); + break; + } + +#undef MRCASE + + if ((size < 6) || (size % 2)) + return -1; + + /* METARECORD */ + if (offset) + { + size -= 6; + offset += 6; + } + + for (i = 0; i < size; i += 2) + { + if (i % 16 == 0) + printf(" "); + if (!(ptr = PRD(offset, 2))) + return -1; + offset += 2; + printf("%04x ", read_word(ptr)); + if ((i % 16 == 14) || (i + 2 == size)) + printf("\n"); + } + + return 0; +} + +enum FileSig get_kind_mf(void) +{ + const METAHEADER *hdr; + + hdr = PRD(0, sizeof(*hdr)); + if (hdr && (hdr->mtType == METAFILE_MEMORY || hdr->mtType == METAFILE_DISK) + && hdr->mtHeaderSize == sizeof(METAHEADER) / sizeof(WORD) + && (hdr->mtVersion == 0x0100 || hdr->mtVersion == 0x0300)) + return SIG_MF; + return SIG_UNKNOWN; +} + +void mf_dump(void) +{ + offset = 0; + while (!dump_mfrecord()) + ; +} diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 240f31d2f2d..16b9cdc7cf8 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -216,7 +216,7 @@ const char *get_machine_str(int mach); /* file dumping functions */ enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_PDB, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK, - SIG_EMF, SIG_FNT, SIG_TLB, SIG_NLS}; + SIG_EMF, SIG_MF, SIG_FNT, SIG_TLB, SIG_NLS}; const void* PRD(unsigned long prd, unsigned long len); unsigned long Offset(const void* ptr); @@ -251,6 +251,8 @@ enum FileSig get_kind_lnk(void); void lnk_dump( void ); enum FileSig get_kind_emf(void); void emf_dump( void ); +enum FileSig get_kind_mf(void); +void mf_dump(void); enum FileSig get_kind_pdb(void); void pdb_dump(void); enum FileSig get_kind_fnt(void);

1 0

Hugh McMaster : reg: Drop key output from the "Invalid system key" error message.
by Alexandre Julliard 20 Apr '21

20 Apr '21

1 0

Hugh McMaster : reg: Fail if a system key has a trailing backslash but no subkey path.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 797520db8f7eb708845891da6f08d3030393d6bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=797520db8f7eb708845891da… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 20 23:21:59 2021 +1000 reg: Fail if a system key has a trailing backslash but no subkey path. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 16 +++++++++++++--- programs/reg/tests/add.c | 8 ++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7ed45b73ad8..69107d54b92 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -234,9 +234,6 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) if (!sane_path(key)) return FALSE; - *path = wcschr(key, '\\'); - if (*path) (*path)++; - *root = path_get_rootkey(key); if (!*root) { @@ -244,6 +241,19 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) return FALSE; } + *path = wcschr(key, '\\'); + + if (!*path) + return TRUE; + + (*path)++; + + if (!**path) + { + output_message(STRING_INVALID_SYSTEM_KEY); + return FALSE; + } + return TRUE; } diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 36b5f821350..6973eefd892 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -311,12 +311,12 @@ static void test_key_formats(void) /* Test validity of trailing backslash after system key */ run_reg_exe("reg add HKCU\\ /v Value1 /t REG_SZ /d foo /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(HKEY_CURRENT_USER, "Value1"); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + verify_reg_nonexist(HKEY_CURRENT_USER, "Value1"); run_reg_exe("reg add HKEY_CURRENT_USER\\ /v Value2 /t REG_SZ /d bar /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(HKEY_CURRENT_USER, "Value2"); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + verify_reg_nonexist(HKEY_CURRENT_USER, "Value2"); } static void test_add(void)

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_get_rendertarget_view().
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 40e107211700481c5fb98afd8028ed09ee6ae45c URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e107211700481c5fb98afd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 19 23:38:07 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_rendertarget_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 ++++-- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 6 +++--- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/surface.c | 2 +- dlls/ddraw/viewport.c | 4 ++-- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 10 files changed, 24 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40e107211700481c5fb9…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_get_depth_stencil_view().
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: a313daea70a066e01b8b838557cdb9fcb97bce65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a313daea70a066e01b8b8385… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 19 23:38:08 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_depth_stencil_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 5 ++--- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 4 ++-- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 5 +++-- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 9 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b95423c4c7c..e58b02038c8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2055,7 +2055,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11D ID3D11DepthStencilView **depth_stencil_view) { struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct wined3d_rendertarget_view *wined3d_view; TRACE("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p.\n", @@ -2085,7 +2084,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargets(ID3D11D { struct d3d_depthstencil_view *view_impl; - if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device)) + if (!(wined3d_view = wined3d_device_context_get_depth_stencil_view(context->wined3d_context)) || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) { *depth_stencil_view = NULL; @@ -5435,7 +5434,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetRenderTargets(ID3D10Device1 *ifa { struct d3d_depthstencil_view *view_impl; - if (!(wined3d_view = wined3d_device_get_depth_stencil_view(device->wined3d_device)) + if (!(wined3d_view = wined3d_device_context_get_depth_stencil_view(device->immediate_context.wined3d_context)) || !(view_impl = wined3d_rendertarget_view_get_parent(wined3d_view))) { *depth_stencil_view = NULL; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4f76a55172c..938eb19c8f5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1535,7 +1535,7 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, } } - original_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device); + original_dsv = wined3d_device_context_get_depth_stencil_view(device->immediate_context); rtv = ds_impl ? d3d8_surface_acquire_rendertarget_view(ds_impl) : NULL; hr = wined3d_device_context_set_depth_stencil_view(device->immediate_context, rtv); d3d8_surface_release_rendertarget_view(ds_impl, rtv); @@ -1603,7 +1603,7 @@ static HRESULT WINAPI d3d8_device_GetDepthStencilSurface(IDirect3DDevice8 *iface return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + if ((wined3d_dsv = wined3d_device_context_get_depth_stencil_view(device->immediate_context))) { /* We want the sub resource parent here, since the view itself may be * internal to wined3d and may not have a parent. */ @@ -1928,7 +1928,7 @@ static void resolve_depth_buffer(struct d3d8_device *device) && desc.format != WINED3DFMT_INTZ) return; - if (!(wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + if (!(wined3d_dsv = wined3d_device_context_get_depth_stencil_view(device->immediate_context))) return; d3d8_dsv = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f7a6e04beae..ee1cdc87567 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2109,7 +2109,7 @@ static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *ifa return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + if ((wined3d_dsv = wined3d_device_context_get_depth_stencil_view(device->immediate_context))) { /* We want the sub resource parent here, since the view itself may be * internal to wined3d and may not have a parent. */ @@ -2425,7 +2425,7 @@ static void resolve_depth_buffer(struct d3d9_device *device) && desc.format != WINED3DFMT_INTZ) return; - if (!(wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + if (!(wined3d_dsv = wined3d_device_context_get_depth_stencil_view(device->immediate_context))) return; d3d9_dsv = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9063c64b41f..972c18fbfe9 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -938,7 +938,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, else if (rtv) wined3d_rendertarget_view_incref(rtv); - if ((dsv = wined3d_device_get_depth_stencil_view(ddraw->wined3d_device))) + if ((dsv = wined3d_device_context_get_depth_stencil_view(ddraw->immediate_context))) wined3d_rendertarget_view_incref(dsv); } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c3681cc9440..898bef5e534 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3437,7 +3437,7 @@ static void d3d_device_sync_rendertarget(struct d3d_device *device) if ((rtv = wined3d_device_context_get_rendertarget_view(device->immediate_context, 0))) ddraw_surface_get_draw_texture(wined3d_rendertarget_view_get_parent(rtv), DDRAW_SURFACE_RW); - if ((rtv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) + if ((rtv = wined3d_device_context_get_depth_stencil_view(device->immediate_context))) ddraw_surface_get_draw_texture(wined3d_rendertarget_view_get_parent(rtv), DDRAW_SURFACE_RW); } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 51179db05dd..7834d9c943b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2136,6 +2136,7 @@ static HRESULT WINAPI ddraw_surface1_AddAttachedSurface(IDirectDrawSurface *ifac static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surface, struct ddraw_surface *attachment, IUnknown *detach_iface) { + struct wined3d_rendertarget_view *dsv; struct ddraw_surface *prev = surface; TRACE("surface %p, attachment %p, detach_iface %p.\n", surface, attachment, detach_iface); @@ -2183,8 +2184,8 @@ static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surfa * QueryInterface(). Some applications, SCP - Containment Breach in * particular, modify the QueryInterface() pointer in the surface vtbl * but don't cleanup properly after the relevant dll is unloaded. */ - if (attachment->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER - && wined3d_device_get_depth_stencil_view(surface->ddraw->wined3d_device) == attachment->wined3d_rtv) + dsv = wined3d_device_context_get_depth_stencil_view(surface->ddraw->immediate_context); + if (attachment->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER && dsv == attachment->wined3d_rtv) wined3d_device_context_set_depth_stencil_view(surface->ddraw->immediate_context, NULL); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 40ee9739c5e..9590c7d7341 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5408,11 +5408,12 @@ struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_rendertarget return context->state->fb.render_targets[view_idx]; } -struct wined3d_rendertarget_view * CDECL wined3d_device_get_depth_stencil_view(const struct wined3d_device *device) +struct wined3d_rendertarget_view * CDECL wined3d_device_context_get_depth_stencil_view( + const struct wined3d_device_context *context) { - TRACE("device %p.\n", device); + TRACE("context %p.\n", context); - return device->cs->c.state->fb.depth_stencil; + return context->state->fb.depth_stencil; } HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8a01bf1711f..0a5cb608fc1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -61,7 +61,6 @@ @ cdecl wined3d_device_get_cs_resource_view(ptr long) @ cdecl wined3d_device_get_cs_sampler(ptr long) @ cdecl wined3d_device_get_cs_uav(ptr long) -@ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) @ cdecl wined3d_device_get_domain_shader(ptr) @@ -167,6 +166,7 @@ @ cdecl wined3d_device_context_get_blend_state(ptr ptr ptr) @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) +@ cdecl wined3d_device_context_get_depth_stencil_view(ptr) @ cdecl wined3d_device_context_get_rasterizer_state(ptr) @ cdecl wined3d_device_context_get_rendertarget_view(ptr long) @ cdecl wined3d_device_context_get_sampler(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fd9840379d3..61162819ede 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2385,7 +2385,8 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_vie struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx); struct wined3d_unordered_access_view * __cdecl wined3d_device_get_cs_uav(const struct wined3d_device *device, unsigned int idx); -struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); +struct wined3d_rendertarget_view * __cdecl wined3d_device_context_get_depth_stencil_view( + const struct wined3d_device_context *context); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_get_predication().
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 90dd2572a34508442b24dd96c67acc5a6815306e URL: https://source.winehq.org/git/wine.git/?a=commit;h=90dd2572a34508442b24dd96… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 19 23:38:09 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_predication(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e58b02038c8..0226d26047d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1973,14 +1973,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_GetPredication(ID3D11DeviceContext1 *iface, ID3D11Predicate **predicate, BOOL *value) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_query *wined3d_predicate; struct d3d_query *predicate_impl; TRACE("iface %p, predicate %p, value %p.\n", iface, predicate, value); wined3d_mutex_lock(); - if (!(wined3d_predicate = wined3d_device_get_predication(device->wined3d_device, value))) + if (!(wined3d_predicate = wined3d_device_context_get_predication(context->wined3d_context, value))) { wined3d_mutex_unlock(); *predicate = NULL; @@ -5329,7 +5329,7 @@ static void STDMETHODCALLTYPE d3d10_device_GetPredication(ID3D10Device1 *iface, TRACE("iface %p, predicate %p, value %p.\n", iface, predicate, value); wined3d_mutex_lock(); - if (!(wined3d_predicate = wined3d_device_get_predication(device->wined3d_device, value))) + if (!(wined3d_predicate = wined3d_device_context_get_predication(device->immediate_context.wined3d_context, value))) { wined3d_mutex_unlock(); *predicate = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9590c7d7341..3461c099a5c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4459,11 +4459,11 @@ void CDECL wined3d_device_set_predication(struct wined3d_device *device, wined3d_device_context_set_predication(&device->cs->c, predicate, value); } -struct wined3d_query * CDECL wined3d_device_get_predication(struct wined3d_device *device, BOOL *value) +struct wined3d_query * CDECL wined3d_device_context_get_predication(struct wined3d_device_context *context, BOOL *value) { - struct wined3d_state *state = device->cs->c.state; + struct wined3d_state *state = context->state; - TRACE("device %p, value %p.\n", device, value); + TRACE("context %p, value %p.\n", context, value); if (value) *value = state->predicate_value; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0a5cb608fc1..b008d192b8f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -78,7 +78,6 @@ @ cdecl wined3d_device_get_max_frame_latency(ptr) @ cdecl wined3d_device_get_npatch_mode(ptr) @ cdecl wined3d_device_get_pixel_shader(ptr) -@ cdecl wined3d_device_get_predication(ptr ptr) @ cdecl wined3d_device_get_primitive_type(ptr ptr ptr) @ cdecl wined3d_device_get_ps_resource_view(ptr long) @ cdecl wined3d_device_get_ps_sampler(ptr long) @@ -167,6 +166,7 @@ @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) @ cdecl wined3d_device_context_get_depth_stencil_view(ptr) +@ cdecl wined3d_device_context_get_predication(ptr ptr) @ cdecl wined3d_device_context_get_rasterizer_state(ptr) @ cdecl wined3d_device_context_get_rendertarget_view(ptr long) @ cdecl wined3d_device_context_get_sampler(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 61162819ede..bc26e794582 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2410,7 +2410,6 @@ struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct win unsigned int __cdecl wined3d_device_get_max_frame_latency(const struct wined3d_device *device); float __cdecl wined3d_device_get_npatch_mode(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); -struct wined3d_query * __cdecl wined3d_device_get_predication(struct wined3d_device *device, BOOL *value); void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *device, enum wined3d_primitive_type *primitive_topology, unsigned int *patch_vertex_count); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device, @@ -2561,6 +2560,8 @@ struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_stencil_state( const struct wined3d_device_context *context, unsigned int *stencil_ref); +struct wined3d_query * __cdecl wined3d_device_context_get_predication(struct wined3d_device_context *context, + BOOL *value); struct wined3d_rasterizer_state * __cdecl wined3d_device_context_get_rasterizer_state( struct wined3d_device_context *context); struct wined3d_rendertarget_view * __cdecl wined3d_device_context_get_rendertarget_view(

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_get_index_buffer().
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 8bd4aacb089700d52c8ca076b56035d32004bf3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd4aacb089700d52c8ca076… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 19 23:38:10 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_index_buffer(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ++++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0226d26047d..daee1b580b1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1836,7 +1836,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetVertexBuffers(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetIndexBuffer(ID3D11DeviceContext1 *iface, ID3D11Buffer **buffer, DXGI_FORMAT *format, UINT *offset) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d_buffer *buffer_impl; @@ -1844,7 +1844,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetIndexBuffer(ID3D11Dev TRACE("iface %p, buffer %p, format %p, offset %p.\n", iface, buffer, format, offset); wined3d_mutex_lock(); - wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format, offset); + wined3d_buffer = wined3d_device_context_get_index_buffer(context->wined3d_context, &wined3d_format, offset); *format = dxgi_format_from_wined3dformat(wined3d_format); if (!wined3d_buffer) { @@ -5201,7 +5201,8 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetIndexBuffer(ID3D10Device1 *iface TRACE("iface %p, buffer %p, format %p, offset %p.\n", iface, buffer, format, offset); wined3d_mutex_lock(); - wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format, offset); + wined3d_buffer = wined3d_device_context_get_index_buffer( + device->immediate_context.wined3d_context, &wined3d_format, offset); *format = dxgi_format_from_wined3dformat(wined3d_format); if (!wined3d_buffer) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3461c099a5c..ebed57f18bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1524,12 +1524,12 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, wined3d_device_context_set_index_buffer(&device->cs->c, buffer, format_id, offset); } -struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, +struct wined3d_buffer * CDECL wined3d_device_context_get_index_buffer(const struct wined3d_device_context *context, enum wined3d_format_id *format, unsigned int *offset) { - const struct wined3d_state *state = device->cs->c.state; + const struct wined3d_state *state = context->state; - TRACE("device %p, format %p, offset %p.\n", device, format, offset); + TRACE("context %p, format %p, offset %p.\n", context, format, offset); *format = state->index_format; if (offset) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b008d192b8f..d0bc54d3d84 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -74,7 +74,6 @@ @ cdecl wined3d_device_get_hs_sampler(ptr long) @ cdecl wined3d_device_get_hull_shader(ptr) @ cdecl wined3d_device_get_immediate_context(ptr) -@ cdecl wined3d_device_get_index_buffer(ptr ptr ptr) @ cdecl wined3d_device_get_max_frame_latency(ptr) @ cdecl wined3d_device_get_npatch_mode(ptr) @ cdecl wined3d_device_get_pixel_shader(ptr) @@ -166,6 +165,7 @@ @ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_depth_stencil_state(ptr ptr) @ cdecl wined3d_device_context_get_depth_stencil_view(ptr) +@ cdecl wined3d_device_context_get_index_buffer(ptr ptr ptr) @ cdecl wined3d_device_context_get_predication(ptr ptr) @ cdecl wined3d_device_context_get_rasterizer_state(ptr) @ cdecl wined3d_device_context_get_rendertarget_view(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bc26e794582..27378608ae8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2405,8 +2405,6 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_hs_resource_vie struct wined3d_sampler * __cdecl wined3d_device_get_hs_sampler(const struct wined3d_device *device, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_get_hull_shader(const struct wined3d_device *device); struct wined3d_device_context * __cdecl wined3d_device_get_immediate_context(struct wined3d_device *device); -struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, - enum wined3d_format_id *format, unsigned int *offset); unsigned int __cdecl wined3d_device_get_max_frame_latency(const struct wined3d_device *device); float __cdecl wined3d_device_get_npatch_mode(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); @@ -2560,6 +2558,8 @@ struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_depth_stencil_state * __cdecl wined3d_device_context_get_depth_stencil_state( const struct wined3d_device_context *context, unsigned int *stencil_ref); +struct wined3d_buffer * __cdecl wined3d_device_context_get_index_buffer(const struct wined3d_device_context *context, + enum wined3d_format_id *format, unsigned int *offset); struct wined3d_query * __cdecl wined3d_device_context_get_predication(struct wined3d_device_context *context, BOOL *value); struct wined3d_rasterizer_state * __cdecl wined3d_device_context_get_rasterizer_state(

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_get_vertex_declaration().
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 77319190d1e4b4cd510b85dbdae6919af3a838e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77319190d1e4b4cd510b85db… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 19 23:38:11 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_vertex_declaration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ++++--- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index daee1b580b1..66fa1b24014 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1776,14 +1776,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_IAGetInputLayout(ID3D11DeviceContext1 *iface, ID3D11InputLayout **input_layout) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_vertex_declaration *wined3d_declaration; struct d3d_input_layout *input_layout_impl; TRACE("iface %p, input_layout %p.\n", iface, input_layout); wined3d_mutex_lock(); - if (!(wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + if (!(wined3d_declaration = wined3d_device_context_get_vertex_declaration(context->wined3d_context))) { wined3d_mutex_unlock(); *input_layout = NULL; @@ -5145,7 +5145,8 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device1 *iface TRACE("iface %p, input_layout %p.\n", iface, input_layout); wined3d_mutex_lock(); - if (!(wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + if (!(wined3d_declaration = wined3d_device_context_get_vertex_declaration( + device->immediate_context.wined3d_context))) { wined3d_mutex_unlock(); *input_layout = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ebed57f18bd..9e74ab00081 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1876,11 +1876,12 @@ void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, wined3d_device_context_set_vertex_declaration(&device->cs->c, declaration); } -struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device) +struct wined3d_vertex_declaration * CDECL wined3d_device_context_get_vertex_declaration( + const struct wined3d_device_context *context) { - TRACE("device %p.\n", device); + TRACE("context %p.\n", context); - return device->cs->c.state->vertex_declaration; + return context->state->vertex_declaration; } void CDECL wined3d_device_context_set_shader(struct wined3d_device_context *context, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d0bc54d3d84..9dfeb64b180 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -89,7 +89,6 @@ @ cdecl wined3d_device_get_swapchain(ptr long) @ cdecl wined3d_device_get_swapchain_count(ptr) @ cdecl wined3d_device_get_unordered_access_view(ptr long) -@ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) @ cdecl wined3d_device_get_vs_resource_view(ptr long) @ cdecl wined3d_device_get_vs_sampler(ptr long) @@ -174,6 +173,7 @@ @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_get_shader_resource_view(ptr long long) @ cdecl wined3d_device_context_get_unordered_access_view(ptr long long) +@ cdecl wined3d_device_context_get_vertex_declaration(ptr) @ cdecl wined3d_device_context_get_viewports(ptr ptr ptr) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 27378608ae8..07e8ba0f540 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2427,7 +2427,6 @@ struct wined3d_swapchain * __cdecl wined3d_device_get_swapchain(const struct win UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); struct wined3d_unordered_access_view * __cdecl wined3d_device_get_unordered_access_view( const struct wined3d_device *device, unsigned int idx); -struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device, UINT idx); @@ -2576,6 +2575,8 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_context_get_shader_ const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_unordered_access_view * __cdecl wined3d_device_context_get_unordered_access_view( const struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int idx); +struct wined3d_vertex_declaration * __cdecl wined3d_device_context_get_vertex_declaration( + const struct wined3d_device_context *device); void __cdecl wined3d_device_context_get_viewports(const struct wined3d_device_context *context, unsigned int *viewport_count, struct wined3d_viewport *viewports); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context,

1 0

Jan Sikorski : wined3d: Prevent buildup of retired buffer objects' memory.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: d71358f5e9e20f4a99354a0192b67009019b78d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d71358f5e9e20f4a99354a01… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Apr 20 17:21:05 2021 +0200 wined3d: Prevent buildup of retired buffer objects' memory. Submit current command buffer in wined3d_context_vk_get_command_buffer() and return a new one if the total size of retired buffer objects on that command buffer crosses a predefined threshold. One way this issue may arise is when an application, by repeatedly doing resource updates, does not trigger a flush of the command buffer and accumulates transient staging buffers. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 15 ++++++++++++--- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 45133eabb69..8719d54644b 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -921,6 +921,9 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if (bo->map_ptr) VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); + + if (bo->command_buffer_id == context_vk->current_command_buffer.id) + context_vk->retired_bo_size += bo->size; } void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk) @@ -1509,9 +1512,14 @@ VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk buffer = &context_vk->current_command_buffer; if (buffer->vk_command_buffer) { - TRACE("Returning existing command buffer %p with id 0x%s.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - return buffer->vk_command_buffer; + if (context_vk->retired_bo_size > WINED3D_RETIRED_BO_SIZE_THRESHOLD) + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); + else + { + TRACE("Returning existing command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + return buffer->vk_command_buffer; + } } command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; @@ -1628,6 +1636,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_vk->completed_command_buffer_id = 0; buffer->id = 1; } + context_vk->retired_bo_size = 0; wined3d_context_vk_cleanup_resources(context_vk); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3e3752ed71..0ef6e89f1f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2549,6 +2549,7 @@ struct wined3d_context_vk VkCommandPool vk_command_pool; struct wined3d_command_buffer_vk current_command_buffer; uint64_t completed_command_buffer_id; + VkDeviceSize retired_bo_size; struct { @@ -3921,6 +3922,7 @@ struct wined3d_null_views_vk #define WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT 15 #define WINED3D_ALLOCATOR_MIN_BLOCK_SIZE (WINED3D_ALLOCATOR_CHUNK_SIZE >> (WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT - 1)) #define WINED3D_SLAB_BO_MIN_OBJECT_ALIGN 16 +#define WINED3D_RETIRED_BO_SIZE_THRESHOLD (64 * 1024 * 1024) struct wined3d_allocator_chunk {

1 0

Henri Verbeet : wined3d: Use wglSetPixelFormatWINE() in wined3d_context_gl_set_pixel_format() if we can.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 3847eca09982e01988a7d7d5daec9bbbc68f221b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3847eca09982e01988a7d7d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 20 18:58:53 2021 +0200 wined3d: Use wglSetPixelFormatWINE() in wined3d_context_gl_set_pixel_format() if we can. Based on a patch by Connor McAdams. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 63 +++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 123214afd5d..43c086ac758 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1186,6 +1186,7 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte int format = context_gl->pixel_format; HDC dc = context_gl->dc; int current; + HWND win; if (private && context_gl->dc_has_format) return TRUE; @@ -1196,55 +1197,43 @@ static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *conte current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); if (current == format) goto success; - if (!current) - { - if (!SetPixelFormat(dc, format, NULL)) - { - /* This may also happen if the dc belongs to a destroyed window. */ - WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", - format, dc, GetLastError()); - return FALSE; - } - - context_gl->restore_pf = 0; - context_gl->restore_pf_win = private ? NULL : WindowFromDC(dc); - goto success; - } - /* By default WGL doesn't allow pixel format adjustments but we need it * here. For this reason there's a Wine specific wglSetPixelFormat() - * which allows us to set the pixel format multiple times. Only use it - * when really needed. */ + * which allows us to set the pixel format multiple times. Use it when we + * can, because even though no pixel format may currently be set, the + * application may try to set one later. */ if (gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) { - HWND win; - if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, format))) { ERR("wglSetPixelFormatWINE failed to set pixel format %d on device context %p.\n", format, dc); return FALSE; } - - win = private ? NULL : WindowFromDC(dc); - if (win != context_gl->restore_pf_win) - { - wined3d_context_gl_restore_pixel_format(context_gl); - - context_gl->restore_pf = private ? 0 : current; - context_gl->restore_pf_win = win; - } - - goto success; + } + else if (current) + { + /* OpenGL doesn't allow pixel format adjustments. Print an error and + * continue using the old format. There's a big chance that the old + * format works although with a performance hit and perhaps rendering + * errors. */ + ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", + format, dc, current); + return TRUE; + } + else if (!SetPixelFormat(dc, format, NULL)) + { + /* This may also happen if the dc belongs to a destroyed window. */ + WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", + format, dc, GetLastError()); + return FALSE; } - /* OpenGL doesn't allow pixel format adjustments. Print an error and - * continue using the old format. There's a big chance that the old - * format works although with a performance hit and perhaps rendering - * errors. */ - ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", - format, dc, current); - return TRUE; + win = private ? NULL : WindowFromDC(dc); + if (win != context_gl->restore_pf_win) + wined3d_context_gl_restore_pixel_format(context_gl); + context_gl->restore_pf = private ? 0 : current; + context_gl->restore_pf_win = win; success: if (private)

1 0