Commit 15166bba authored by Zhigang Gong's avatar Zhigang Gong Committed by Eric Anholt

Add debug message for all the uploading path.

The previous message missed the texture restoring path.
Signed-off-by: default avatarZhigang Gong <zhigang.gong@linux.intel.com>
parent 994a9ff7
...@@ -298,6 +298,13 @@ _glamor_upload_pixmap_to_texture(PixmapPtr pixmap, GLenum format, ...@@ -298,6 +298,13 @@ _glamor_upload_pixmap_to_texture(PixmapPtr pixmap, GLenum format,
return; return;
need_flip = (flip && !glamor_priv->yInverted); 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 /* Try fast path firstly, upload the pixmap to the texture attached
* to the fbo directly. */ * to the fbo directly. */
if (no_alpha == 0 && no_revert == 1 && !need_flip) { if (no_alpha == 0 && no_revert == 1 && !need_flip) {
...@@ -476,12 +483,6 @@ glamor_upload_pixmap_to_texture(PixmapPtr pixmap) ...@@ -476,12 +483,6 @@ glamor_upload_pixmap_to_texture(PixmapPtr pixmap)
} }
if (glamor_pixmap_upload_prepare(pixmap, no_alpha, no_revert)) if (glamor_pixmap_upload_prepare(pixmap, no_alpha, no_revert))
return GLAMOR_UPLOAD_FAILED; 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, _glamor_upload_pixmap_to_texture(pixmap, format, type, no_alpha,
no_revert, 1); no_revert, 1);
return GLAMOR_UPLOAD_DONE; return GLAMOR_UPLOAD_DONE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment