fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium: rename PIPE_BIND_DRI_PRIME

Browse source 
The new name PIPE_BIND_PRIME_BLIT_DST is more precise.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14615>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2022-02-01 17:40:55 +01:00 • committed by Marge Bot
parent 42c149e36b
commit 18c38bf78f
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_blit.c
View file

@ -1234,7 +1234,7 @@ static void si_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
return;
}
if ((info->dst.resource->bind & PIPE_BIND_DRI_PRIME) && sdst->surface.is_linear &&
if ((info->dst.resource->bind & PIPE_BIND_PRIME_BLIT_DST) && sdst->surface.is_linear &&
sctx->chip_class >= GFX7 && sdst->surface.flags & RADEON_SURF_IMPORTED) {
struct si_texture *ssrc = (struct si_texture *)info->src.resource;
/* Use SDMA or async compute when copying to a DRI_PRIME imported linear surface. */

2
src/gallium/drivers/radeonsi/si_texture.c
View file

@ -1647,7 +1647,7 @@ static struct pipe_resource *si_texture_from_handle(struct pipe_screen *screen,
buf = sscreen->ws->buffer_from_handle(sscreen->ws, whandle,
sscreen->info.max_alignment,
templ->bind & PIPE_BIND_DRI_PRIME);
templ->bind & PIPE_BIND_PRIME_BLIT_DST);
if (!buf)
return NULL;

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

@ -1100,7 +1100,7 @@ dri2_create_image_common(__DRIscreen *_screen,
if (use & __DRI_IMAGE_USE_PROTECTED)
tex_usage |= PIPE_BIND_PROTECTED;
if (use & __DRI_IMAGE_USE_PRIME_BUFFER)
tex_usage |= PIPE_BIND_DRI_PRIME;
tex_usage |= PIPE_BIND_PRIME_BLIT_DST;
img = CALLOC_STRUCT(__DRIimageRec);
if (!img)
@ -1530,7 +1530,7 @@ dri2_from_fds2(__DRIscreen *screen, int width, int height, int fourcc,
if (flags & __DRI_IMAGE_PROTECTED_CONTENT_FLAG)
bind |= PIPE_BIND_PROTECTED;
if (flags & __DRI_IMAGE_PRIME_LINEAR_BUFFER)
bind |= PIPE_BIND_DRI_PRIME;
bind |= PIPE_BIND_PRIME_BLIT_DST;
return dri2_create_image_from_fd(screen, width, height, fourcc,
DRM_FORMAT_MOD_INVALID, fds, num_fds,

3
src/gallium/include/pipe/p_defines.h
View file

@ -515,7 +515,8 @@ enum pipe_flush_flags
#define PIPE_BIND_LINEAR (1 << 21)
#define PIPE_BIND_PROTECTED (1 << 22) /* Resource will be protected/encrypted */
#define PIPE_BIND_SAMPLER_REDUCTION_MINMAX (1 << 23) /* PIPE_CAP_SAMPLER_REDUCTION_MINMAX */
#define PIPE_BIND_DRI_PRIME (1 << 24)
/* Resource is the DRI_PRIME blit destination. Only set on on the render GPU. */
#define PIPE_BIND_PRIME_BLIT_DST (1 << 24)
/**