summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Foss <robert.foss@collabora.com>2018-11-16 14:53:31 +0100
committerRobert Foss <robert.foss@collabora.com>2018-11-18 12:14:55 +0100
commit70692adf48d81f1cef15204c08444369eca4987e (patch)
tree09cf7281a34d74fa33baaa191c106f25e0379871
parentc2e3d0f1631b7895530c69c7728d0fc9325ffc1c (diff)
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>
-rw-r--r--src/gallium/drivers/virgl/virgl_screen.c2
-rw-r--r--src/gallium/winsys/virgl/drm/virgl_drm_winsys.c1
-rw-r--r--src/gallium/winsys/virgl/drm/virgl_drm_winsys.h1
-rw-r--r--src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c1
4 files changed, 1 insertions, 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;
}