[Glamor] [PATCH 03/15] Add debug message for all the uploading path.

zhigang.gong at linux.intel.com zhigang.gong at linux.intel.com
Fri Jan 20 00:52:01 PST 2012


From: Zhigang Gong <zhigang.gong at linux.intel.com>

The previous message missed the texture restoring path.

Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
---
 src/glamor_pixmap.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/glamor_pixmap.c b/src/glamor_pixmap.c
index f43a90b..3ed3c51 100644
--- a/src/glamor_pixmap.c
+++ b/src/glamor_pixmap.c
@@ -298,6 +298,13 @@ _glamor_upload_pixmap_to_texture(PixmapPtr pixmap, GLenum format,
 		return;
 	need_flip = (flip && !glamor_priv->yInverted);
 
+	glamor_debug_output(GLAMOR_DEBUG_TEXTURE_DYNAMIC_UPLOAD,
+			    "Uploading pixmap %p  %dx%d depth%d.\n",
+			    pixmap,
+			    pixmap->drawable.width,
+			    pixmap->drawable.height,
+			    pixmap->drawable.depth);
+
 	/* Try fast path firstly, upload the pixmap to the texture attached
 	 * to the fbo directly. */
 	if (no_alpha == 0 && no_revert == 1 && !need_flip) {
@@ -476,12 +483,6 @@ glamor_upload_pixmap_to_texture(PixmapPtr pixmap)
 	}
 	if (glamor_pixmap_upload_prepare(pixmap, no_alpha, no_revert))
 		return GLAMOR_UPLOAD_FAILED;
-	glamor_debug_output(GLAMOR_DEBUG_TEXTURE_DYNAMIC_UPLOAD,
-			    "Uploading pixmap %p  %dx%d depth%d.\n",
-			    pixmap,
-			    pixmap->drawable.width,
-			    pixmap->drawable.height,
-			    pixmap->drawable.depth);
 	_glamor_upload_pixmap_to_texture(pixmap, format, type, no_alpha,
 					 no_revert, 1);
 	return GLAMOR_UPLOAD_DONE;
-- 
1.7.4.4



More information about the Glamor mailing list