[Mesa-dev] [PATCH] glsl: Standardize names and fix typos

Kenneth Graunke kenneth at whitecape.org
Fri Oct 24 23:15:31 PDT 2014


On Friday, October 24, 2014 04:51:09 PM Andres Gomez wrote:
> ---
>  src/glsl/linker.cpp             |  4 ++--
>  src/glsl/lower_offset_array.cpp | 10 +++++-----
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
> index 47a722d..c3f435c 100644
> --- a/src/glsl/linker.cpp
> +++ b/src/glsl/linker.cpp
> @@ -1679,7 +1679,7 @@ link_intrastage_shaders(void *mem_ctx,
>  
>     populate_symbol_table(linked);
>  
> -   /* The a pointer to the main function in the final linked shader (i.e., 
the
> +   /* The pointer to the main function in the final linked shader (i.e., 
the
>      * copy of the original shader that contained the main function).
>      */
>     ir_function_signature *const main_sig =
> @@ -1882,7 +1882,7 @@ find_available_slots(unsigned used_mask, unsigned 
needed_count)
>  
>  
>  /**
> - * Assign locations for either VS inputs for FS outputs
> + * Assign locations for either VS inputs or FS outputs
>   *
>   * \param prog          Shader program whose variables need locations 
assigned
>   * \param target_index  Selector for the program target to receive location
> diff --git a/src/glsl/lower_offset_array.cpp 
b/src/glsl/lower_offset_array.cpp
> index 5b48526..c30f801 100644
> --- a/src/glsl/lower_offset_array.cpp
> +++ b/src/glsl/lower_offset_array.cpp
> @@ -22,7 +22,7 @@
>   */
>  
>  /**
> - * \file brw_lower_offset_array.cpp
> + * \file lower_offset_array.cpp
>   *
>   * IR lower pass to decompose ir_texture ir_tg4 with an array of offsets
>   * into four ir_tg4s with a single ivec2 offset, select the .w component of 
each,
> @@ -39,9 +39,9 @@
>  
>  using namespace ir_builder;
>  
> -class brw_lower_offset_array_visitor : public ir_rvalue_visitor {
> +class lower_offset_array_visitor : public ir_rvalue_visitor {
>  public:
> -   brw_lower_offset_array_visitor()
> +   lower_offset_array_visitor()
>     {
>        progress = false;
>     }
> @@ -52,7 +52,7 @@ public:
>  };
>  
>  void
> -brw_lower_offset_array_visitor::handle_rvalue(ir_rvalue **rv)
> +lower_offset_array_visitor::handle_rvalue(ir_rvalue **rv)
>  {
>     if (*rv == NULL || (*rv)->ir_type != ir_type_texture)
>        return;
> @@ -83,7 +83,7 @@ brw_lower_offset_array_visitor::handle_rvalue(ir_rvalue 
**rv)
>  bool
>  lower_offset_arrays(exec_list *instructions)
>  {
> -   brw_lower_offset_array_visitor v;
> +   lower_offset_array_visitor v;
>  
>     visit_list_elements(&v, instructions);
>  
> 

Pushed, thanks!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20141024/a5319d3f/attachment.sig>


More information about the mesa-dev mailing list