On Tue, Sep 27, 2016 at 12:03:40PM +1000, Timothy Arceri wrote:
> ---
Whitespace-only change, and the result is cleaner than before :)
Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>
> src/compiler/glsl/glsl_parser_extras.h | 60
> +++++++++++++++++-----------------
> 1 file changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/src/compiler/glsl/glsl_parser_extras.h
> b/src/compiler/glsl/glsl_parser_extras.h
> index f4050e3..b9c9a1a 100644
> --- a/src/compiler/glsl/glsl_parser_extras.h
> +++ b/src/compiler/glsl/glsl_parser_extras.h
> @@ -69,12 +69,12 @@ typedef struct YYLTYPE {
> # define YYLTYPE_IS_TRIVIAL 1
>
> extern void _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
> - const char *fmt, ...);
> + const char *fmt, ...);
>
>
> struct _mesa_glsl_parse_state {
> _mesa_glsl_parse_state(struct gl_context *_ctx, gl_shader_stage stage,
> - void *mem_ctx);
> + void *mem_ctx);
>
> DECLARE_RALLOC_CXX_OPERATORS(_mesa_glsl_parse_state);
>
> @@ -816,23 +816,23 @@ struct _mesa_glsl_parse_state {
> unsigned clip_dist_size, cull_dist_size;
> };
>
> -# define YYLLOC_DEFAULT(Current, Rhs, N) \
> -do { \
> - if (N) \
> - { \
> - (Current).first_line = YYRHSLOC(Rhs, 1).first_line; \
> - (Current).first_column = YYRHSLOC(Rhs, 1).first_column; \
> - (Current).last_line = YYRHSLOC(Rhs, N).last_line; \
> - (Current).last_column = YYRHSLOC(Rhs, N).last_column; \
> - } \
> - else \
> - { \
> - (Current).first_line = (Current).last_line = \
> - YYRHSLOC(Rhs, 0).last_line; \
> - (Current).first_column = (Current).last_column = \
> - YYRHSLOC(Rhs, 0).last_column; \
> - } \
> - (Current).source = 0; \
> +# define YYLLOC_DEFAULT(Current, Rhs, N) \
> +do { \
> + if (N) \
> + { \
> + (Current).first_line = YYRHSLOC(Rhs, 1).first_line; \
> + (Current).first_column = YYRHSLOC(Rhs, 1).first_column; \
> + (Current).last_line = YYRHSLOC(Rhs, N).last_line; \
> + (Current).last_column = YYRHSLOC(Rhs, N).last_column; \
> + } \
> + else \
> + { \
> + (Current).first_line = (Current).last_line = \
> + YYRHSLOC(Rhs, 0).last_line; \
> + (Current).first_column = (Current).last_column = \
> + YYRHSLOC(Rhs, 0).last_column; \
> + } \
> + (Current).source = 0; \
> } while (0)
>
> /**
> @@ -841,11 +841,11 @@ do {
> \
> * \sa _mesa_glsl_error
> */
> extern void _mesa_glsl_warning(const YYLTYPE *locp,
> - _mesa_glsl_parse_state *state,
> - const char *fmt, ...);
> + _mesa_glsl_parse_state *state,
> + const char *fmt, ...);
>
> extern void _mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state,
> - const char *string);
> + const char *string);
>
> extern void _mesa_glsl_lexer_dtor(struct _mesa_glsl_parse_state *state);
>
> @@ -863,9 +863,9 @@ extern int _mesa_glsl_parse(struct _mesa_glsl_parse_state
> *);
> * \c false is returned.
> */
> extern bool _mesa_glsl_process_extension(const char *name, YYLTYPE
> *name_locp,
> - const char *behavior,
> - YYLTYPE *behavior_locp,
> - _mesa_glsl_parse_state *state);
> + const char *behavior,
> + YYLTYPE *behavior_locp,
> + _mesa_glsl_parse_state *state);
>
> #endif /* __cplusplus */
>
> @@ -880,11 +880,11 @@ extern "C" {
> struct glcpp_parser;
>
> typedef void (*glcpp_extension_iterator)(
> - struct _mesa_glsl_parse_state *state,
> - void (*add_builtin_define)(struct glcpp_parser *, const char *,
> int),
> - struct glcpp_parser *data,
> - unsigned version,
> - bool es);
> + struct _mesa_glsl_parse_state *state,
> + void (*add_builtin_define)(struct glcpp_parser *, const char
> *, int),
> + struct glcpp_parser *data,
> + unsigned version,
> + bool es);
>
> extern int glcpp_preprocess(void *ctx, const char **shader, char **info_log,
> glcpp_extension_iterator extensions,
> --
> 2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
