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

dri: rename and move handle_in_fence to dri_helpers

Browse source 
make this reusable

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619>
This commit is contained in:
Mike Blumenkrantz 2024-07-31 10:51:10 -04:00 • committed by Marge Bot
parent f14ef0ee0a
commit c5f55ee126
3 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/gallium/frontends/dri/dri2.c
View file

@ -389,27 +389,6 @@ dri2_set_in_fence_fd(__DRIimage *img, int fd)
sync_accumulate("dri", &img->in_fence_fd, fd);
}
static void
handle_in_fence(struct dri_context *ctx, __DRIimage *img)
{
struct pipe_context *pipe = ctx->st->pipe;
struct pipe_fence_handle *fence;
int fd = img->in_fence_fd;
if (fd == -1)
return;
validate_fence_fd(fd);
img->in_fence_fd = -1;
pipe->create_fence_fd(pipe, &fence, fd, PIPE_FD_TYPE_NATIVE_SYNC);
pipe->fence_server_sync(pipe, fence);
pipe->screen->fence_reference(pipe->screen, &fence, NULL);
close(fd);
}
/*
* Backend functions for pipe_frontend_drawable.
*/
@ -519,7 +498,7 @@ dri2_allocate_textures(struct dri_context *ctx,
drawable->h = texture->height0;
pipe_resource_reference(buf, texture);
handle_in_fence(ctx, images.front);
dri_image_fence_sync(ctx, images.front);
}
if (images.image_mask & __DRI_IMAGE_BUFFER_BACK) {
@ -531,7 +510,7 @@ dri2_allocate_textures(struct dri_context *ctx,
drawable->h = texture->height0;
pipe_resource_reference(buf, texture);
handle_in_fence(ctx, images.back);
dri_image_fence_sync(ctx, images.back);
}
if (images.image_mask & __DRI_IMAGE_BUFFER_SHARED) {
@ -543,7 +522,7 @@ dri2_allocate_textures(struct dri_context *ctx,
drawable->h = texture->height0;
pipe_resource_reference(buf, texture);
handle_in_fence(ctx, images.back);
dri_image_fence_sync(ctx, images.back);
ctx->is_shared_buffer_bound = true;
} else {
@ -1821,7 +1800,7 @@ dri2_blit_image(__DRIcontext *context, __DRIimage *dst, __DRIimage *src,
*/
_mesa_glthread_finish(ctx->st->ctx);
handle_in_fence(ctx, dst);
dri_image_fence_sync(ctx, dst);
memset(&blit, 0, sizeof(blit));
blit.dst.resource = dst->texture;
@ -1878,7 +1857,7 @@ dri2_map_image(__DRIcontext *context, __DRIimage *image,
*/
_mesa_glthread_finish(ctx->st->ctx);
handle_in_fence(ctx, image);
dri_image_fence_sync(ctx, image);
struct pipe_resource *resource = image->texture;
while (plane--)

22
src/gallium/frontends/dri/dri_helpers.c
View file

@ -27,6 +27,7 @@
#include "state_tracker/st_texture.h"
#include "state_tracker/st_context.h"
#include "main/texobj.h"
#include "util/libsync.h"
#include "dri_helpers.h"
#include "loader_dri_helper.h"
@ -766,4 +767,25 @@ dri_create_image_with_modifiers(__DRIscreen *screen,
modifiers, modifiers_count, dri_usage,
loaderPrivate);
}
void
dri_image_fence_sync(struct dri_context *ctx, __DRIimage *img)
{
struct pipe_context *pipe = ctx->st->pipe;
struct pipe_fence_handle *fence;
int fd = img->in_fence_fd;
if (fd == -1)
return;
validate_fence_fd(fd);
img->in_fence_fd = -1;
pipe->create_fence_fd(pipe, &fence, fd, PIPE_FD_TYPE_NATIVE_SYNC);
pipe->fence_server_sync(pipe, fence);
pipe->screen->fence_reference(pipe->screen, &fence, NULL);
close(fd);
}
/* vim: set sw=3 ts=8 sts=3 expandtab: */

3
src/gallium/frontends/dri/dri_helpers.h
View file

@ -58,7 +58,8 @@ dri2_yuv_dma_buf_supported(struct dri_screen *screen,
bool
dri2_validate_egl_image(struct dri_screen *screen, void *handle);
void
dri_image_fence_sync(struct dri_context *ctx, __DRIimage *img);
#endif
/* vim: set sw=3 ts=8 sts=3 expandtab: */