summaryrefslogtreecommitdiff
authorBrian Paul <brianp@vmware.com>2012-04-20 20:24:26 (GMT)
committer Brian Paul <brianp@vmware.com>2012-04-20 21:59:23 (GMT)
commit46cdf0ed0ad9df66f36f95e27b209d454f67d526 (patch) (side-by-side diff)
tree74aec0cd6eb03742b6a886ab7aa3c41d793e1bb2
parent4d76cfe5e8e5d594ec357b0ef3339f56eeca9c64 (diff)
downloadxf86-video-vmware-master.zip
xf86-video-vmware-master.tar.gz
vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfacesHEADmaster
This fixes a failed assertion in the gallium/svga driver in the svga_texture_get_handle() function. The texture resource wasn't getting created with the PIPE_BIND_SHARED flag so the !cachable assertion would fail and the X session would abort. This didn't happen with release builds. Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--vmwgfx/vmwgfx_xa_surface.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
index 2a18762..8b30e45 100644
--- a/vmwgfx/vmwgfx_xa_surface.c
+++ b/vmwgfx/vmwgfx_xa_surface.c
@@ -148,7 +148,7 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap,
vpix->staging_format = format;
vpix->staging_remove_flags = 0;
- vpix->staging_add_flags = XA_FLAG_RENDER_TARGET;
+ vpix->staging_add_flags = XA_FLAG_RENDER_TARGET | XA_FLAG_SHARED;
return TRUE;
}