[Mesa-dev] [PATCH 4/9] i965: Make intel_miptree_map_raw static

[Ian Romanick]

On 09/09/2015 07:18 PM, Ian Romanick wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
> 
> This hasn't been used outside intel_mipmap_tree.c since d5d4ba9 started
> using meta instead of the blitter for PBO TexSubImage.  While we're here,
> 
> 1. s/intel_miptree_\([^_]\)_raw/miptree_\1_raw/g because we don't
> generally prefix static functions.

I just noticed that I removed this change but did not update the commit
message.  I will update it in some sensible manner before pushing.

> 2. Remove the unused brw parameter from the function formerly known as
> intel_miptree_unmap_raw.
> 
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 30 +++++++++++++++------------
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.h |  6 ------
>  2 files changed, 17 insertions(+), 19 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index 485752f..f68aba2 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -49,6 +49,11 @@
>  
>  #define FILE_DEBUG_FLAG DEBUG_MIPTREE
>  
> +static void *intel_miptree_map_raw(struct brw_context *brw,
> +                                   struct intel_mipmap_tree *mt);
> +
> +static void intel_miptree_unmap_raw(struct intel_mipmap_tree *mt);
> +
>  static bool
>  intel_miptree_alloc_mcs(struct brw_context *brw,
>                          struct intel_mipmap_tree *mt,
> @@ -1400,7 +1405,7 @@ intel_miptree_alloc_mcs(struct brw_context *brw,
>      */
>     void *data = intel_miptree_map_raw(brw, mt->mcs_mt);
>     memset(data, 0xff, mt->mcs_mt->total_height * mt->mcs_mt->pitch);
> -   intel_miptree_unmap_raw(brw, mt->mcs_mt);
> +   intel_miptree_unmap_raw(mt->mcs_mt);
>     mt->fast_clear_state = INTEL_FAST_CLEAR_STATE_CLEAR;
>  
>     return mt->mcs_mt;
> @@ -2072,8 +2077,7 @@ intel_miptree_map_raw(struct brw_context *brw, struct intel_mipmap_tree *mt)
>  }
>  
>  void
> -intel_miptree_unmap_raw(struct brw_context *brw,
> -                        struct intel_mipmap_tree *mt)
> +intel_miptree_unmap_raw(struct intel_mipmap_tree *mt)
>  {
>     drm_intel_bo_unmap(mt->bo);
>  }
> @@ -2130,7 +2134,7 @@ intel_miptree_unmap_gtt(struct brw_context *brw,
>  			unsigned int level,
>  			unsigned int slice)
>  {
> -   intel_miptree_unmap_raw(brw, mt);
> +   intel_miptree_unmap_raw(mt);
>  }
>  
>  static void
> @@ -2191,7 +2195,7 @@ intel_miptree_unmap_blit(struct brw_context *brw,
>  {
>     struct gl_context *ctx = &brw->ctx;
>  
> -   intel_miptree_unmap_raw(brw, map->mt);
> +   intel_miptree_unmap_raw(map->mt);
>  
>     if (map->mode & GL_MAP_WRITE_BIT) {
>        bool ok = intel_miptree_blit(brw,
> @@ -2263,7 +2267,7 @@ intel_miptree_map_movntdqa(struct brw_context *brw,
>        _mesa_streaming_load_memcpy(dst_ptr, src_ptr, width_bytes);
>     }
>  
> -   intel_miptree_unmap_raw(brw, mt);
> +   intel_miptree_unmap_raw(mt);
>  }
>  
>  static void
> @@ -2312,7 +2316,7 @@ intel_miptree_map_s8(struct brw_context *brw,
>  	 }
>        }
>  
> -      intel_miptree_unmap_raw(brw, mt);
> +      intel_miptree_unmap_raw(mt);
>  
>        DBG("%s: %d,%d %dx%d from mt %p %d,%d = %p/%d\n", __func__,
>  	  map->x, map->y, map->w, map->h,
> @@ -2348,7 +2352,7 @@ intel_miptree_unmap_s8(struct brw_context *brw,
>  	 }
>        }
>  
> -      intel_miptree_unmap_raw(brw, mt);
> +      intel_miptree_unmap_raw(mt);
>     }
>  
>     free(map->buffer);
> @@ -2402,7 +2406,7 @@ intel_miptree_unmap_etc(struct brw_context *brw,
>                                 map->ptr, map->stride,
>                                 map->w, map->h, mt->etc_format);
>  
> -   intel_miptree_unmap_raw(brw, mt);
> +   intel_miptree_unmap_raw(mt);
>     free(map->buffer);
>  }
>  
> @@ -2472,8 +2476,8 @@ intel_miptree_map_depthstencil(struct brw_context *brw,
>  	 }
>        }
>  
> -      intel_miptree_unmap_raw(brw, s_mt);
> -      intel_miptree_unmap_raw(brw, z_mt);
> +      intel_miptree_unmap_raw(s_mt);
> +      intel_miptree_unmap_raw(z_mt);
>  
>        DBG("%s: %d,%d %dx%d from z mt %p %d,%d, s mt %p %d,%d = %p/%d\n",
>  	  __func__,
> @@ -2532,8 +2536,8 @@ intel_miptree_unmap_depthstencil(struct brw_context *brw,
>  	 }
>        }
>  
> -      intel_miptree_unmap_raw(brw, s_mt);
> -      intel_miptree_unmap_raw(brw, z_mt);
> +      intel_miptree_unmap_raw(s_mt);
> +      intel_miptree_unmap_raw(z_mt);
>  
>        DBG("%s: %d,%d %dx%d from z mt %p (%s) %d,%d, s mt %p %d,%d = %p/%d\n",
>  	  __func__,
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> index d91d4be..93cbd62 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
> @@ -774,12 +774,6 @@ brw_miptree_layout(struct brw_context *brw,
>                     struct intel_mipmap_tree *mt,
>                     uint32_t layout_flags);
>  
> -void *intel_miptree_map_raw(struct brw_context *brw,
> -                            struct intel_mipmap_tree *mt);
> -
> -void intel_miptree_unmap_raw(struct brw_context *brw,
> -                             struct intel_mipmap_tree *mt);
> -
>  void
>  intel_miptree_map(struct brw_context *brw,
>  		  struct intel_mipmap_tree *mt,
>