From 77bc74e674e39a65b79b804367e97d567963bb43 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 2 Feb 2018 09:21:44 -0700 Subject: st/mesa: use st_access_flags_to_transfer_flags() helper in more places MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_cb_texture.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/mesa/state_tracker/st_cb_texture.c') diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 98f2443bb30..6345ead6396 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -254,19 +254,18 @@ st_MapTextureImage(struct gl_context *ctx, { struct st_context *st = st_context(ctx); struct st_texture_image *stImage = st_texture_image(texImage); - unsigned pipeMode; GLubyte *map; struct pipe_transfer *transfer; - pipeMode = 0x0; - if (mode & GL_MAP_READ_BIT) - pipeMode |= PIPE_TRANSFER_READ; - if (mode & GL_MAP_WRITE_BIT) - pipeMode |= PIPE_TRANSFER_WRITE; - if (mode & GL_MAP_INVALIDATE_RANGE_BIT) - pipeMode |= PIPE_TRANSFER_DISCARD_RANGE; + /* Check for unexpected flags */ + assert((mode & ~(GL_MAP_READ_BIT | + GL_MAP_WRITE_BIT | + GL_MAP_INVALIDATE_RANGE_BIT)) == 0); - map = st_texture_image_map(st, stImage, pipeMode, x, y, slice, w, h, 1, + const enum pipe_transfer_usage 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, &transfer); if (map) { if (st_etc_fallback(st, texImage)) { -- cgit v1.2.3