[Mesa-dev] [PATCH v1] virgl: Clean up fences commit

Robert Foss robert.foss at collabora.com
Fri Nov 16 13:55:42 UTC 2018


Remove a dead variable, an unneeded int->bool conversion
and some whitespace changes.

Signed-off-by: Robert Foss <robert.foss at collabora.com>
---

Sorry about the spam, and this not being included in
v5 which was upstreamed. But nevertheless it should be fixed,
and here's the commit.

 src/gallium/drivers/virgl/virgl_screen.c            | 2 +-
 src/gallium/winsys/virgl/drm/virgl_drm_winsys.c     | 1 -
 src/gallium/winsys/virgl/drm/virgl_drm_winsys.h     | 1 -
 src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
index 8addbea9e4c..3d6424e39f6 100644
--- a/src/gallium/drivers/virgl/virgl_screen.c
+++ b/src/gallium/drivers/virgl/virgl_screen.c
@@ -340,7 +340,7 @@ virgl_get_param(struct pipe_screen *screen, enum pipe_cap param)
    case PIPE_CAP_VIDEO_MEMORY:
       return 0;
    case PIPE_CAP_NATIVE_FENCE_FD:
-      return !!vscreen->vws->supports_fences;
+      return vscreen->vws->supports_fences;
    default:
       return u_pipe_screen_get_param_defaults(screen, param);
    }
diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
index 5b604044598..2c02d3ccd75 100644
--- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
+++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
@@ -933,7 +933,6 @@ virgl_drm_winsys_create(int drmFD)
 
    qdws->base.get_caps = virgl_drm_get_caps;
 
-
    uint32_t value = 0;
    getparam.param = VIRTGPU_PARAM_CAPSET_QUERY_FIX;
    getparam.value = (uint64_t)(uintptr_t)&value;
diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h
index 4316a74977d..659c2d77568 100644
--- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h
+++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.h
@@ -57,7 +57,6 @@ struct virgl_drm_winsys
 {
    struct virgl_winsys base;
    int fd;
-   int drm_version;
    struct list_head delayed;
    int num_delayed;
    unsigned usecs;
diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
index c1c88151ad3..bc7a8965be9 100644
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c
@@ -702,6 +702,5 @@ virgl_vtest_winsys_wrap(struct sw_winsys *sws)
 
    vtws->base.flush_frontbuffer = virgl_vtest_flush_frontbuffer;
 
-
    return &vtws->base;
 }
-- 
2.17.1



More information about the mesa-dev mailing list