diff options
author | Dave Airlie <airlied@redhat.com> | 2018-12-27 15:02:29 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-01-11 14:37:16 +1000 |
commit | 3b65a91870ecb6af675dc49f07ffbfabf6ffea6e (patch) | |
tree | 8f8b40d6bf768b777efc0cdfcbbdf3e23442d5c1 | |
parent | 2165636e9cf24b7904e8af362a40ce69aeb83f66 (diff) |
dri_interface: add put shm image2
This adds a new interface to the swrast interface to fix an shm put image bug.
The current code adds the x,y src offsets into the offset parameters,
however if the x offset is > 0, and the put image copies up to the height
of the image, this can trigger an X server validation check to fail and
the renderering to get BadMatch.
This interface accepts src x,y so the caller can control them, and use
them appropriately.
-rw-r--r-- | include/GL/internal/dri_interface.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index 072f3799eac..ef83faabb13 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -589,7 +589,7 @@ struct __DRIdamageExtensionRec { * SWRast Loader extension. */ #define __DRI_SWRAST_LOADER "DRI_SWRastLoader" -#define __DRI_SWRAST_LOADER_VERSION 4 +#define __DRI_SWRAST_LOADER_VERSION 5 struct __DRIswrastLoaderExtensionRec { __DRIextension base; @@ -649,6 +649,23 @@ struct __DRIswrastLoaderExtensionRec { void (*getImageShm)(__DRIdrawable *readable, int x, int y, int width, int height, int shmid, void *loaderPrivate); + + /** + * Put shm image to drawable (v2) + * + * The original version fixes srcx/y to 0, and expected + * the offset to be adjusted. This version allows src x,y + * to not be included in the offset. This is needed to + * avoid certain overflow checks in the X server, that + * result in lost rendering. + * + * \since 5 + */ + void (*putImageShm2)(__DRIdrawable *drawable, int op, + int srcx, int srcy, int x, int y, + int width, int height, int stride, + int shmid, char *shmaddr, unsigned offset, + void *loaderPrivate); }; /** |