summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2013-01-11 13:22:24 +0100
committerMichel Dänzer <michel@daenzer.net>2013-01-11 13:22:24 +0100
commit1a8c05fd5559be842d8a038df73de34d4b261c15 (patch)
tree9e31d9d37675fa53e7cd12b20c8fa50484251733
parente5e22d788b103c04d3460a221a3b9dc3be69e0a4 (diff)
Make CRTC shadow pixmaps usable by glamor.
Fixes rotation with glamor. Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-rw-r--r--src/drmmode_display.c5
-rw-r--r--src/radeon_glamor.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e4757ad3..0d738563 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -140,6 +140,11 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn,
}
}
+ if (!radeon_glamor_create_textured_pixmap(pixmap)) {
+ pScreen->DestroyPixmap(pixmap);
+ return NULL;
+ }
+
return pixmap;
}
diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index c232cc22..5a7561f2 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -131,6 +131,8 @@ radeon_glamor_create_textured_pixmap(PixmapPtr pixmap)
return TRUE;
priv = radeon_get_pixmap_private(pixmap);
+ if (!priv->stride)
+ priv->stride = pixmap->devKind;
if (glamor_egl_create_textured_pixmap(pixmap, priv->bo->handle,
priv->stride))
return TRUE;