gallium: rename PIPE_TRANSFER_* -> PIPE_MAP_*

Acked-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5749>

5 files changed, 19 insertions, 19 deletions

diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c
index 57d0acb41b1..23ccdff6e7d 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup.c
@@ -1006,7 +1006,7 @@ lp_setup_set_fragment_sampler_views(struct lp_setup_context *setup,
             struct llvmpipe_screen *screen = llvmpipe_screen(res->screen);
             struct sw_winsys *winsys = screen->winsys;
             jit_tex->base = winsys->displaytarget_map(winsys, lp_tex->dt,
-                                                         PIPE_TRANSFER_READ);
+                                                         PIPE_MAP_READ);
             jit_tex->row_stride[0] = lp_tex->row_stride[0];
             jit_tex->img_stride[0] = lp_tex->img_stride[0];
             jit_tex->mip_offsets[0] = 0;
diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.c b/src/gallium/drivers/llvmpipe/lp_state_cs.c
index 3a437185ad6..d41f5199fce 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_cs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_cs.c
@@ -993,7 +993,7 @@ lp_csctx_set_sampler_views(struct lp_cs_context *csctx,
             struct llvmpipe_screen *screen = llvmpipe_screen(res->screen);
             struct sw_winsys *winsys = screen->winsys;
             jit_tex->base = winsys->displaytarget_map(winsys, lp_tex->dt,
-                                                         PIPE_TRANSFER_READ);
+                                                         PIPE_MAP_READ);
             jit_tex->row_stride[0] = lp_tex->row_stride[0];
             jit_tex->img_stride[0] = lp_tex->img_stride[0];
             jit_tex->mip_offsets[0] = 0;
@@ -1300,7 +1300,7 @@ fill_grid_size(struct pipe_context *pipe,
    params = pipe_buffer_map_range(pipe, info->indirect,
                                   info->indirect_offset,
                                   3 * sizeof(uint32_t),
-                                  PIPE_TRANSFER_READ,
+                                  PIPE_MAP_READ,
                                   &transfer);
 
    if (!transfer)
diff --git a/src/gallium/drivers/llvmpipe/lp_state_sampler.c b/src/gallium/drivers/llvmpipe/lp_state_sampler.c
index f802af45f5a..46805e257fe 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_sampler.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_sampler.c
@@ -333,7 +333,7 @@ prepare_shader_sampling(
             struct llvmpipe_screen *screen = llvmpipe_screen(tex->screen);
             struct sw_winsys *winsys = screen->winsys;
             addr = winsys->displaytarget_map(winsys, lp_tex->dt,
-                                                PIPE_TRANSFER_READ);
+                                                PIPE_MAP_READ);
             row_stride[0] = lp_tex->row_stride[0];
             img_stride[0] = lp_tex->img_stride[0];
             mip_offsets[0] = 0;
@@ -474,7 +474,7 @@ prepare_shader_images(
             struct llvmpipe_screen *screen = llvmpipe_screen(img->screen);
             struct sw_winsys *winsys = screen->winsys;
             addr = winsys->displaytarget_map(winsys, lp_img->dt,
-                                                PIPE_TRANSFER_READ);
+                                                PIPE_MAP_READ);
             row_stride = lp_img->row_stride[0];
             img_stride = lp_img->img_stride[0];
             sample_stride = 0;
diff --git a/src/gallium/drivers/llvmpipe/lp_surface.c b/src/gallium/drivers/llvmpipe/lp_surface.c
index af8ada4d39b..02b72ae3f3a 100644
--- a/src/gallium/drivers/llvmpipe/lp_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_surface.c
@@ -53,14 +53,14 @@ lp_resource_copy_ms(struct pipe_context *pipe,
    for (unsigned i = 0; i < src->nr_samples; i++) {
       struct pipe_transfer *src_trans, *dst_trans;
       const uint8_t *src_map = llvmpipe_transfer_map_ms(pipe,
-                                                        src, 0, PIPE_TRANSFER_READ, i,
+                                                        src, 0, PIPE_MAP_READ, i,
                                                         src_box,
                                                         &src_trans);
       if (!src_map)
          return;
 
       uint8_t *dst_map = llvmpipe_transfer_map_ms(pipe,
-                                                  dst, 0, PIPE_TRANSFER_WRITE, i,
+                                                  dst, 0, PIPE_MAP_WRITE, i,
                                                   &dst_box,
                                                   &dst_trans);
       if (!dst_map) {
@@ -285,7 +285,7 @@ lp_clear_color_texture_msaa(struct pipe_context *pipe,
    struct pipe_transfer *dst_trans;
    ubyte *dst_map;
 
-   dst_map = llvmpipe_transfer_map_ms(pipe, texture, 0, PIPE_TRANSFER_WRITE,
+   dst_map = llvmpipe_transfer_map_ms(pipe, texture, 0, PIPE_MAP_WRITE,
                                       sample, box, &dst_trans);
    if (!dst_map)
       return;
@@ -347,8 +347,8 @@ lp_clear_depth_stencil_texture_msaa(struct pipe_context *pipe,
    dst_map = llvmpipe_transfer_map_ms(pipe,
                                       texture,
                                       0,
-                                      (need_rmw ? PIPE_TRANSFER_READ_WRITE :
-                                       PIPE_TRANSFER_WRITE),
+                                      (need_rmw ? PIPE_MAP_READ_WRITE :
+                                       PIPE_MAP_WRITE),
                                       sample, box, &dst_trans);
    assert(dst_map);
    if (!dst_map)
diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c
index e93b8a666ac..bb7e3ed34f3 100644
--- a/src/gallium/drivers/llvmpipe/lp_texture.c
+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
@@ -230,7 +230,7 @@ llvmpipe_displaytarget_layout(struct llvmpipe_screen *screen,
 
    if (!map_front_private) {
       void *map = winsys->displaytarget_map(winsys, lpr->dt,
-                                            PIPE_TRANSFER_WRITE);
+                                            PIPE_MAP_WRITE);
 
       if (map)
          memset(map, 0, height * lpr->row_stride[0]);
@@ -408,10 +408,10 @@ llvmpipe_resource_map(struct pipe_resource *resource,
       unsigned dt_usage;
 
       if (tex_usage == LP_TEX_USAGE_READ) {
-         dt_usage = PIPE_TRANSFER_READ;
+         dt_usage = PIPE_MAP_READ;
       }
       else {
-         dt_usage = PIPE_TRANSFER_READ_WRITE;
+         dt_usage = PIPE_MAP_READ_WRITE;
       }
 
       assert(level == 0);
@@ -566,9 +566,9 @@ llvmpipe_transfer_map_ms( struct pipe_context *pipe,
     * Transfers, like other pipe operations, must happen in order, so flush the
     * context if necessary.
     */
-   if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
-      boolean read_only = !(usage & PIPE_TRANSFER_WRITE);
-      boolean do_not_block = !!(usage & PIPE_TRANSFER_DONTBLOCK);
+   if (!(usage & PIPE_MAP_UNSYNCHRONIZED)) {
+      boolean read_only = !(usage & PIPE_MAP_WRITE);
+      boolean do_not_block = !!(usage & PIPE_MAP_DONTBLOCK);
       if (!llvmpipe_flush_resource(pipe, resource,
                                    level,
                                    read_only,
@@ -584,7 +584,7 @@ llvmpipe_transfer_map_ms( struct pipe_context *pipe,
    }
 
    /* Check if we're mapping a current constant buffer */
-   if ((usage & PIPE_TRANSFER_WRITE) &&
+   if ((usage & PIPE_MAP_WRITE) &&
        (resource->bind & PIPE_BIND_CONSTANT_BUFFER)) {
       unsigned i;
       for (i = 0; i < ARRAY_SIZE(llvmpipe->constants[PIPE_SHADER_FRAGMENT]); ++i) {
@@ -618,7 +618,7 @@ llvmpipe_transfer_map_ms( struct pipe_context *pipe,
           transfer->usage);
    */
 
-   if (usage == PIPE_TRANSFER_READ) {
+   if (usage == PIPE_MAP_READ) {
       tex_usage = LP_TEX_USAGE_READ;
       mode = "read";
    }
@@ -642,7 +642,7 @@ llvmpipe_transfer_map_ms( struct pipe_context *pipe,
    /* May want to do different things here depending on read/write nature
     * of the map:
     */
-   if (usage & PIPE_TRANSFER_WRITE) {
+   if (usage & PIPE_MAP_WRITE) {
       /* Do something to notify sharing contexts of a texture change.
        */
       screen->timestamp++;