fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

llvmpipe: fix userptr for texture resources.

Browse source 
This is needed for CL image hostptr support, but it's possible
it could hit these paths from GL/Vulkan

Fixes: 9a57dceeb7 ("llvmpipe: add support for user memory pointers")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13375>
(cherry picked from commit 17a565e0cf)
This commit is contained in:
Dave Airlie 2021-10-13 14:49:50 +10:00 • committed by Eric Engestrom
parent 121f0528a7
commit bac2dd958a
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -976,7 +976,7 @@
"description": "llvmpipe: fix userptr for texture resources.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "9a57dceeb760a1d4f7d9d1666bec0844ee41852e"
},

21
src/gallium/drivers/llvmpipe/lp_texture.c
View file

@ -440,7 +440,7 @@ llvmpipe_resource_destroy(struct pipe_screen *pscreen,
struct llvmpipe_screen *screen = llvmpipe_screen(pscreen);
struct llvmpipe_resource *lpr = llvmpipe_resource(pt);
if (!lpr->backable) {
if (!lpr->backable && !lpr->user_ptr) {
if (lpr->dt) {
/* display target */
struct sw_winsys *winsys = screen->winsys;
@ -454,11 +454,9 @@ llvmpipe_resource_destroy(struct pipe_screen *pscreen,
lpr->tex_data = NULL;
}
}
else if (!lpr->userBuffer) {
if (lpr->data) {
else if (lpr->data) {
if (!lpr->imported_memory)
align_free(lpr->data);
}
}
}
#ifdef DEBUG
@ -651,9 +649,18 @@ llvmpipe_resource_from_user_memory(struct pipe_screen *_screen,
pipe_reference_init(&lpr->base.reference, 1);
lpr->base.screen = _screen;
lpr->data = user_memory;
lpr->userBuffer = TRUE;
if (llvmpipe_resource_is_texture(&lpr->base)) {
if (!llvmpipe_texture_layout(screen, lpr, false))
goto fail;
lpr->tex_data = user_memory;
} else
lpr->data = user_memory;
lpr->user_ptr = true;
return &lpr->base;
fail:
FREE(lpr);
return NULL;
}
void *
@ -875,7 +882,7 @@ llvmpipe_user_buffer_create(struct pipe_screen *screen,
buffer->base.height0 = 1;
buffer->base.depth0 = 1;
buffer->base.array_size = 1;
buffer->userBuffer = TRUE;
buffer->user_ptr = true;
buffer->data = ptr;
return &buffer->base;

2
src/gallium/drivers/llvmpipe/lp_texture.h
View file

@ -89,7 +89,7 @@ struct llvmpipe_resource
*/
void *data;
boolean userBuffer; /** Is this a user-space buffer? */
bool user_ptr; /** Is this a user-space buffer? */
unsigned timestamp;
unsigned id; /**< temporary, for debugging */