Module: Mesa Branch: master Commit: 358606855767b751b316a219afe97e5662543d3d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=358606855767b751b316a219afe97e5662543d3d
Author: Marek Olšák <[email protected]> Date: Wed Jul 1 08:21:38 2020 -0400 gallium: rename pipe_transfer_usage -> pipe_map_flags Acked-by: Eric Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5749> --- src/gallium/drivers/iris/iris_resource.c | 4 ++-- src/gallium/drivers/radeon/radeon_winsys.h | 2 +- src/gallium/drivers/swr/swr_context.cpp | 2 +- src/gallium/frontends/dri/dri2.c | 2 +- src/gallium/frontends/xa/xa_context.c | 2 +- src/gallium/include/pipe/p_defines.h | 4 ++-- src/gallium/include/pipe/p_state.h | 2 +- src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 2 +- src/gallium/winsys/amdgpu/drm/amdgpu_bo.h | 2 +- src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 2 +- src/gallium/winsys/svga/drm/vmw_buffer.c | 2 +- src/gbm/main/gbm.h | 2 +- src/mesa/state_tracker/st_cb_bufferobjects.c | 8 ++++---- src/mesa/state_tracker/st_cb_bufferobjects.h | 2 +- src/mesa/state_tracker/st_cb_drawpixels.c | 4 ++-- src/mesa/state_tracker/st_cb_fbo.c | 2 +- src/mesa/state_tracker/st_cb_texture.c | 4 ++-- src/mesa/state_tracker/st_texture.c | 2 +- src/mesa/state_tracker/st_texture.h | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 63e35506087..6da5a1b28ae 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -1813,7 +1813,7 @@ iris_map_direct(struct iris_transfer *map) static bool can_promote_to_async(const struct iris_resource *res, const struct pipe_box *box, - enum pipe_transfer_usage usage) + enum pipe_map_flags usage) { /* If we're writing to a section of the buffer that hasn't even been * initialized with useful data, then we can safely promote this write @@ -1829,7 +1829,7 @@ static void * iris_transfer_map(struct pipe_context *ctx, struct pipe_resource *resource, unsigned level, - enum pipe_transfer_usage usage, + enum pipe_map_flags usage, const struct pipe_box *box, struct pipe_transfer **ptransfer) { diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h index 98333e957be..defd85cda69 100644 --- a/src/gallium/drivers/radeon/radeon_winsys.h +++ b/src/gallium/drivers/radeon/radeon_winsys.h @@ -314,7 +314,7 @@ struct radeon_winsys { * \return The pointer at the beginning of the buffer. */ void *(*buffer_map)(struct pb_buffer *buf, struct radeon_cmdbuf *cs, - enum pipe_transfer_usage usage); + enum pipe_map_flags usage); /** * Unmap a buffer object from the client's address space. diff --git a/src/gallium/drivers/swr/swr_context.cpp b/src/gallium/drivers/swr/swr_context.cpp index e1b1712f22e..925cd2d26c8 100644 --- a/src/gallium/drivers/swr/swr_context.cpp +++ b/src/gallium/drivers/swr/swr_context.cpp @@ -134,7 +134,7 @@ swr_transfer_map(struct pipe_context *pipe, if (!pt) return NULL; pipe_resource_reference(&pt->resource, resource); - pt->usage = (pipe_transfer_usage)usage; + pt->usage = (pipe_map_flags)usage; pt->level = level; pt->box = *box; pt->stride = spr->swr.pitch; diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c index 273cfde35e8..fa5009c40a5 100644 --- a/src/gallium/frontends/dri/dri2.c +++ b/src/gallium/frontends/dri/dri2.c @@ -1558,7 +1558,7 @@ dri2_map_image(__DRIcontext *context, __DRIimage *image, { struct dri_context *ctx = dri_context(context); struct pipe_context *pipe = ctx->st->pipe; - enum pipe_transfer_usage pipe_access = 0; + enum pipe_map_flags pipe_access = 0; struct pipe_resource *resource = image->texture; struct pipe_transfer *trans; void *map; diff --git a/src/gallium/frontends/xa/xa_context.c b/src/gallium/frontends/xa/xa_context.c index 3e979606560..8593644fb09 100644 --- a/src/gallium/frontends/xa/xa_context.c +++ b/src/gallium/frontends/xa/xa_context.c @@ -104,7 +104,7 @@ xa_surface_dma(struct xa_context *ctx, struct pipe_transfer *transfer; void *map; int w, h, i; - enum pipe_transfer_usage transfer_direction; + enum pipe_map_flags transfer_direction; struct pipe_context *pipe = ctx->pipe; transfer_direction = (to_surface ? PIPE_MAP_WRITE : diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index bd82f64ec10..712d9198315 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -232,9 +232,9 @@ enum pipe_tex_compare { #define PIPE_CLEAR_DEPTHSTENCIL (PIPE_CLEAR_DEPTH | PIPE_CLEAR_STENCIL) /** - * Transfer object usage flags + * CPU access map flags */ -enum pipe_transfer_usage +enum pipe_map_flags { /** * Resource contents read back (or accessed directly) at transfer diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index f38cb411dbb..7acb79df67c 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -586,7 +586,7 @@ struct pipe_transfer { struct pipe_resource *resource; /**< resource to transfer to/from */ unsigned level; /**< texture mipmap level */ - enum pipe_transfer_usage usage; + enum pipe_map_flags usage; struct pipe_box box; /**< region of the resource to access */ unsigned stride; /**< row stride in bytes */ unsigned layer_stride; /**< image/layer stride in bytes */ diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index 3984acc593c..a0e4aa88e56 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c @@ -270,7 +270,7 @@ static bool amdgpu_bo_do_map(struct amdgpu_winsys_bo *bo, void **cpu) void *amdgpu_bo_map(struct pb_buffer *buf, struct radeon_cmdbuf *rcs, - enum pipe_transfer_usage usage) + enum pipe_map_flags usage) { struct amdgpu_winsys_bo *bo = (struct amdgpu_winsys_bo*)buf; struct amdgpu_winsys_bo *real; diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h index ace651dff4f..29f7c4032d4 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h @@ -133,7 +133,7 @@ struct pb_buffer *amdgpu_bo_create(struct amdgpu_winsys *ws, void amdgpu_bo_destroy(struct pb_buffer *_buf); void *amdgpu_bo_map(struct pb_buffer *buf, struct radeon_cmdbuf *rcs, - enum pipe_transfer_usage usage); + enum pipe_map_flags usage); void amdgpu_bo_unmap(struct pb_buffer *buf); void amdgpu_bo_init_functions(struct amdgpu_screen_winsys *ws); diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index de0e1b61c8f..3174464079f 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c @@ -498,7 +498,7 @@ void *radeon_bo_do_map(struct radeon_bo *bo) static void *radeon_bo_map(struct pb_buffer *buf, struct radeon_cmdbuf *rcs, - enum pipe_transfer_usage usage) + enum pipe_map_flags usage) { struct radeon_bo *bo = (struct radeon_bo*)buf; struct radeon_drm_cs *cs = (struct radeon_drm_cs*)rcs; diff --git a/src/gallium/winsys/svga/drm/vmw_buffer.c b/src/gallium/winsys/svga/drm/vmw_buffer.c index 549727a5145..6bc7676c502 100644 --- a/src/gallium/winsys/svga/drm/vmw_buffer.c +++ b/src/gallium/winsys/svga/drm/vmw_buffer.c @@ -354,7 +354,7 @@ vmw_svga_winsys_buffer_destroy(struct svga_winsys_screen *sws, void * vmw_svga_winsys_buffer_map(struct svga_winsys_screen *sws, struct svga_winsys_buffer *buf, - enum pipe_transfer_usage flags) + enum pipe_map_flags flags) { void *map; diff --git a/src/gbm/main/gbm.h b/src/gbm/main/gbm.h index 45dead8fabb..8cb928b9677 100644 --- a/src/gbm/main/gbm.h +++ b/src/gbm/main/gbm.h @@ -310,7 +310,7 @@ gbm_bo_import(struct gbm_device *gbm, uint32_t type, * These flags are independent of the GBM_BO_USE_* creation flags. However, * mapping the buffer may require copying to/from a staging buffer. * - * See also: pipe_transfer_usage + * See also: pipe_map_flags */ enum gbm_bo_transfer_flags { /** diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c index d1299620e53..e7550ccf850 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.c +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c @@ -453,13 +453,13 @@ st_bufferobj_invalidate(struct gl_context *ctx, /** - * Convert GLbitfield of GL_MAP_x flags to gallium pipe_transfer_usage flags. + * Convert GLbitfield of GL_MAP_x flags to gallium pipe_map_flags flags. * \param wholeBuffer is the whole buffer being mapped? */ -enum pipe_transfer_usage +enum pipe_map_flags st_access_flags_to_transfer_flags(GLbitfield access, bool wholeBuffer) { - enum pipe_transfer_usage flags = 0; + enum pipe_map_flags flags = 0; if (access & GL_MAP_WRITE_BIT) flags |= PIPE_MAP_WRITE; @@ -518,7 +518,7 @@ st_bufferobj_map_range(struct gl_context *ctx, assert(offset < obj->Size); assert(offset + length <= obj->Size); - const enum pipe_transfer_usage transfer_flags = + const enum pipe_map_flags transfer_flags = st_access_flags_to_transfer_flags(access, offset == 0 && length == obj->Size); diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.h b/src/mesa/state_tracker/st_cb_bufferobjects.h index 534506a62b3..8776839aa1d 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.h +++ b/src/mesa/state_tracker/st_cb_bufferobjects.h @@ -55,7 +55,7 @@ st_buffer_object(struct gl_buffer_object *obj) } -enum pipe_transfer_usage +enum pipe_map_flags st_access_flags_to_transfer_flags(GLbitfield access, bool wholeBuffer); diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index cb7d85d0ef8..8470e5069e1 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -1052,7 +1052,7 @@ draw_stencil_pixels(struct gl_context *ctx, GLint x, GLint y, struct st_context *st = st_context(ctx); struct pipe_context *pipe = st->pipe; struct st_renderbuffer *strb; - enum pipe_transfer_usage usage; + enum pipe_map_flags usage; struct pipe_transfer *pt; const GLboolean zoom = ctx->Pixel.ZoomX != 1.0 || ctx->Pixel.ZoomY != 1.0; ubyte *stmap; @@ -1538,7 +1538,7 @@ copy_stencil_pixels(struct gl_context *ctx, GLint srcx, GLint srcy, { struct st_renderbuffer *rbDraw; struct pipe_context *pipe = st_context(ctx)->pipe; - enum pipe_transfer_usage usage; + enum pipe_map_flags usage; struct pipe_transfer *ptDraw; ubyte *drawMap; ubyte *buffer; diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c index 2455a351c49..cdfb7e87618 100644 --- a/src/mesa/state_tracker/st_cb_fbo.c +++ b/src/mesa/state_tracker/st_cb_fbo.c @@ -893,7 +893,7 @@ st_MapRenderbuffer(struct gl_context *ctx, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT)) == 0); - const enum pipe_transfer_usage transfer_flags = + const enum pipe_map_flags transfer_flags = st_access_flags_to_transfer_flags(mode, false); /* Note: y=0=bottom of buffer while y2=0=top of buffer. diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 3747d840fe6..2296dd614a6 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -318,7 +318,7 @@ st_MapTextureImage(struct gl_context *ctx, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT)) == 0); - const enum pipe_transfer_usage transfer_flags = + const enum pipe_map_flags transfer_flags = st_access_flags_to_transfer_flags(mode, false); map = st_texture_image_map(st, stImage, transfer_flags, x, y, slice, w, h, 1, @@ -2319,7 +2319,7 @@ fallback_copy_texsubimage(struct gl_context *ctx, struct pipe_context *pipe = st->pipe; struct pipe_transfer *src_trans; GLubyte *texDest; - enum pipe_transfer_usage transfer_usage; + enum pipe_map_flags transfer_usage; void *map; unsigned dst_width = width; unsigned dst_height = height; diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c index cb7398a6320..24f6019029c 100644 --- a/src/mesa/state_tracker/st_texture.c +++ b/src/mesa/state_tracker/st_texture.c @@ -247,7 +247,7 @@ st_texture_match_image(struct st_context *st, */ GLubyte * st_texture_image_map(struct st_context *st, struct st_texture_image *stImage, - enum pipe_transfer_usage usage, + enum pipe_map_flags usage, GLuint x, GLuint y, GLuint z, GLuint w, GLuint h, GLuint d, struct pipe_transfer **transfer) diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index 7a9ac150b70..92bfbf3b8cf 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -294,7 +294,7 @@ st_texture_match_image(struct st_context *st, */ extern GLubyte * st_texture_image_map(struct st_context *st, struct st_texture_image *stImage, - enum pipe_transfer_usage usage, + enum pipe_map_flags usage, GLuint x, GLuint y, GLuint z, GLuint w, GLuint h, GLuint d, struct pipe_transfer **transfer); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
