- Wine-Commits - list.winehq.org

Piotr Caban : wineps: Handle EMR_EXTCREATEFONTINDIRECTW record in spool files.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: wine Branch: master Commit: 16a8da44f11f56f1196f179a5502f14dd4727adf URL: https://gitlab.winehq.org/wine/wine/-/commit/16a8da44f11f56f1196f179a5502f1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 19:50:12 2023 +0200 wineps: Handle EMR_EXTCREATEFONTINDIRECTW record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 8c32808dcdd..71dd28239e1 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1613,6 +1613,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_WIDENPATH: case EMR_SELECTCLIPPATH: case EMR_EXTSELECTCLIPRGN: + case EMR_EXTCREATEFONTINDIRECTW: case EMR_SETLAYOUT: case EMR_SETTEXTJUSTIFICATION: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count);

1 0

Piotr Caban : wineps: Handle EMR_EXTTEXTOUTW record in spool files.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: wine Branch: master Commit: 2df476c11fe10e306ca5f4130d73658e3cb581c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2df476c11fe10e306ca5f4130d7365… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 20:12:54 2023 +0200 wineps: Handle EMR_EXTTEXTOUTW record in spool files. --- dlls/wineps.drv/printproc.c | 515 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 515 insertions(+)

1 0

Piotr Caban : wineps: Store text justification info in print processor data.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: wine Branch: master Commit: ac13b9502053c7a3955d00e53b0fff550b56c181 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac13b9502053c7a3955d00e53b0fff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 20:03:04 2023 +0200 wineps: Store text justification info in print processor data. --- dlls/wineps.drv/printproc.c | 67 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 449748c8b22..0452e19845a 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -47,6 +47,16 @@ struct pp_data struct brush_pattern *patterns; BOOL path; + INT break_extra; + INT break_rem; + + INT saved_dc_size; + INT saved_dc_top; + struct + { + INT break_extra; + INT break_rem; + } *saved_dc; }; typedef enum @@ -88,6 +98,13 @@ typedef struct unsigned int cjSize; } record_hdr; +typedef struct +{ + EMR emr; + INT break_extra; + INT break_count; +} EMRSETTEXTJUSTIFICATION; + BOOL WINAPI SeekPrinter(HANDLE, LARGE_INTEGER, LARGE_INTEGER*, DWORD, BOOL); static const WCHAR emf_1003[] = L"NT EMF 1.003"; @@ -1158,8 +1175,37 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, PSDRV_SetBkColor(&data->pdev->dev, p->crColor); return 1; } + case EMR_SAVEDC: + { + int ret = PlayEnhMetaFileRecord(hdc, htable, rec, handle_count); + + if (!data->saved_dc_size) + { + data->saved_dc = malloc(8 * sizeof(*data->saved_dc)); + if (data->saved_dc) + data->saved_dc_size = 8; + } + else if (data->saved_dc_size == data->saved_dc_top) + { + void *alloc = realloc(data->saved_dc, data->saved_dc_size * 2); + + if (alloc) + { + data->saved_dc = alloc; + data->saved_dc_size *= 2; + } + } + if (data->saved_dc_size == data->saved_dc_top) + return 0; + + data->saved_dc[data->saved_dc_top].break_extra = data->break_extra; + data->saved_dc[data->saved_dc_top].break_rem = data->break_rem; + data->saved_dc_top++; + return ret; + } case EMR_RESTOREDC: { + const EMRRESTOREDC *p = (const EMRRESTOREDC *)rec; HDC hdc = data->pdev->dev.hdc; int ret = PlayEnhMetaFileRecord(hdc, htable, rec, handle_count); UINT aa_flags; @@ -1171,6 +1217,12 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, PSDRV_SelectPen(&data->pdev->dev, GetCurrentObject(hdc, OBJ_PEN), NULL); PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); + + if (p->iRelative >= 0 || data->saved_dc_top + p->iRelative < 0) + return 0; + data->saved_dc_top += p->iRelative; + data->break_extra = data->saved_dc[data->saved_dc_top].break_extra; + data->break_rem = data->saved_dc[data->saved_dc_top].break_rem; } return ret; } @@ -1633,6 +1685,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return gradient_fill(&data->pdev->dev, p->Ver, p->nVer, p->Ver + p->nVer, p->nTri, p->ulMode); } + case EMR_SETTEXTJUSTIFICATION: + { + const EMRSETTEXTJUSTIFICATION *p = (const EMRSETTEXTJUSTIFICATION *)rec; + + data->break_extra = p->break_extra / p->break_count; + data->break_rem = p->break_extra - data->break_extra * p->break_count; + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); + } case EMR_EXTFLOODFILL: case EMR_ALPHABLEND: @@ -1656,7 +1716,6 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_INTERSECTCLIPRECT: case EMR_SCALEVIEWPORTEXTEX: case EMR_SCALEWINDOWEXTEX: - case EMR_SAVEDC: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM: case EMR_CREATEPEN: @@ -1669,7 +1728,6 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_EXTSELECTCLIPRGN: case EMR_EXTCREATEFONTINDIRECTW: case EMR_SETLAYOUT: - case EMR_SETTEXTJUSTIFICATION: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); default: FIXME("unsupported record: %ld\n", rec->iType); @@ -1719,6 +1777,10 @@ static BOOL print_metafile(struct pp_data *data, HANDLE hdata) DeleteEnhMetaFile(hmf); free(data->patterns); data->patterns = NULL; + data->path = FALSE; + data->break_extra = 0; + data->break_rem = 0; + data->saved_dc_top = 0; return ret; } @@ -1959,6 +2021,7 @@ BOOL WINAPI ClosePrintProcessor(HANDLE pp) DeleteDC(data->pdev->dev.hdc); HeapFree(GetProcessHeap(), 0, data->pdev->Devmode); HeapFree(GetProcessHeap(), 0, data->pdev); + free(data->saved_dc); memset(data, 0, sizeof(*data)); LocalFree(data);

1 0

Piotr Caban : wineps: Handle font selection in spool files.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: wine Branch: master Commit: f2f90fae67673b3cb2fde19a6e9668682cbf2007 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2f90fae67673b3cb2fde19a6e9668… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 19:59:47 2023 +0200 wineps: Handle font selection in spool files. --- dlls/wineps.drv/Makefile.in | 2 +- dlls/wineps.drv/printproc.c | 67 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index 52eb27923d9..aa8d15759b4 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = wineps.drv -IMPORTS = user32 gdi32 winspool advapi32 +IMPORTS = user32 gdi32 winspool advapi32 win32u C_SRCS = \ afm.c \ diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 71dd28239e1..449748c8b22 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <windows.h> +#include <ntgdi.h> #include <winspool.h> #include <ddk/winsplp.h> @@ -40,7 +41,10 @@ struct pp_data HANDLE hport; WCHAR *doc_name; WCHAR *out_file; + PSDRV_PDEVICE *pdev; + struct gdi_physdev font_dev; + struct brush_pattern *patterns; BOOL path; }; @@ -133,6 +137,50 @@ static struct pp_data* get_handle_data(HANDLE pp) return ret; } +static BOOL CDECL font_EnumFonts(PHYSDEV dev, LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lp) +{ + return EnumFontFamiliesExW(dev->hdc, lf, proc, lp, 0); +} + +static BOOL CDECL font_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) +{ + XFORM old, xform = { .eM11 = 1.0f }; + BOOL ret; + + GetWorldTransform(dev->hdc, &old); + SetWorldTransform(dev->hdc, &xform); + ret = NtGdiGetCharWidthW(dev->hdc, first, count, (WCHAR *)chars, NTGDI_GETCHARWIDTH_INT, buffer); + SetWorldTransform(dev->hdc, &old); + return ret; +} + +static BOOL CDECL font_GetTextExtentExPoint(PHYSDEV dev, const WCHAR *str, INT count, INT *dxs) +{ + SIZE size; + return GetTextExtentExPointW(dev->hdc, str, count, -1, NULL, dxs, &size); +} + +static BOOL CDECL font_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) +{ + return GetTextMetricsW(dev->hdc, metrics); +} + +static HFONT CDECL font_SelectFont(PHYSDEV dev, HFONT hfont, UINT *aa_flags) +{ + *aa_flags = GGO_BITMAP; + return SelectObject(dev->hdc, hfont) ? hfont : 0; +} + +static const struct gdi_dc_funcs font_funcs = +{ + .pEnumFonts = font_EnumFonts, + .pGetCharWidth = font_GetCharWidth, + .pGetTextExtentExPoint = font_GetTextExtentExPoint, + .pGetTextMetrics = font_GetTextMetrics, + .pSelectFont = font_SelectFont, + .priority = GDI_PRIORITY_FONT_DRV +}; + static inline INT GDI_ROUND(double val) { return (int)floor(val + 0.5); @@ -1114,18 +1162,23 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, { HDC hdc = data->pdev->dev.hdc; int ret = PlayEnhMetaFileRecord(hdc, htable, rec, handle_count); + UINT aa_flags; - select_hbrush(data, htable, handle_count, GetCurrentObject(hdc, OBJ_BRUSH)); - /* TODO: reselect font */ - PSDRV_SelectPen(&data->pdev->dev, GetCurrentObject(hdc, OBJ_PEN), NULL); - PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); - PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); + if (ret) + { + select_hbrush(data, htable, handle_count, GetCurrentObject(hdc, OBJ_BRUSH)); + PSDRV_SelectFont(&data->pdev->dev, GetCurrentObject(hdc, OBJ_FONT), &aa_flags); + PSDRV_SelectPen(&data->pdev->dev, GetCurrentObject(hdc, OBJ_PEN), NULL); + PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); + PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); + } return ret; } case EMR_SELECTOBJECT: { const EMRSELECTOBJECT *so = (const EMRSELECTOBJECT *)rec; struct brush_pattern *pattern; + UINT aa_flags; HGDIOBJ obj; obj = get_object_handle(data, htable, so->ihObject, &pattern); @@ -1135,6 +1188,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, { case OBJ_PEN: return PSDRV_SelectPen(&data->pdev->dev, obj, NULL) != NULL; case OBJ_BRUSH: return PSDRV_SelectBrush(&data->pdev->dev, obj, pattern) != NULL; + case OBJ_FONT: return PSDRV_SelectFont(&data->pdev->dev, obj, &aa_flags) != NULL; default: FIXME("unhandled object type %ld\n", GetObjectType(obj)); return 1; @@ -1749,6 +1803,9 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) return NULL; } data->pdev->dev.hdc = hdc; + data->pdev->dev.next = &data->font_dev; + data->font_dev.funcs = &font_funcs; + data->font_dev.hdc = hdc; PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc));

1 0

Piotr Caban : wineps: Rename handle count parameter in hmf_proc.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: wine Branch: master Commit: c15add32104ccb5b9294f81c314f3e03d82f5a9d URL: https://gitlab.winehq.org/wine/wine/-/commit/c15add32104ccb5b9294f81c314f3e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 19:45:28 2023 +0200 wineps: Rename handle count parameter in hmf_proc. --- dlls/wineps.drv/printproc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 84d7539b963..d4c6d95b003 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1008,12 +1008,12 @@ static BOOL is_path_record(int type) } static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, - const ENHMETARECORD *rec, int n, LPARAM arg) + const ENHMETARECORD *rec, int handle_count, LPARAM arg) { struct pp_data *data = (struct pp_data *)arg; if (data->path && is_path_record(rec->iType)) - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); switch (rec->iType) { @@ -1113,9 +1113,9 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_RESTOREDC: { HDC hdc = data->pdev->dev.hdc; - int ret = PlayEnhMetaFileRecord(hdc, htable, rec, n); + int ret = PlayEnhMetaFileRecord(hdc, htable, rec, handle_count); - select_hbrush(data, htable, n, GetCurrentObject(hdc, OBJ_BRUSH)); + select_hbrush(data, htable, handle_count, GetCurrentObject(hdc, OBJ_BRUSH)); /* TODO: reselect font */ PSDRV_SelectPen(&data->pdev->dev, GetCurrentObject(hdc, OBJ_PEN), NULL); PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); @@ -1145,7 +1145,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, const EMRDELETEOBJECT *p = (const EMRDELETEOBJECT *)rec; memset(&data->patterns[p->ihObject], 0, sizeof(*data->patterns)); - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); } case EMR_ANGLEARC: { @@ -1169,7 +1169,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, arcto.ptlEnd.y = GDI_ROUND(p->ptlCenter.y - sin((p->eStartAngle + p->eSweepAngle) * M_PI / 180) * p->nRadius); - ret = hmf_proc(hdc, htable, (ENHMETARECORD *)&arcto, n, arg); + ret = hmf_proc(hdc, htable, (ENHMETARECORD *)&arcto, handle_count, arg); SetArcDirection(data->pdev->dev.hdc, arc_dir); return ret; } @@ -1266,12 +1266,12 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_BEGINPATH: { data->path = TRUE; - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); } case EMR_ENDPATH: { data->path = FALSE; - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); } case EMR_FILLPATH: return PSDRV_FillPath(&data->pdev->dev); @@ -1282,7 +1282,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_ABORTPATH: { data->path = FALSE; - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); } case EMR_FILLRGN: { @@ -1291,7 +1291,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, int ret; rgn = ExtCreateRegion(NULL, p->cbRgnData, (const RGNDATA *)p->RgnData); - ret = fill_rgn(data, htable, n, p->ihBrush, rgn); + ret = fill_rgn(data, htable, handle_count, p->ihBrush, rgn); DeleteObject(rgn); return ret; } @@ -1315,7 +1315,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, OffsetRgn(rgn, 0, -p->szlStroke.cy); CombineRgn(frame, rgn, frame, RGN_DIFF); - ret = fill_rgn(data, htable, n, p->ihBrush, frame); + ret = fill_rgn(data, htable, handle_count, p->ihBrush, frame); DeleteObject(rgn); DeleteObject(frame); return ret; @@ -1328,7 +1328,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, rgn = ExtCreateRegion(NULL, p->cbRgnData, (const RGNDATA *)p->RgnData); old_rop = SetROP2(data->pdev->dev.hdc, R2_NOT); - ret = fill_rgn(data, htable, n, 0x80000000 | BLACK_BRUSH, rgn); + ret = fill_rgn(data, htable, handle_count, 0x80000000 | BLACK_BRUSH, rgn); SetROP2(data->pdev->dev.hdc, old_rop); DeleteObject(rgn); return ret; @@ -1541,7 +1541,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, { const EMRCREATEMONOBRUSH *p = (const EMRCREATEMONOBRUSH *)rec; - if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n)) + if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count)) return 0; data->patterns[p->ihBrush].usage = p->iUsage; data->patterns[p->ihBrush].info = (BITMAPINFO *)((BYTE *)p + p->offBmi); @@ -1552,7 +1552,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, { const EMRCREATEDIBPATTERNBRUSHPT *p = (const EMRCREATEDIBPATTERNBRUSHPT *)rec; - if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n)) + if (!PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count)) return 0; data->patterns[p->ihBrush].usage = p->iUsage; data->patterns[p->ihBrush].info = (BITMAPINFO *)((BYTE *)p + p->offBmi); @@ -1615,7 +1615,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_EXTSELECTCLIPRGN: case EMR_SETLAYOUT: case EMR_SETTEXTJUSTIFICATION: - return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); + return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); default: FIXME("unsupported record: %ld\n", rec->iType); }

1 0

Piotr Caban : wineps: Set text and background color during device creation.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: wine Branch: master Commit: a2c644a8f1b77a67f67e6c664d2472b7dfccf818 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2c644a8f1b77a67f67e6c664d2472… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 19:49:03 2023 +0200 wineps: Set text and background color during device creation. --- dlls/wineps.drv/printproc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index d4c6d95b003..8c32808dcdd 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1748,6 +1748,9 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) return NULL; } data->pdev->dev.hdc = hdc; + + PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); + PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); return (HANDLE)data; }

1 0

Piotr Caban : wineps: Add BiDi support in EMR_EXTTEXTOUTW record.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: wine Branch: master Commit: 0d95b8218268d1bcd788d97185dea7270f01f74d URL: https://gitlab.winehq.org/wine/wine/-/commit/0d95b8218268d1bcd788d97185dea7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 18 20:15:28 2023 +0200 wineps: Add BiDi support in EMR_EXTTEXTOUTW record. --- dlls/wineps.drv/Makefile.in | 1 + dlls/wineps.drv/direction.c | 717 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wineps.drv/printproc.c | 602 ++++++++++++++++++++++++++++++++++++- tools/make_unicode | 1 + 4 files changed, 1320 insertions(+), 1 deletion(-)

1 0

Henri Verbeet : wined3d: Implement shader_extract_from_dxbc() on top of vkd3d_shader_parse_dxbc().
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: wine Branch: master Commit: 11fe071d51824f09e58b3ceac1717644bc2751c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/11fe071d51824f09e58b3ceac17176… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 10:05:40 2023 +0200 wined3d: Implement shader_extract_from_dxbc() on top of vkd3d_shader_parse_dxbc(). --- dlls/wined3d/shader_sm4.c | 131 ++++++++++++---------------------------------- 1 file changed, 34 insertions(+), 97 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a55bc2df3f5..b87d45b0fb7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -17,6 +17,8 @@ */ #include "wined3d_private.h" +#define LIBVKD3D_SHADER_SOURCE +#include <vkd3d_shader.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); @@ -1823,7 +1825,6 @@ const struct wined3d_shader_frontend sm4_shader_frontend = }; #define TAG_AON9 WINEMAKEFOURCC('A', 'o', 'n', '9') -#define TAG_DXBC WINEMAKEFOURCC('D', 'X', 'B', 'C') #define TAG_ISG1 WINEMAKEFOURCC('I', 'S', 'G', '1') #define TAG_ISGN WINEMAKEFOURCC('I', 'S', 'G', 'N') #define TAG_OSG1 WINEMAKEFOURCC('O', 'S', 'G', '1') @@ -1842,13 +1843,6 @@ struct aon9_header unsigned int byte_code_offset; }; -struct shader_handler_context -{ - struct wined3d_shader *shader; - enum vkd3d_shader_source_type *source_type; - unsigned int max_version; -}; - static void read_dword(const char **ptr, unsigned int *d) { memcpy(d, *ptr, sizeof(*d)); @@ -1873,77 +1867,6 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } } -static HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, unsigned int data_size, unsigned int tag, void *ctx), void *ctx) -{ - const char *ptr = data; - HRESULT hr = S_OK; - unsigned int chunk_count; - unsigned int total_size; - unsigned int i; - unsigned int version; - unsigned int tag; - - read_dword(&ptr, &tag); - TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - - if (tag != TAG_DXBC) - { - WARN("Wrong tag.\n"); - return E_INVALIDARG; - } - - WARN("Ignoring DXBC checksum.\n"); - skip_dword_unknown(&ptr, 4); - - read_dword(&ptr, &version); - TRACE("version: %#x.\n", version); - if (version != 0x00000001) - { - WARN("Got unexpected DXBC version %#x.\n", version); - return E_INVALIDARG; - } - - read_dword(&ptr, &total_size); - TRACE("total size: %#x\n", total_size); - - read_dword(&ptr, &chunk_count); - TRACE("chunk count: %#x\n", chunk_count); - - for (i = 0; i < chunk_count; ++i) - { - unsigned int chunk_tag, chunk_size; - const char *chunk_ptr; - unsigned int chunk_offset; - - read_dword(&ptr, &chunk_offset); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); - - if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) - { - WARN("Invalid chunk offset %#x (data size %#Ix).\n", chunk_offset, data_size); - return E_FAIL; - } - - chunk_ptr = data + chunk_offset; - - read_dword(&chunk_ptr, &chunk_tag); - read_dword(&chunk_ptr, &chunk_size); - - if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) - { - WARN("Invalid chunk size %#x (data size %#Ix, chunk offset %#x).\n", - chunk_size, data_size, chunk_offset); - return E_FAIL; - } - - if (FAILED(hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx))) - break; - } - - return hr; -} - static const char *shader_get_string(const char *data, size_t data_size, unsigned int offset) { if (offset >= data_size) @@ -2031,17 +1954,19 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, unsigned int return S_OK; } -static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_size, unsigned int tag, void *context) +static HRESULT shader_dxbc_process_section(struct wined3d_shader *shader, unsigned int max_version, + enum vkd3d_shader_source_type *source_type, const struct vkd3d_shader_dxbc_section_desc *section) { - struct shader_handler_context *ctx = context; - struct wined3d_shader *shader = ctx->shader; + unsigned int data_size = section->data.size; + const void *data = section->data.code; + uint32_t tag = section->tag; HRESULT hr; switch (tag) { case TAG_ISGN: case TAG_ISG1: - if (ctx->max_version < 4) + if (max_version < 4) { TRACE("Skipping shader input signature.\n"); break; @@ -2058,7 +1983,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz case TAG_OSGN: case TAG_OSG1: case TAG_OSG5: - if (ctx->max_version < 4) + if (max_version < 4) { TRACE("Skipping shader output signature.\n"); break; @@ -2085,22 +2010,22 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz case TAG_SHDR: case TAG_SHEX: - if (ctx->max_version < 4) + if (max_version < 4) { TRACE("Skipping SM4+ shader.\n"); break; } if (shader->function) FIXME("Multiple shader code chunks.\n"); - shader->function = (const DWORD *)data; + shader->function = data; shader->functionLength = data_size; - *ctx->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + *source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; break; case TAG_AON9: - if (ctx->max_version < 4) + if (max_version < 4) { - const struct aon9_header *header = (const struct aon9_header *)data; + const struct aon9_header *header = data; unsigned int unknown_dword_count; const char *byte_code; @@ -2109,7 +2034,8 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz WARN("Invalid Aon9 data size %#x.\n", data_size); return E_FAIL; } - byte_code = data + header->byte_code_offset; + byte_code = data; + byte_code += header->byte_code_offset; unknown_dword_count = (header->byte_code_offset - sizeof(*header)) / sizeof(DWORD); if (data_size - 2 * sizeof(DWORD) < header->byte_code_offset) @@ -2123,7 +2049,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz FIXME("Multiple shader code chunks.\n"); shader->function = (const DWORD *)byte_code; shader->functionLength = data_size - header->byte_code_offset; - *ctx->source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; + *source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; TRACE("Feature level 9 shader version 0%08x, 0%08lx.\n", header->shader_version, *shader->function); } @@ -2144,14 +2070,25 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, unsigned int max_shader_version, enum vkd3d_shader_source_type *source_type) { - struct shader_handler_context ctx; - HRESULT hr; + const struct vkd3d_shader_code dxbc = {.code = shader->byte_code, .size = shader->byte_code_size}; + struct vkd3d_shader_dxbc_desc dxbc_desc; + HRESULT hr = WINED3D_OK; + unsigned int i; + int ret; - ctx.shader = shader; - ctx.source_type = source_type; - ctx.max_version = max_shader_version; + if ((ret = vkd3d_shader_parse_dxbc(&dxbc, 0, &dxbc_desc, NULL)) < 0) + { + WARN("Failed to parse DXBC, ret %d.\n", ret); + return E_INVALIDARG; + } + + for (i = 0; i < dxbc_desc.section_count; ++i) + { + if (FAILED(hr = shader_dxbc_process_section(shader, max_shader_version, source_type, &dxbc_desc.sections[i]))) + break; + } + vkd3d_shader_free_dxbc(&dxbc_desc); - hr = parse_dxbc(shader->byte_code, shader->byte_code_size, shader_dxbc_chunk_handler, &ctx); if (!shader->function) hr = E_INVALIDARG;

1 0

Stefan Dösinger : wined3d: Avoid VK_IMAGE_LAYOUT_GENERAL.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: wine Branch: master Commit: 9d4e4e496f5aaa9c0cee98d6a5d0ae028fd613fb URL: https://gitlab.winehq.org/wine/wine/-/commit/9d4e4e496f5aaa9c0cee98d6a5d0ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 13 13:53:21 2023 +0300 wined3d: Avoid VK_IMAGE_LAYOUT_GENERAL. This improves GPU-side performance considerably by allowing the driver to keep lossless texture compression enabled for textures that are used as both render taget / depth stencil and shader resource. --- dlls/wined3d/texture.c | 93 +++++++++++++++++++++++++++++++++++++------------- dlls/wined3d/view.c | 5 ++- 2 files changed, 73 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 626b0908c68..5a78d82ec62 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4906,7 +4906,20 @@ const VkDescriptorImageInfo *wined3d_texture_vk_get_default_image_info(struct wi TRACE("Created image view 0x%s.\n", wine_dbgstr_longlong(texture_vk->default_image_info.imageView)); texture_vk->default_image_info.sampler = VK_NULL_HANDLE; - texture_vk->default_image_info.imageLayout = texture_vk->layout; + + /* The default image view is used for SRVs, UAVs and RTVs when the d3d view encompasses the entire + * resource. Any UAV capable resource will always use VK_IMAGE_LAYOUT_GENERAL, so we can use the + * same image info for SRVs and UAVs. For render targets wined3d_rendertarget_view_vk_get_image_view + * only cares about the VkImageView, not entire image info. So using SHADER_READ_ONLY_OPTIMAL works, + * but relies on what the callers of the function do and don't do with the descriptor we return. + * + * Note that VkWriteDescriptorSet for SRV/UAV use takes a VkDescriptorImageInfo *, so we need a + * place to store the VkDescriptorImageInfo. So returning onlky a VkImageView from this function + * would bring its own problems. */ + if (texture_vk->layout == VK_IMAGE_LAYOUT_GENERAL) + texture_vk->default_image_info.imageLayout = VK_IMAGE_LAYOUT_GENERAL; + else + texture_vk->default_image_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; return &texture_vk->default_image_info; } @@ -5511,26 +5524,18 @@ BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, if (resource->bind_flags & WINED3D_BIND_UNORDERED_ACCESS) vk_usage |= VK_IMAGE_USAGE_STORAGE_BIT; - texture_vk->layout = VK_IMAGE_LAYOUT_GENERAL; - if (wined3d_popcount(resource->bind_flags) == 1) + if (resource->bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + texture_vk->layout = VK_IMAGE_LAYOUT_GENERAL; + else if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET) + texture_vk->layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + else if (resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) + texture_vk->layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + else if (resource->bind_flags & WINED3D_BIND_SHADER_RESOURCE) + texture_vk->layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + else { - switch (resource->bind_flags) - { - case WINED3D_BIND_RENDER_TARGET: - texture_vk->layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - break; - - case WINED3D_BIND_DEPTH_STENCIL: - texture_vk->layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - break; - - case WINED3D_BIND_SHADER_RESOURCE: - texture_vk->layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; - break; - - default: - break; - } + FIXME("unexpected bind flags %s, using VK_IMAGE_LAYOUT_GENERAL\n", wined3d_debug_bind_flags(resource->bind_flags)); + texture_vk->layout = VK_IMAGE_LAYOUT_GENERAL; } if (!wined3d_context_vk_create_image(context_vk, vk_image_type, vk_usage, format_vk->vk_format, @@ -5540,6 +5545,10 @@ BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, return FALSE; } + /* We can't use a zero src access mask without synchronization2. Set the last-used bind mask to something + * non-zero to avoid this. */ + texture_vk->bind_mask = resource->bind_flags; + vk_range.aspectMask = vk_aspect_mask_from_format(&format_vk->f); vk_range.baseMipLevel = 0; vk_range.levelCount = VK_REMAINING_MIP_LEVELS; @@ -5706,15 +5715,48 @@ HRESULT wined3d_texture_vk_init(struct wined3d_texture_vk *texture_vk, struct wi flags, device, parent, parent_ops, &texture_vk[1], &wined3d_texture_vk_ops); } +enum VkImageLayout wined3d_layout_from_bind_mask(const struct wined3d_texture_vk *texture_vk, const uint32_t bind_mask) +{ + assert(wined3d_popcount(bind_mask) == 1); + + /* We want to avoid switching between LAYOUT_GENERAL and other layouts. In Radeon GPUs (and presumably + * others), this will trigger decompressing and recompressing the texture. We also hardcode the layout + * into views when they are created. */ + if (texture_vk->layout == VK_IMAGE_LAYOUT_GENERAL) + return VK_IMAGE_LAYOUT_GENERAL; + + switch (bind_mask) + { + case WINED3D_BIND_RENDER_TARGET: + return VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + case WINED3D_BIND_DEPTH_STENCIL: + return VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + + case WINED3D_BIND_SHADER_RESOURCE: + return VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + + default: + ERR("Unexpected bind mask %s.\n", wined3d_debug_bind_flags(bind_mask)); + return VK_IMAGE_LAYOUT_GENERAL; + } +} + void wined3d_texture_vk_barrier(struct wined3d_texture_vk *texture_vk, struct wined3d_context_vk *context_vk, uint32_t bind_mask) { + enum VkImageLayout new_layout; uint32_t src_bind_mask = 0; TRACE("texture_vk %p, context_vk %p, bind_mask %s.\n", texture_vk, context_vk, wined3d_debug_bind_flags(bind_mask)); - if (bind_mask & ~WINED3D_READ_ONLY_BIND_MASK) + new_layout = wined3d_layout_from_bind_mask(texture_vk, bind_mask); + + /* A layout transition is potentially a read-write operation, so even if we + * prepare the texture to e.g. read only shader resource mode, we have to wait + * for past operations to finish. */ + if (bind_mask & ~WINED3D_READ_ONLY_BIND_MASK || new_layout != texture_vk->layout) { src_bind_mask = texture_vk->bind_mask & WINED3D_READ_ONLY_BIND_MASK; if (!src_bind_mask) @@ -5732,8 +5774,9 @@ void wined3d_texture_vk_barrier(struct wined3d_texture_vk *texture_vk, { VkImageSubresourceRange vk_range; - TRACE(" %s -> %s.\n", - wined3d_debug_bind_flags(src_bind_mask), wined3d_debug_bind_flags(bind_mask)); + TRACE(" %s(%x) -> %s(%x).\n", + wined3d_debug_bind_flags(src_bind_mask), texture_vk->layout, + wined3d_debug_bind_flags(bind_mask), new_layout); vk_range.aspectMask = vk_aspect_mask_from_format(texture_vk->t.resource.format); vk_range.baseMipLevel = 0; @@ -5745,7 +5788,9 @@ void wined3d_texture_vk_barrier(struct wined3d_texture_vk *texture_vk, vk_pipeline_stage_mask_from_bind_flags(src_bind_mask), vk_pipeline_stage_mask_from_bind_flags(bind_mask), vk_access_mask_from_bind_flags(src_bind_mask), vk_access_mask_from_bind_flags(bind_mask), - texture_vk->layout, texture_vk->layout, texture_vk->image.vk_image, &vk_range); + texture_vk->layout, new_layout, texture_vk->image.vk_image, &vk_range); + + texture_vk->layout = new_layout; } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 9d62c4a5089..6bdc865b85e 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1190,7 +1190,10 @@ static void wined3d_shader_resource_view_vk_cs_init(void *object) srv_vk->view_vk.u.vk_image_info.imageView = vk_image_view; srv_vk->view_vk.u.vk_image_info.sampler = VK_NULL_HANDLE; - srv_vk->view_vk.u.vk_image_info.imageLayout = texture_vk->layout; + if (texture_vk->layout == VK_IMAGE_LAYOUT_GENERAL) + srv_vk->view_vk.u.vk_image_info.imageLayout = VK_IMAGE_LAYOUT_GENERAL; + else + srv_vk->view_vk.u.vk_image_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; } HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view_vk *view_vk,

1 0

Stefan Dösinger : wined3d: Sync depth stencils to both early and late depth test.
by Alexandre Julliard April 19, 2023

April 19, 2023

Module: wine Branch: master Commit: 75e82b77aa1333057182d88fea47746f6d4f34c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/75e82b77aa1333057182d88fea4774… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 27 13:13:17 2023 +0300 wined3d: Sync depth stencils to both early and late depth test. We don't know which test the next draw will use when we place the barrier. We may be able to figure this out, but it is not trivial. This avoids a read-after-write hazard after the next patch. The layout transition from shader-read-only to depth stencil needs to be finished before the early depth test in a follow-up draw if this draw uses early depth. --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index f8fa34727bd..471d2f32f03 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -582,7 +582,7 @@ VkPipelineStageFlags vk_pipeline_stage_mask_from_bind_flags(uint32_t bind_flags) if (bind_flags & WINED3D_BIND_RENDER_TARGET) flags |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; if (bind_flags & WINED3D_BIND_DEPTH_STENCIL) - flags |= VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; + flags |= VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT; if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) flags |= VK_PIPELINE_STAGE_TRANSFORM_FEEDBACK_BIT_EXT;

1 0