July 2021 - Wine-devel - list.winehq.org

[PATCH v2 06/10] gdi32: Use get_dc_attr in SetPolyFillMode.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 28 ---------------------------- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 23 +++++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 31 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7af91e3bcdb..d14593652b8 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1392,34 +1392,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * SetPolyFillMode (GDI32.@) - */ -INT WINAPI SetPolyFillMode( HDC hdc, INT mode ) -{ - INT ret = 0; - DC *dc; - - if ((mode <= 0) || (mode > POLYFILL_LAST)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetPolyFillMode ); - mode = physdev->funcs->pSetPolyFillMode( physdev, mode ); - if (mode) - { - ret = dc->attr->poly_fill_mode; - dc->attr->poly_fill_mode = mode; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetStretchBltMode (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 69e4a89af97..78969c69783 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -125,13 +125,13 @@ BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) +BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) { EMRSETPOLYFILLMODE emr; emr.emr.iType = EMR_SETPOLYFILLMODE; emr.emr.nSize = sizeof(emr); emr.iMode = mode; - return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index def005cefbd..12b39067b2b 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -123,7 +123,6 @@ extern DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HID extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, INT nBreakCount ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 929d7a2dd51..8f210cb71a3 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -139,7 +139,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetMapMode, /* pSetMapMode */ EMFDRV_SetMapperFlags, /* pSetMapperFlags */ EMFDRV_SetPixel, /* pSetPixel */ - EMFDRV_SetPolyFillMode, /* pSetPolyFillMode */ + NULL, /* pSetPolyFillMode */ NULL, /* pSetRelAbs */ EMFDRV_SetStretchBltMode, /* pSetStretchBltMode */ NULL, /* pSetTextCharacterExtra */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e57524d0a29..dec66f69dbc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -68,6 +68,7 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetRelAbs( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; @@ -115,6 +116,7 @@ extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index b3ec0cf5587..90c70f9d976 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -173,6 +173,29 @@ INT WINAPI GetPolyFillMode( HDC hdc ) return dc_attr ? dc_attr->poly_fill_mode : 0; } +/*********************************************************************** + * SetPolyFillMode (GDI32.@) + */ +INT WINAPI SetPolyFillMode( HDC hdc, INT mode ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (mode <= 0 || mode > POLYFILL_LAST) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (is_meta_dc( hdc )) return METADC_SetPolyFillMode( hdc, mode ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + if (dc_attr->emf && !EMFDC_SetPolyFillMode( dc_attr, mode )) return 0; + + ret = dc_attr->poly_fill_mode; + dc_attr->poly_fill_mode = mode; + return ret; +} + /*********************************************************************** * GetCurrentPositionEx (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 661d2e49db4..4b886aaba6d 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -60,9 +60,9 @@ BOOL METADC_SetRelAbs( HDC hdc, INT mode ) return metadc_param1( hdc, META_SETRELABS, (WORD)mode ); } -INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) +BOOL METADC_SetPolyFillMode( HDC hdc, INT mode ) { - return MFDRV_MetaParam1( dev, META_SETPOLYFILLMODE, (WORD)mode) ? mode : 0; + return metadc_param1( hdc, META_SETPOLYFILLMODE, mode ); } INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 729140da700..f8c4153c410 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -202,7 +202,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetMapMode, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ NULL, /* pSetPixel */ - MFDRV_SetPolyFillMode, /* pSetPolyFillMode */ + NULL, /* pSetPolyFillMode */ NULL, /* pSetRelAbs */ MFDRV_SetStretchBltMode, /* pSetStretchBltMode */ MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index a4c0f4b3e25..889cdfbb6a2 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -111,7 +111,6 @@ extern COLORREF CDECL MFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPE extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH v2 05/10] gdi32: Store poly fill mode in DC_ATTR.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 28 +++++----------------------- dlls/gdi32/dibdrv/graphics.c | 3 ++- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 4 ++-- dlls/gdi32/tests/metafile.c | 2 +- include/ntgdi.h | 1 + 7 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c8124b25960..7af91e3bcdb 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -83,8 +83,8 @@ static void set_initial_dc_state( DC *dc ) dc->attr->layout = 0; dc->font_code_page = CP_ACP; dc->attr->rop_mode = R2_COPYPEN; - dc->polyFillMode = ALTERNATE; - dc->stretchBltMode = BLACKONWHITE; + dc->attr->poly_fill_mode = ALTERNATE; + dc->stretchBltMode = BLACKONWHITE; dc->attr->rel_abs_mode = ABSOLUTE; dc->attr->background_mode = OPAQUE; dc->attr->background_color = RGB( 255, 255, 255 ); @@ -398,8 +398,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hFont = dc->hFont; newdc->hBitmap = dc->hBitmap; newdc->hPalette = dc->hPalette; - newdc->polyFillMode = dc->polyFillMode; - newdc->stretchBltMode = dc->stretchBltMode; newdc->dcBrushColor = dc->dcBrushColor; newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; @@ -467,7 +465,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->layout = dcs->attr->layout; dc->attr->rop_mode = dcs->attr->rop_mode; - dc->polyFillMode = dcs->polyFillMode; + dc->attr->poly_fill_mode = dcs->attr->poly_fill_mode; dc->stretchBltMode = dcs->stretchBltMode; dc->attr->rel_abs_mode = dcs->attr->rel_abs_mode; dc->attr->background_mode = dcs->attr->background_mode; @@ -1394,22 +1392,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * GetPolyFillMode (GDI32.@) - */ -INT WINAPI GetPolyFillMode( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->polyFillMode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetPolyFillMode (GDI32.@) */ @@ -1429,8 +1411,8 @@ INT WINAPI SetPolyFillMode( HDC hdc, INT mode ) mode = physdev->funcs->pSetPolyFillMode( physdev, mode ); if (mode) { - ret = dc->polyFillMode; - dc->polyFillMode = mode; + ret = dc->attr->poly_fill_mode; + dc->attr->poly_fill_mode = mode; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 30ffad70b02..e4e2de8f99f 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1271,7 +1271,8 @@ BOOL CDECL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, if (pdev->brush.style != BS_NULL && get_dib_rect( &pdev->dib, &rc ) && - !(interior = create_polypolygon_region( points, counts, polygons, dc->polyFillMode, &rc ))) + !(interior = create_polypolygon_region( points, counts, polygons, + dc->attr->poly_fill_mode, &rc ))) { ret = FALSE; goto done; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 7aaa7a24b9f..b3ec0cf5587 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -164,6 +164,15 @@ DWORD WINAPI GetLayout( HDC hdc ) return dc_attr ? dc_attr->layout : GDI_ERROR; } +/*********************************************************************** + * GetPolyFillMode (GDI32.@) + */ +INT WINAPI GetPolyFillMode( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->poly_fill_mode : 0; +} + /*********************************************************************** * GetCurrentPositionEx (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 21a6f6bbc01..262971f2a8a 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -116,7 +116,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; - WORD polyFillMode; WORD stretchBltMode; COLORREF dcBrushColor; COLORREF dcPenColor; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 8761723f62e..b9414967982 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -537,7 +537,7 @@ struct gdi_path *get_gdi_flat_path( DC *dc, HRGN *rgn ) free_gdi_path( dc->path ); dc->path = NULL; - if (ret && rgn) *rgn = path_to_region( ret, dc->polyFillMode ); + if (ret && rgn) *rgn = path_to_region( ret, dc->attr->poly_fill_mode ); } else SetLastError( ERROR_CAN_NOT_COMPLETE ); @@ -684,7 +684,7 @@ HRGN WINAPI PathToRegion(HDC hdc) dc->path = NULL; if (path) { - ret = path_to_region( path, dc->polyFillMode ); + ret = path_to_region( path, dc->attr->poly_fill_mode ); free_gdi_path( path ); } } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 1a38735f044..35a3d2ab82b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -900,7 +900,7 @@ static void test_mf_SaveDC(void) SetPolyFillMode( hdcMetafile, WINDING ); SetBkColor( hdcMetafile, 0x123456 ); - todo_wine ok( !GetPolyFillMode( hdcMetafile ), "GetPolyFillMode succeeded\n" ); + ok( !GetPolyFillMode( hdcMetafile ), "GetPolyFillMode succeeded\n" ); ok( GetBkColor( hdcMetafile ) == CLR_INVALID, "GetBkColor succeeded\n" ); /* Force Win9x to update DC state */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 19c31cd3190..38798213f88 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -107,6 +107,7 @@ typedef struct DC_ATTR DWORD layout; WORD text_align; WORD background_mode; + WORD poly_fill_mode; WORD rop_mode; WORD rel_abs_mode; void *emf; -- 2.25.1

1 0

[PATCH v2 04/10] gdi32: Use get_dc_attr in SetRelAbs.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 28 ---------------------------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 21 +++++++++++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 6 files changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index db1c63ec62c..c8124b25960 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1394,34 +1394,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * SetRelAbs (GDI32.@) - */ -INT WINAPI SetRelAbs( HDC hdc, INT mode ) -{ - INT ret = 0; - DC *dc; - - if ((mode != ABSOLUTE) && (mode != RELATIVE)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetRelAbs ); - mode = physdev->funcs->pSetRelAbs( physdev, mode ); - if (mode) - { - ret = dc->attr->rel_abs_mode; - dc->attr->rel_abs_mode = mode; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetPolyFillMode (GDI32.@) */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 01a451576c1..e57524d0a29 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -68,6 +68,7 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern BOOL METADC_SetBkMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetPixel( HDC hdc, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetRelAbs( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 1523cb5e929..7aaa7a24b9f 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -193,6 +193,27 @@ INT WINAPI GetRelAbs( HDC hdc, DWORD ignore ) return dc_attr ? dc_attr->rel_abs_mode : 0; } +/*********************************************************************** + * SetRelAbs (GDI32.@) + */ +INT WINAPI SetRelAbs( HDC hdc, INT mode ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (mode != ABSOLUTE && mode != RELATIVE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (is_meta_dc( hdc )) return METADC_SetRelAbs( hdc, mode ); + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + ret = dc_attr->rel_abs_mode; + dc_attr->rel_abs_mode = mode; + return ret; +} + /*********************************************************************** * SetROP2 (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index e20dc5666c9..661d2e49db4 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -55,9 +55,9 @@ BOOL METADC_SetROP2( HDC hdc, INT rop ) return metadc_param1( hdc, META_SETROP2, (WORD)rop ); } -INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) +BOOL METADC_SetRelAbs( HDC hdc, INT mode ) { - return MFDRV_MetaParam1( dev, META_SETRELABS, (WORD)mode) ? mode : 0; + return metadc_param1( hdc, META_SETRELABS, (WORD)mode ); } INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 0a95de9a527..729140da700 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -203,7 +203,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_SetMapperFlags, /* pSetMapperFlags */ NULL, /* pSetPixel */ MFDRV_SetPolyFillMode, /* pSetPolyFillMode */ - MFDRV_SetRelAbs, /* pSetRelAbs */ + NULL, /* pSetRelAbs */ MFDRV_SetStretchBltMode, /* pSetStretchBltMode */ MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ MFDRV_SetTextColor, /* pSetTextColor */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 70802a673d7..a4c0f4b3e25 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -112,7 +112,6 @@ extern DWORD CDECL MFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDD extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetPolyFillMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_SetRelAbs( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH v2 03/10] gdi32: Store rel abs mode in DC_ATTR.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 25 ++++--------------------- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index efc3231ae27..db1c63ec62c 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -85,7 +85,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->rop_mode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; dc->stretchBltMode = BLACKONWHITE; - dc->relAbsMode = ABSOLUTE; + dc->attr->rel_abs_mode = ABSOLUTE; dc->attr->background_mode = OPAQUE; dc->attr->background_color = RGB( 255, 255, 255 ); dc->dcBrushColor = RGB( 255, 255, 255 ); @@ -400,7 +400,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->hPalette = dc->hPalette; newdc->polyFillMode = dc->polyFillMode; newdc->stretchBltMode = dc->stretchBltMode; - newdc->relAbsMode = dc->relAbsMode; newdc->dcBrushColor = dc->dcBrushColor; newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; @@ -470,7 +469,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->attr->rop_mode = dcs->attr->rop_mode; dc->polyFillMode = dcs->polyFillMode; dc->stretchBltMode = dcs->stretchBltMode; - dc->relAbsMode = dcs->relAbsMode; + dc->attr->rel_abs_mode = dcs->attr->rel_abs_mode; dc->attr->background_mode = dcs->attr->background_mode; dc->attr->background_color = dcs->attr->background_color; dc->attr->text_color = dcs->attr->text_color; @@ -1395,22 +1394,6 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } -/*********************************************************************** - * GetRelAbs (GDI32.@) - */ -INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore ) -{ - INT ret = 0; - DC *dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->relAbsMode; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetRelAbs (GDI32.@) */ @@ -1430,8 +1413,8 @@ INT WINAPI SetRelAbs( HDC hdc, INT mode ) mode = physdev->funcs->pSetRelAbs( physdev, mode ); if (mode) { - ret = dc->relAbsMode; - dc->relAbsMode = mode; + ret = dc->attr->rel_abs_mode; + dc->attr->rel_abs_mode = mode; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f8ec6083ccf..1523cb5e929 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -184,6 +184,15 @@ INT WINAPI GetROP2( HDC hdc ) return dc_attr ? dc_attr->rop_mode : 0; } +/*********************************************************************** + * GetRelAbs (GDI32.@) + */ +INT WINAPI GetRelAbs( HDC hdc, DWORD ignore ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->rel_abs_mode : 0; +} + /*********************************************************************** * SetROP2 (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 0f01102ed9d..21a6f6bbc01 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -118,7 +118,6 @@ typedef struct tagDC UINT font_code_page; WORD polyFillMode; WORD stretchBltMode; - WORD relAbsMode; COLORREF dcBrushColor; COLORREF dcPenColor; POINT brush_org; diff --git a/include/ntgdi.h b/include/ntgdi.h index ba9d1fe7a00..19c31cd3190 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -108,6 +108,7 @@ typedef struct DC_ATTR WORD text_align; WORD background_mode; WORD rop_mode; + WORD rel_abs_mode; void *emf; } DC_ATTR; -- 2.25.1

1 0

[PATCH v2 02/10] gdi32: Move color space stubs to objects.c.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 46 -------------------------------------------- dlls/gdi32/objects.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index a76c7b79a0b..efc3231ae27 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1306,52 +1306,6 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) return ret; } -/*********************************************************************** - * GetColorSpace (GDI32.@) - */ -HCOLORSPACE WINAPI GetColorSpace(HDC hdc) -{ -/*FIXME Need to do whatever GetColorSpace actually does */ - return 0; -} - -/*********************************************************************** - * CreateColorSpaceA (GDI32.@) - */ -HCOLORSPACE WINAPI CreateColorSpaceA( LPLOGCOLORSPACEA lpLogColorSpace ) -{ - FIXME( "stub\n" ); - return 0; -} - -/*********************************************************************** - * CreateColorSpaceW (GDI32.@) - */ -HCOLORSPACE WINAPI CreateColorSpaceW( LPLOGCOLORSPACEW lpLogColorSpace ) -{ - FIXME( "stub\n" ); - return 0; -} - -/*********************************************************************** - * DeleteColorSpace (GDI32.@) - */ -BOOL WINAPI DeleteColorSpace( HCOLORSPACE hColorSpace ) -{ - FIXME( "stub\n" ); - - return TRUE; -} - -/*********************************************************************** - * SetColorSpace (GDI32.@) - */ -HCOLORSPACE WINAPI SetColorSpace( HDC hDC, HCOLORSPACE hColorSpace ) -{ - FIXME( "stub\n" ); - - return hColorSpace; -} /*********************************************************************** * GetBoundsRect (GDI32.@) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 84ed2377954..2468499973f 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -318,3 +318,48 @@ HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count, INT mode ) { return CreatePolyPolygonRgn( points, &count, 1, mode ); } + +/*********************************************************************** + * CreateColorSpaceA (GDI32.@) + */ +HCOLORSPACE WINAPI CreateColorSpaceA( LOGCOLORSPACEA *cs ) +{ + FIXME( "stub\n" ); + return 0; +} + +/*********************************************************************** + * CreateColorSpaceW (GDI32.@) + */ +HCOLORSPACE WINAPI CreateColorSpaceW( LOGCOLORSPACEW *cs ) +{ + FIXME( "stub\n" ); + return 0; +} + +/*********************************************************************** + * DeleteColorSpace (GDI32.@) + */ +BOOL WINAPI DeleteColorSpace( HCOLORSPACE cs ) +{ + FIXME( "stub\n" ); + return TRUE; +} + +/*********************************************************************** + * GetColorSpace (GDI32.@) + */ +HCOLORSPACE WINAPI GetColorSpace( HDC hdc ) +{ + FIXME( "stub\n" ); + return 0; +} + +/*********************************************************************** + * SetColorSpace (GDI32.@) + */ +HCOLORSPACE WINAPI SetColorSpace( HDC hdc, HCOLORSPACE cs ) +{ + FIXME( "stub\n" ); + return cs; +} -- 2.25.1

1 0

[PATCH v2 01/10] gdi32: Use get_dc_attr in SetArcDirection.
by Huw Davies 29 Jul '21

29 Jul '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dc.c | 29 ---------------------------- dlls/gdi32/enhmfdrv/dc.c | 6 +++--- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 22 +++++++++++++++++++++ 6 files changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 55b48b2be5f..a76c7b79a0b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -990,35 +990,6 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) } -/*********************************************************************** - * SetArcDirection (GDI32.@) - */ -INT WINAPI SetArcDirection( HDC hdc, INT dir ) -{ - DC * dc; - INT ret = 0; - - if (dir != AD_COUNTERCLOCKWISE && dir != AD_CLOCKWISE) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetArcDirection ); - dir = physdev->funcs->pSetArcDirection( physdev, dir ); - if (dir) - { - ret = dc->attr->arc_direction; - dc->attr->arc_direction = dir; - } - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetWorldTransform (GDI32.@) */ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index ff78ab4c774..69e4a89af97 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -143,14 +143,14 @@ INT CDECL EMFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) return EMFDRV_WriteRecord( dev, &emr.emr ) ? mode : 0; } -INT CDECL EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection) +BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) { EMRSETARCDIRECTION emr; emr.emr.iType = EMR_SETARCDIRECTION; emr.emr.nSize = sizeof(emr); - emr.iArcDirection = arcDirection; - return EMFDRV_WriteRecord(dev, &emr.emr) ? arcDirection : 0; + emr.iArcDirection = dir; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } INT CDECL EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index a5d4a623b95..def005cefbd 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -113,7 +113,6 @@ extern BOOL CDECL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_H extern HFONT CDECL EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN CDECL EMFDRV_SelectPen( PHYSDEV dev, HPEN handle, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern HPALETTE CDECL EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN; -extern INT CDECL EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 33f075673cf..929d7a2dd51 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -127,7 +127,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SelectFont, /* pSelectFont */ EMFDRV_SelectPalette, /* pSelectPalette */ EMFDRV_SelectPen, /* pSelectPen */ - EMFDRV_SetArcDirection, /* pSetArcDirection */ + NULL, /* pSetArcDirection */ EMFDRV_SetBkColor, /* pSetBkColor */ NULL, /* pSetBoundsRect */ EMFDRV_SetDCBrushColor, /* pSetDCBrushColor*/ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7ffb92d83d1..01a451576c1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -111,6 +111,7 @@ extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetArcDirection( DC_ATTR *dc_attr, INT dir ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 7f8af0552bf..f8ec6083ccf 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -133,6 +133,28 @@ INT WINAPI GetArcDirection( HDC hdc ) return dc_attr ? dc_attr->arc_direction : 0; } +/*********************************************************************** + * SetArcDirection (GDI32.@) + */ +INT WINAPI SetArcDirection( HDC hdc, INT dir ) +{ + DC_ATTR *dc_attr; + INT ret; + + if (dir != AD_COUNTERCLOCKWISE && dir != AD_CLOCKWISE) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!(dc_attr = get_dc_attr( hdc ))) return 0; + if (dc_attr->emf && !EMFDC_SetArcDirection( dc_attr, dir )) return 0; + + ret = dc_attr->arc_direction; + dc_attr->arc_direction = dir; + return ret; +} + /*********************************************************************** * GetLayout (GDI32.@) */ -- 2.25.1

1 0

[PATCH vkd3d] tests: Do not use llabs(3) on an unsigned difference.
by Chip Davis 29 Jul '21

29 Jul '21

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- tests/d3d12.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index b10f24b..a43a7f2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -63,7 +63,9 @@ static bool compare_uint16(uint16_t a, uint16_t b, unsigned int max_diff) static bool compare_uint64(uint64_t a, uint64_t b, unsigned int max_diff) { - return llabs(a - b) <= max_diff; + uint64_t diff = a > b ? a - b : b - a; + + return diff <= max_diff; } static ULONG get_refcount(void *iface) -- 2.31.1

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_constants().
by Zebediah Figura 29 Jul '21

29 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0bb2287f..4fb26b89 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3041,22 +3041,12 @@ static void shader_write_descriptor_table1(struct root_signature_writer_context shader_write_descriptor_ranges1(buffer, table); } -static int shader_write_root_constants(struct root_signature_writer_context *context, +static void shader_write_root_constants(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_root_constants *constants) { - if (!write_dword(context, constants->shader_register)) - goto fail; - if (!write_dword(context, constants->register_space)) - goto fail; - if (!write_dword(context, constants->value_count)) - goto fail; - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature root constants."); - return VKD3D_ERROR_OUT_OF_MEMORY; + put_u32(buffer, constants->shader_register); + put_u32(buffer, constants->register_space); + put_u32(buffer, constants->value_count); } static int shader_write_root_descriptor(struct root_signature_writer_context *context, @@ -3128,7 +3118,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co shader_write_descriptor_table1(context, &desc->u.v_1_1.parameters[i].u.descriptor_table); break; case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: - ret = shader_write_root_constants(context, versioned_root_signature_get_root_constants(desc, i)); + shader_write_root_constants(buffer, versioned_root_signature_get_root_constants(desc, i)); break; case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: -- 2.32.0

2 11

[PATCH vkd3d v2 1/2] vkd3d-shader: Handle descriptor array dynamic indexing.
by Conor McCarthy 29 Jul '21

29 Jul '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 63 ++++++++++++++++++++++++++++++++++----- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6cdbaf1e..b0412d30 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -573,6 +573,7 @@ enum vkd3d_shader_spirv_extension { VKD3D_SHADER_SPIRV_EXTENSION_NONE, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4fa94826..b9f62408 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1822,6 +1822,13 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, vkd3d_spirv_build_op_extension(&stream, "SPV_KHR_shader_draw_parameters"); if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityDemoteToHelperInvocationEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_demote_to_helper_invocation"); + if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformBufferArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilitySampledImageArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageBufferArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing)) + vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_descriptor_indexing"); if (builder->ext_instr_set_glsl_450) vkd3d_spirv_build_op_ext_inst_import(&stream, builder->ext_instr_set_glsl_450, "GLSL.std.450"); @@ -3126,18 +3133,59 @@ static bool register_is_descriptor(const struct vkd3d_shader_register *reg) } } +static bool vkd3d_dxbc_compiler_enable_descriptor_indexing(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_register_type reg_type, enum vkd3d_shader_resource_type resource_type) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + if (!vkd3d_dxbc_compiler_is_target_extension_supported(compiler, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING)) + return false; + + switch (reg_type) + { + case VKD3DSPR_CONSTBUFFER: + vkd3d_spirv_enable_capability(builder, SpvCapabilityUniformBufferArrayDynamicIndexing); + break; + case VKD3DSPR_RESOURCE: + vkd3d_spirv_enable_capability(builder, resource_type == VKD3D_SHADER_RESOURCE_BUFFER + ? SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT + : SpvCapabilitySampledImageArrayDynamicIndexing); + break; + case VKD3DSPR_UAV: + if (resource_type == VKD3D_SHADER_RESOURCE_BUFFER) + vkd3d_spirv_enable_capability(builder, compiler->ssbo_uavs + ? SpvCapabilityStorageBufferArrayDynamicIndexing + : SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT); + else + vkd3d_spirv_enable_capability(builder, SpvCapabilityStorageImageArrayDynamicIndexing); + break; + case VKD3DSPR_SAMPLER: + break; + default: + ERR("Unhandled register type %#x.\n", reg_type); + break; + } + + return true; +} + static uint32_t vkd3d_dxbc_compiler_get_descriptor_index(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, unsigned int binding_base_idx) + const struct vkd3d_shader_register *reg, unsigned int binding_base_idx, + enum vkd3d_shader_resource_type resource_type) { struct vkd3d_shader_register_index index = reg->idx[1]; uint32_t index_id; if (index.rel_addr) { - FIXME("Descriptor dynamic indexing is not supported.\n"); - vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED, - "Cannot dynamically index a descriptor array of type %#x, id %u. " - "Dynamic indexing is not supported.", reg->type, reg->idx[0].offset); + if (!vkd3d_dxbc_compiler_enable_descriptor_indexing(compiler, reg->type, resource_type)) + { + FIXME("The target environment does not support descriptor indexing.\n"); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED, + "Cannot dynamically index a descriptor array of type %#x, id %u. " + "The target environment does not support descriptor indexing.", reg->type, reg->idx[0].offset); + } } index.offset -= binding_base_idx; @@ -3159,7 +3207,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp assert(!reg->idx[0].rel_addr); if (register_info->descriptor_array) indexes[index_count++] = vkd3d_dxbc_compiler_get_descriptor_index(compiler, reg, - register_info->descriptor_array->info.descriptor_array.binding_base_idx); + register_info->descriptor_array->info.descriptor_array.binding_base_idx, + VKD3D_SHADER_RESOURCE_BUFFER); indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[2]); } @@ -7818,7 +7867,7 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil uint32_t ptr_type_id, index_id; index_id = vkd3d_dxbc_compiler_get_descriptor_index(compiler, resource_reg, - array_data->binding_base_idx); + array_data->binding_base_idx, symbol->info.resource.resource_type_info->resource_type); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, array_data->storage_class, array_data->contained_type_id); -- 2.32.0

2 3

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 29 Jul '21

29 Jul '21

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 202 +++++++++++++++++++++++++++---------------------------- 1 file changed, 100 insertions(+), 102 deletions(-) diff --git a/po/fi.po b/po/fi.po index 1279131a41c..3df52155cc9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6962,10 +6962,8 @@ msgid "Resource is not currently available.\n" msgstr "Resurssi ei ole nyt saatavilla.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Luokan nimi:" +msgstr "Klassinen sininen" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -6974,31 +6972,31 @@ msgstr "Normaali" #: dlls/localspl/localspl.rc:37 msgid "Letter" -msgstr "" +msgstr "Letter" #: dlls/localspl/localspl.rc:38 msgid "Letter Small" -msgstr "" +msgstr "Letter Small" #: dlls/localspl/localspl.rc:39 msgid "Tabloid" -msgstr "" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 msgid "Statement" -msgstr "" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 msgid "Executive" -msgstr "" +msgstr "Executive" #: dlls/localspl/localspl.rc:44 msgid "A3" @@ -7010,7 +7008,7 @@ msgstr "A4" #: dlls/localspl/localspl.rc:46 msgid "A4 Small" -msgstr "" +msgstr "A4 (pieni)" #: dlls/localspl/localspl.rc:47 msgid "A5" @@ -7026,59 +7024,59 @@ msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14 tuumaa" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17 tuumaa" #: dlls/localspl/localspl.rc:54 msgid "Note" -msgstr "" +msgstr "Note" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Envelope #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "Envelope #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "Envelope #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "Envelope #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "Envelope #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C-paperi (ANSI)" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D-paperi (ANSI)" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E-paperi (ANSI)" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "Envelope DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" @@ -7114,31 +7112,31 @@ msgstr "B6-kirjekuori" #: dlls/localspl/localspl.rc:72 msgid "Envelope" -msgstr "" +msgstr "Envelope" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "Monarch-kirjekuori" +msgstr "Envelope Monarch" #: dlls/localspl/localspl.rc:74 msgid "6 3/4 Envelope" -msgstr "" +msgstr "6 3/4 Envelope" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "US Std Fanfold" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "German Std Fanfold" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "German Legal Fanfold" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "B4 (ISO)" +msgstr "B4" #: dlls/localspl/localspl.rc:79 msgid "Japanese Postcard" @@ -7146,83 +7144,83 @@ msgstr "Japanilainen postikortti" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11 tuumaa" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11 tuumaa" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11 tuumaa" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "Envelope Invite" #: dlls/localspl/localspl.rc:84 msgid "Letter Extra" -msgstr "" +msgstr "Letter Extra" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal Extra" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloid Extra" #: dlls/localspl/localspl.rc:87 msgid "A4 Extra" -msgstr "" +msgstr "A4 Extra" #: dlls/localspl/localspl.rc:88 msgid "Letter Transverse" -msgstr "" +msgstr "Letter (pysty)" #: dlls/localspl/localspl.rc:89 msgid "A4 Transverse" -msgstr "" +msgstr "A4 (pysty)" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Letter Extra (pysty)" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super B" #: dlls/localspl/localspl.rc:93 msgid "Letter Plus" -msgstr "" +msgstr "Letter Plus" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 msgid "A5 Transverse" -msgstr "" +msgstr "A5 (pysty)" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) (pysty)" #: dlls/localspl/localspl.rc:97 msgid "A3 Extra" -msgstr "" +msgstr "A3 Extra" #: dlls/localspl/localspl.rc:98 msgid "A5 Extra" -msgstr "" +msgstr "A5 Extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 Extra" #: dlls/localspl/localspl.rc:100 msgid "A2" @@ -7230,15 +7228,15 @@ msgstr "A2" #: dlls/localspl/localspl.rc:101 msgid "A3 Transverse" -msgstr "" +msgstr "A3 (pysty)" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 Extra (pysty)" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "Japanilainen tuplapostikortti" #: dlls/localspl/localspl.rc:104 msgid "A6" @@ -7246,71 +7244,71 @@ msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "Japanin kirjekuori Kaku #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "Japanin kirjekuori Kaku #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "Japanin kirjekuori Chou #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "Japanin kirjekuori Chou #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Letter (vaaka)" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 (vaaka)" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 (vaaka)" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 (vaaka)" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) (vaaka)" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) (vaaka)" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "Japanilainen postikortti (vaaka)" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "Japanilainen tuplapostikortti (vaaka)" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 (vaaka)" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "Japanin kirjekuori Kaku #2 (vaaka)" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "Japanin kirjekuori Kaku #3 (vaaka)" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "Japanin kirjekuori Chou #3 (vaaka)" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "Japanin kirjekuori Chou #4 (vaaka)" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" @@ -7318,123 +7316,123 @@ msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) (vaaka)" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11 tuumaa" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "Japanin kirjekuori You #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "Japanin kirjekuori You #4 (vaaka)" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "PRC 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "PRC 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "PRC 32K(Big)" #: dlls/localspl/localspl.rc:130 msgid "PRC Envelope #1" -msgstr "" +msgstr "PRC Envelope #1" #: dlls/localspl/localspl.rc:131 msgid "PRC Envelope #2" -msgstr "" +msgstr "PRC Envelope #2" #: dlls/localspl/localspl.rc:132 msgid "PRC Envelope #3" -msgstr "" +msgstr "PRC Envelope #3" #: dlls/localspl/localspl.rc:133 msgid "PRC Envelope #4" -msgstr "" +msgstr "PRC Envelope #4" #: dlls/localspl/localspl.rc:134 msgid "PRC Envelope #5" -msgstr "" +msgstr "PRC Envelope #5" #: dlls/localspl/localspl.rc:135 msgid "PRC Envelope #6" -msgstr "" +msgstr "PRC Envelope #6" #: dlls/localspl/localspl.rc:136 msgid "PRC Envelope #7" -msgstr "" +msgstr "PRC Envelope #7" #: dlls/localspl/localspl.rc:137 msgid "PRC Envelope #8" -msgstr "" +msgstr "PRC Envelope #8" #: dlls/localspl/localspl.rc:138 msgid "PRC Envelope #9" -msgstr "" +msgstr "PRC Envelope #9" #: dlls/localspl/localspl.rc:139 msgid "PRC Envelope #10" -msgstr "" +msgstr "PRC Envelope #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "PRC 16K (vaaka)" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "PRC 32K (vaaka)" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "PRC 32K(Big) (vaaka)" #: dlls/localspl/localspl.rc:143 msgid "PRC Envelope #1 Rotated" -msgstr "" +msgstr "PRC Envelope #1 (vaaka)" #: dlls/localspl/localspl.rc:144 msgid "PRC Envelope #2 Rotated" -msgstr "" +msgstr "PRC Envelope #2 (vaaka)" #: dlls/localspl/localspl.rc:145 msgid "PRC Envelope #3 Rotated" -msgstr "" +msgstr "PRC Envelope #3 (vaaka)" #: dlls/localspl/localspl.rc:146 msgid "PRC Envelope #4 Rotated" -msgstr "" +msgstr "PRC Envelope #4 (vaaka)" #: dlls/localspl/localspl.rc:147 msgid "PRC Envelope #5 Rotated" -msgstr "" +msgstr "PRC Envelope #5 (vaaka)" #: dlls/localspl/localspl.rc:148 msgid "PRC Envelope #6 Rotated" -msgstr "" +msgstr "PRC Envelope #6 (vaaka)" #: dlls/localspl/localspl.rc:149 msgid "PRC Envelope #7 Rotated" -msgstr "" +msgstr "PRC Envelope #7 (vaaka)" #: dlls/localspl/localspl.rc:150 msgid "PRC Envelope #8 Rotated" -msgstr "" +msgstr "PRC Envelope #8 (vaaka)" #: dlls/localspl/localspl.rc:151 msgid "PRC Envelope #9 Rotated" -msgstr "" +msgstr "PRC Envelope #9 (vaaka)" #: dlls/localspl/localspl.rc:152 msgid "PRC Envelope #10 Rotated" -msgstr "" +msgstr "PRC Envelope #10 (vaaka)" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 -- 2.32.0

1 0