summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-01-31 15:39:23 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2014-01-31 15:39:23 +0000
commitf934ee78a000815e14e36bd0caa279cb35d07bfe (patch)
treece14401a3c1fa7c88aaec9e0342af66fc4dbb601
parentbdbb928ea38977bd2784f454f35db2ac2c13c34c (diff)
sna: Reorder assignments vs DBG
It helps reading the debug log if what we print is correct. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_accel.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 3a7592a0..bbb6e2be 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -909,17 +909,17 @@ fallback:
}
}
+ pixmap->drawable.width = width;
+ pixmap->drawable.height = height;
+ pixmap->drawable.depth = depth;
+ pixmap->drawable.bitsPerPixel = bpp;
+
DBG(("%s: serial=%ld, %dx%d\n",
__FUNCTION__,
pixmap->drawable.serialNumber,
pixmap->drawable.width,
pixmap->drawable.height));
- pixmap->drawable.width = width;
- pixmap->drawable.height = height;
- pixmap->drawable.depth = depth;
- pixmap->drawable.bitsPerPixel = bpp;
-
priv->cpu_bo = kgem_create_map(&sna->kgem, addr, pitch*height, false);
if (priv->cpu_bo == NULL) {
priv->header = true;
@@ -997,6 +997,12 @@ sna_pixmap_create_scratch(ScreenPtr screen,
}
}
+ pixmap->drawable.width = width;
+ pixmap->drawable.height = height;
+ pixmap->drawable.depth = depth;
+ pixmap->drawable.bitsPerPixel = bpp;
+ pixmap->devPrivate.ptr = NULL;
+
DBG(("%s: serial=%ld, usage=%d, %dx%d\n",
__FUNCTION__,
pixmap->drawable.serialNumber,
@@ -1004,12 +1010,6 @@ sna_pixmap_create_scratch(ScreenPtr screen,
pixmap->drawable.width,
pixmap->drawable.height));
- pixmap->drawable.width = width;
- pixmap->drawable.height = height;
- pixmap->drawable.depth = depth;
- pixmap->drawable.bitsPerPixel = bpp;
- pixmap->devPrivate.ptr = NULL;
-
priv->stride = PixmapBytePad(width, depth);
priv->header = true;