diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 16:33:27 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 16:33:27 +0200 |
| commit | 2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3 (patch) | |
| tree | 563d66344108d7b00cbf01068cd3e6a88017b0e9 /nx-X11/programs/Xserver/include | |
| parent | cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa (diff) | |
| parent | 8b5bb2cdafe5f7bd77826a1fd28f07b7329be899 (diff) | |
| download | nx-libs-2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3.tar.gz nx-libs-2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3.tar.bz2 nx-libs-2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3.zip | |
Merge branch 'sunweaver-pr/createpixmap-alloc-hints-abi-change' into 3.6.x
Attributes GH PR #410: https://github.com/ArcticaProject/nx-libs/pull/410
Diffstat (limited to 'nx-X11/programs/Xserver/include')
| -rw-r--r-- | nx-X11/programs/Xserver/include/pixmapstr.h | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/include/scrnintstr.h | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/include/pixmapstr.h b/nx-X11/programs/Xserver/include/pixmapstr.h index 5189c3e09..82b96d456 100644 --- a/nx-X11/programs/Xserver/include/pixmapstr.h +++ b/nx-X11/programs/Xserver/include/pixmapstr.h @@ -82,6 +82,7 @@ typedef struct _Pixmap { short screen_x; short screen_y; #endif + unsigned usage_hint; /* see CREATE_PIXMAP_USAGE_* */ } PixmapRec; #endif /* PIXMAPSTRUCT_H */ diff --git a/nx-X11/programs/Xserver/include/scrnintstr.h b/nx-X11/programs/Xserver/include/scrnintstr.h index 341d1145c..5a3f32309 100644 --- a/nx-X11/programs/Xserver/include/scrnintstr.h +++ b/nx-X11/programs/Xserver/include/scrnintstr.h @@ -196,11 +196,19 @@ typedef void (* ClipNotifyProcPtr)( int /*dx*/, int /*dy*/); +/* pixmap will exist only for the duration of the current rendering operation */ +#define CREATE_PIXMAP_USAGE_SCRATCH 1 +/* pixmap will be the backing pixmap for a redirected window */ +#define CREATE_PIXMAP_USAGE_BACKING_PIXMAP 2 +/* pixmap will contain a glyph */ +#define CREATE_PIXMAP_USAGE_GLYPH_PICTURE 3 + typedef PixmapPtr (* CreatePixmapProcPtr)( ScreenPtr /*pScreen*/, int /*width*/, int /*height*/, - int /*depth*/); + int /*depth*/, + unsigned /*usage_hint*/); typedef Bool (* DestroyPixmapProcPtr)( PixmapPtr /*pPixmap*/); |