diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2011-07-07 09:21:56 +0200 |
---|---|---|
committer | Thomas Hellstrom <thellstrom@vmware.com> | 2011-07-07 10:56:59 +0200 |
commit | 9cff0a84308723d9790c6365c0d4b1c107794995 (patch) | |
tree | 9b75c94cb5d1f927a5f8086590943219daf87466 /vmwgfx/vmwgfx_xa_surface.c | |
parent | 81e7099b6bbd9fdae66a3186dfc3fff2758009cf (diff) |
vmwgfx: Various acceleration fixes.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'vmwgfx/vmwgfx_xa_surface.c')
-rw-r--r-- | vmwgfx/vmwgfx_xa_surface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c index 6c4ab85..7542413 100644 --- a/vmwgfx/vmwgfx_xa_surface.c +++ b/vmwgfx/vmwgfx_xa_surface.c @@ -110,7 +110,7 @@ vmwgfx_old_format_compatible(enum xa_formats format, enum xa_formats old_format) { return (format == old_format || - (xa_format_type(old_format) == xa_format_type(old_format) && + (xa_format_type(format) == xa_format_type(old_format) && xa_format_a(format) <= xa_format_a(old_format) && xa_format_r(format) == xa_format_r(old_format) && xa_format_g(format) == xa_format_g(old_format) && @@ -133,7 +133,6 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap, /* * Check if we can reuse old hardware format. */ - if (vpix->hw) { enum xa_formats old_format = xa_surface_format(vpix->hw); @@ -150,6 +149,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; + return TRUE; } |