diff options
author | Marek Olšák <[email protected]> | 2016-08-21 12:24:59 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2016-08-25 14:09:48 +0200 |
commit | 9daaa6f5a66ab6cc99c6f0af37fc1007ab3d09af (patch) | |
tree | 47e62319d0ddea75f93bccf52305133e2e0be5f3 /src/gallium/auxiliary | |
parent | b662c70aeab6a92751514f30719c13a6de253b40 (diff) |
gallium: add a pipe_context parameter to resource_get_handle
radeonsi needs to do some operations (DCC decompression) for OpenGL-OpenCL
interop and this is the only way to make it coherent with the current
context. It can optionally be set to NULL.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r-- | src/gallium/auxiliary/util/u_transfer.c | 1 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_transfer.h | 1 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_winsys_dri3.c | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_transfer.c b/src/gallium/auxiliary/util/u_transfer.c index 82cf68db958..ba4b9dcc6b3 100644 --- a/src/gallium/auxiliary/util/u_transfer.c +++ b/src/gallium/auxiliary/util/u_transfer.c @@ -111,6 +111,7 @@ u_resource( struct pipe_resource *res ) } boolean u_resource_get_handle_vtbl(struct pipe_screen *screen, + struct pipe_context *ctx, struct pipe_resource *resource, struct winsys_handle *handle, unsigned usage) diff --git a/src/gallium/auxiliary/util/u_transfer.h b/src/gallium/auxiliary/util/u_transfer.h index 7f680bc6582..ab787abdce3 100644 --- a/src/gallium/auxiliary/util/u_transfer.h +++ b/src/gallium/auxiliary/util/u_transfer.h @@ -73,6 +73,7 @@ struct u_resource { boolean u_resource_get_handle_vtbl(struct pipe_screen *screen, + struct pipe_context *ctx, struct pipe_resource *resource, struct winsys_handle *handle, unsigned usage); diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c index 61d6205b326..3d596a6d112 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c @@ -243,7 +243,7 @@ dri3_alloc_back_buffer(struct vl_dri3_screen *scrn) memset(&whandle, 0, sizeof(whandle)); whandle.type= DRM_API_HANDLE_TYPE_FD; usage = PIPE_HANDLE_USAGE_EXPLICIT_FLUSH | PIPE_HANDLE_USAGE_READ; - scrn->base.pscreen->resource_get_handle(scrn->base.pscreen, + scrn->base.pscreen->resource_get_handle(scrn->base.pscreen, NULL, buffer->texture, &whandle, usage); buffer_fd = whandle.handle; |