[Mesa-dev] [PATCH] i965/fs/nir: "surface_access::" prefix not needed

[Iago Toral]

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

On Fri, 2016-03-04 at 20:38 +0100, Alejandro Piñeiro wrote:
> "using namespace brw::surface_access" is already present at the
> top of the source file.
> ---
>  src/mesa/drivers/dri/i965/brw_fs_nir.cpp | 24 ++++++++++--------------
>  1 file changed, 10 insertions(+), 14 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
> index db20c71..2d868cd 100644
> --- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
> @@ -2299,8 +2299,6 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
>     case nir_intrinsic_atomic_counter_inc:
>     case nir_intrinsic_atomic_counter_dec:
>     case nir_intrinsic_atomic_counter_read: {
> -      using namespace surface_access;
> -
>        /* Get the arguments of the atomic intrinsic. */
>        const fs_reg offset = get_nir_src(instr->src[0]);
>        const unsigned surface = (stage_prog_data->binding_table.abo_start +
> @@ -2886,12 +2884,11 @@ fs_visitor::nir_emit_ssbo_atomic(const fs_builder &bld,
>  
>     /* Emit the actual atomic operation operation */
>  
> -   fs_reg atomic_result =
> -      surface_access::emit_untyped_atomic(bld, surface, offset,
> -                                          data1, data2,
> -                                          1 /* dims */, 1 /* rsize */,
> -                                          op,
> -                                          BRW_PREDICATE_NONE);
> +   fs_reg atomic_result = emit_untyped_atomic(bld, surface, offset,
> +                                              data1, data2,
> +                                              1 /* dims */, 1 /* rsize */,
> +                                              op,
> +                                              BRW_PREDICATE_NONE);
>     dest.type = atomic_result.type;
>     bld.MOV(dest, atomic_result);
>  }
> @@ -2913,12 +2910,11 @@ fs_visitor::nir_emit_shared_atomic(const fs_builder &bld,
>  
>     /* Emit the actual atomic operation operation */
>  
> -   fs_reg atomic_result =
> -      surface_access::emit_untyped_atomic(bld, surface, offset,
> -                                          data1, data2,
> -                                          1 /* dims */, 1 /* rsize */,
> -                                          op,
> -                                          BRW_PREDICATE_NONE);
> +   fs_reg atomic_result = emit_untyped_atomic(bld, surface, offset,
> +                                              data1, data2,
> +                                              1 /* dims */, 1 /* rsize */,
> +                                              op,
> +                                              BRW_PREDICATE_NONE);
>     dest.type = atomic_result.type;
>     bld.MOV(dest, atomic_result);
>  }