diff options
| author | Thomas Hellstrom <[email protected]> | 2011-09-28 09:13:50 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <[email protected]> | 2011-09-29 20:24:57 +0200 |
| commit | e7843273fae516fa9922f12053bb6c063b39921c (patch) | |
| tree | b535bde925b4269670dfa7f69f99110247428ea2 /src/gallium/drivers/svga | |
| parent | e63f2787b6a8dd7ff7a093fea8017a0b74cac6fd (diff) | |
winsys/svga: Update to vmwgfx kernel module 2.1
Introduces fence objecs and a size limit on query buffers.
The possibility to map the fifo from user-space is gone, and
replaced by an ioctl that reads the 3D capabilities.
Signed-off-by: Thomas Hellstrom <[email protected]>
Reviewed-by: Jakob Bornecranz <[email protected]>
Diffstat (limited to 'src/gallium/drivers/svga')
| -rw-r--r-- | src/gallium/drivers/svga/svga_pipe_query.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_winsys.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_pipe_query.c b/src/gallium/drivers/svga/svga_pipe_query.c index 579f8034c7c..c44e0b8ec49 100644 --- a/src/gallium/drivers/svga/svga_pipe_query.c +++ b/src/gallium/drivers/svga/svga_pipe_query.c @@ -241,7 +241,7 @@ static boolean svga_get_query_result(struct pipe_context *pipe, if(!wait) return FALSE; - sws->fence_finish(sws, sq->fence, 0); + sws->fence_finish(sws, sq->fence, SVGA_FENCE_FLAG_QUERY); state = sq->queryResult->state; } diff --git a/src/gallium/drivers/svga/svga_winsys.h b/src/gallium/drivers/svga/svga_winsys.h index ae61cea083f..d9560efea33 100644 --- a/src/gallium/drivers/svga/svga_winsys.h +++ b/src/gallium/drivers/svga/svga_winsys.h @@ -61,7 +61,8 @@ struct winsys_handle; #define SVGA_RELOC_WRITE 0x1 #define SVGA_RELOC_READ 0x2 - +#define SVGA_FENCE_FLAG_EXEC (1 << 0) +#define SVGA_FENCE_FLAG_QUERY (1 << 1) /** Opaque surface handle */ struct svga_winsys_surface; |