virgl: Clean up fences commit

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

Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c
index 8addbea9e4c8e912fc6484ee6a8289ffeab2dae4..3d6424e39f6511927641b53c3516189bc62e065c 100644 (file)
--- 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 5b604044598a598785e171750d7e22d86e68f7fe..2c02d3ccd75fcc1909472d4ed0a235940549cdfb 100644 (file)
--- 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 4316a74977da5f26c7434220d973709149f08d8c..659c2d775681547457b42b61622ec7574ed46e22 100644 (file)
--- 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 c1c88151ad3d54c044f853ec5daf53b9a9c37ae9..bc7a8965be90eb98cf7356577897e0f6eeb0ba4e 100644 (file)
--- 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;
 }