diff options
| author | Keith Packard <keithp@keithp.com> | 2011-03-17 23:48:52 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-03-17 23:48:52 -0700 |
| commit | d5b16b037b8fe12ba85c68c8289b6a8cc5e3a09d (patch) | |
| tree | 38b4d32afa0143d36d1d1eaeb5fc393dcf9654ea /exa/exa_priv.h | |
| parent | dc9ce695a69ca0787f58f8d160212a7a41acb703 (diff) | |
Revert "dix: Remove usage_hint from pixmaps, store it in ->drawable.class"
This reverts commit 1564c82417d201de5b9a5ec5e7aa4ef14c45fbad.
The drivers used the top bits of the usage_hint to store driver
private flags (intel, radeon, nouveau).
With EXA we need to get at this data so if we migrate the pixmap we
can create the correct type of pixmap in the driver, however this
commit truncates the usage_hint into 8-bit class and loses all the
good stuff.
Signed-off-by: Dave Airlie <airlied@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'exa/exa_priv.h')
| -rw-r--r-- | exa/exa_priv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/exa/exa_priv.h b/exa/exa_priv.h index 1f6dede94..e5d90d468 100644 --- a/exa/exa_priv.h +++ b/exa/exa_priv.h @@ -588,7 +588,7 @@ extern const GCFuncs exaGCFuncs; /* exa_classic.c */ PixmapPtr exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth, - unsigned class); + unsigned usage_hint); Bool exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height, int depth, @@ -603,7 +603,7 @@ exaPixmapHasGpuCopy_classic(PixmapPtr pPixmap); /* exa_driver.c */ PixmapPtr exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth, - unsigned class); + unsigned usage_hint); Bool exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height, int depth, @@ -618,7 +618,7 @@ exaPixmapHasGpuCopy_driver(PixmapPtr pPixmap); /* exa_mixed.c */ PixmapPtr exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth, - unsigned class); + unsigned usage_hint); Bool exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth, |