[Mesa-dev] [PATCH 09/41] main: Removed trailing whitespace in texstate.c.

Anuj Phogat anuj.phogat at gmail.com
Tue Jan 6 11:35:46 PST 2015


I think you can squash all the patches fixing the white space issues.
Patch 09/41, 36/41 and 37/41.

On Mon, Dec 15, 2014 at 5:22 PM, Laura Ekstrand <laura at jlekstrand.net> wrote:
> ---
>  src/mesa/main/texstate.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
> index e0f0852..36eefa6 100644
> --- a/src/mesa/main/texstate.c
> +++ b/src/mesa/main/texstate.c
> @@ -22,7 +22,7 @@
>   * OTHER DEALINGS IN THE SOFTWARE.
>   */
>
> -/**
> +/**
>   * \file texstate.c
>   *
>   * Texture state handling.
> @@ -153,7 +153,7 @@ _mesa_print_texunit_state( struct gl_context *ctx, GLuint unit )
>  /**
>   * Convert "classic" texture environment to ARB_texture_env_combine style
>   * environments.
> - *
> + *
>   * \param state  texture_env_combine state vector to be filled-in.
>   * \param mode   Classic texture environment mode (i.e., \c GL_REPLACE,
>   *               \c GL_BLEND, \c GL_DECAL, etc.).
> @@ -186,7 +186,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
>     case GL_YCBCR_MESA:
>        state->SourceA[0] = GL_PREVIOUS;
>        break;
> -
> +
>     default:
>        _mesa_problem(NULL,
>                      "Invalid texBaseFormat 0x%x in calculate_derived_texenv",
> @@ -203,7 +203,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
>        mode_rgb = (texBaseFormat == GL_ALPHA) ? GL_REPLACE : mode;
>        mode_a   = mode;
>        break;
> -
> +
>     case GL_DECAL:
>        mode_rgb = GL_INTERPOLATE;
>        mode_a   = GL_REPLACE;
> @@ -272,7 +272,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
>                      mode);
>        return;
>     }
> -
> +
>     state->ModeRGB = (state->SourceRGB[0] != GL_PREVIOUS)
>         ? mode_rgb : GL_REPLACE;
>     state->ModeA   = (state->SourceA[0]   != GL_PREVIOUS)
> @@ -769,11 +769,11 @@ _mesa_update_texture( struct gl_context *ctx, GLuint new_state )
>
>  /**
>   * Allocate the proxy textures for the given context.
> - *
> + *
>   * \param ctx the context to allocate proxies for.
> - *
> + *
>   * \return GL_TRUE on success, or GL_FALSE on failure
> - *
> + *
>   * If run out of memory part way through the allocations, clean up and return
>   * GL_FALSE.
>   */
> @@ -944,7 +944,7 @@ _mesa_free_texture_data(struct gl_context *ctx)
>
>  /**
>   * Update the default texture objects in the given context to reference those
> - * specified in the shared state and release those referencing the old
> + * specified in the shared state and release those referencing the old
>   * shared state.
>   */
>  void
> --
> 2.1.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list