summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-11-29 21:39:41 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-01-08 19:21:31 +0000
commit83626aba357ffb4dd7931daaf163c1dd1d08f9d3 (patch)
tree9f3fe4893bc9df510e5b7bf25e733197f32e398c
parent50e07da8094c8c8c593b6eb8c41fc42444851d04 (diff)
uxa-glyphs: Enable TILING_X on glyph caches.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/common.h11
-rw-r--r--src/i830.h11
-rw-r--r--uxa/uxa-glyphs.c4
3 files changed, 14 insertions, 12 deletions
diff --git a/src/common.h b/src/common.h
index b9269b5a..3169cdfa 100644
--- a/src/common.h
+++ b/src/common.h
@@ -389,4 +389,15 @@ extern int I810_DEBUG;
struct pci_device *
intel_host_bridge (void);
+/**
+ * Hints to CreatePixmap to tell the driver how the pixmap is going to be
+ * used.
+ *
+ * Compare to CREATE_PIXMAP_USAGE_* in the server.
+ */
+enum {
+ INTEL_CREATE_PIXMAP_TILING_X = 0x10000000,
+ INTEL_CREATE_PIXMAP_TILING_Y,
+};
+
#endif /* _INTEL_COMMON_H_ */
diff --git a/src/i830.h b/src/i830.h
index 098ea054..4aba2f78 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -599,17 +599,6 @@ extern const int I830CopyROP[16];
#define ALLOW_SHARING 0x00000010
#define DISABLE_REUSE 0x00000020
-/**
- * Hints to CreatePixmap to tell the driver how the pixmap is going to be
- * used.
- *
- * Compare to CREATE_PIXMAP_USAGE_* in the server.
- */
-enum {
- INTEL_CREATE_PIXMAP_TILING_X = 0x10000000,
- INTEL_CREATE_PIXMAP_TILING_Y,
-};
-
void i830_debug_flush(ScrnInfoPtr scrn);
static inline PixmapPtr get_drawable_pixmap(DrawablePtr drawable)
diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c
index ff167812..5c233216 100644
--- a/uxa/uxa-glyphs.c
+++ b/uxa/uxa-glyphs.c
@@ -47,6 +47,7 @@
#include <stdlib.h>
#include "uxa-priv.h"
+#include "../src/common.h"
#include "mipict.h"
@@ -189,7 +190,8 @@ static Bool uxa_realize_glyph_caches(ScreenPtr pScreen, unsigned int format)
pPixmap = (*pScreen->CreatePixmap) (pScreen,
CACHE_PICTURE_WIDTH,
- height, depth, 0);
+ height, depth,
+ INTEL_CREATE_PIXMAP_TILING_X);
if (!pPixmap)
return FALSE;