Mesa (master): vmware/core: Use correct flags in scanout code

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Tue Feb 9 16:27:57 UTC 2010


Module: Mesa
Branch: master
Commit: 6a4cd124af9175832e506888e504d9195bf614b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a4cd124af9175832e506888e504d9195bf614b7

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Sat Feb  6 01:29:47 2010 +0100

vmware/core: Use correct flags in scanout code

---

 .../winsys/drm/vmware/core/vmw_screen_ioctl.c      |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/winsys/drm/vmware/core/vmw_screen_ioctl.c b/src/gallium/winsys/drm/vmware/core/vmw_screen_ioctl.c
index f2de2c3..5d81fa8 100644
--- a/src/gallium/winsys/drm/vmware/core/vmw_screen_ioctl.c
+++ b/src/gallium/winsys/drm/vmware/core/vmw_screen_ioctl.c
@@ -176,12 +176,12 @@ vmw_ioctl_surface_create(struct vmw_winsys_screen *vws,
 
    memset(&s_arg, 0, sizeof(s_arg));
    if (vws->use_old_scanout_flag &&
-       (req->flags & SVGA3D_SURFACE_HINT_SCANOUT)) {
-      req->flags = (uint32_t) (flags & ~SVGA3D_SURFACE_HINT_SCANOUT);
+       (flags & SVGA3D_SURFACE_HINT_SCANOUT)) {
+      req->flags = (uint32_t) flags;
       req->scanout = false;
-   } else if (req->flags & SVGA3D_SURFACE_HINT_SCANOUT) {
+   } else if (flags & SVGA3D_SURFACE_HINT_SCANOUT) {
       req->flags = (uint32_t) (flags & ~SVGA3D_SURFACE_HINT_SCANOUT);
-      req->scanout = false;
+      req->scanout = true;
    } else {
       req->flags = (uint32_t) flags;
       req->scanout = false;




More information about the mesa-commit mailing list