[Mesa-dev] [PATCH 2/4] st/mesa: add support for get sample position

[Brian Paul]

Just minor formatting nits below.

On 03/03/2013 01:27 PM, Dave Airlie wrote:
> From: Dave Airlie<airlied at redhat.com>
>
> This just calls into the gallium interface.
>
> Signed-off-by: Dave Airlie<airlied at redhat.com>
> ---
>   src/mesa/sources.mak                |  1 +
>   src/mesa/state_tracker/st_cb_msaa.c | 52 +++++++++++++++++++++++++++++++++++++
>   src/mesa/state_tracker/st_cb_msaa.h | 39 ++++++++++++++++++++++++++++
>   src/mesa/state_tracker/st_context.c |  2 ++
>   4 files changed, 94 insertions(+)
>   create mode 100644 src/mesa/state_tracker/st_cb_msaa.c
>   create mode 100644 src/mesa/state_tracker/st_cb_msaa.h
>
> diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
> index 178ceb2..7498d96 100644
> --- a/src/mesa/sources.mak
> +++ b/src/mesa/sources.mak
> @@ -224,6 +224,7 @@ STATETRACKER_FILES = \
>   	$(SRCDIR)state_tracker/st_cb_eglimage.c \
>   	$(SRCDIR)state_tracker/st_cb_fbo.c \
>   	$(SRCDIR)state_tracker/st_cb_feedback.c \
> +	$(SRCDIR)state_tracker/st_cb_msaa.c \
>   	$(SRCDIR)state_tracker/st_cb_program.c \
>   	$(SRCDIR)state_tracker/st_cb_queryobj.c \
>   	$(SRCDIR)state_tracker/st_cb_rasterpos.c \
> diff --git a/src/mesa/state_tracker/st_cb_msaa.c b/src/mesa/state_tracker/st_cb_msaa.c
> new file mode 100644
> index 0000000..688d6a3
> --- /dev/null
> +++ b/src/mesa/state_tracker/st_cb_msaa.c
> @@ -0,0 +1,52 @@
> +/**************************************************************************
> + *
> + * Copyright 2013 Red Hat
> + * All Rights Reserved.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sub license, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial portions
> + * of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
> + * IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR
> + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
> + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
> + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> + *
> + **************************************************************************/
> +
> +#include "main/mfeatures.h"
> +#include "main/bufferobj.h"
> +#include "main/imports.h"
> +
> +#include "state_tracker/st_cb_msaa.h"
> +#include "state_tracker/st_context.h"
> +#include "state_tracker/st_cb_fbo.h"
> +
> +#include "pipe/p_context.h"

Put a blank line or two after the #include line.


> +static void st_GetSamplePosition(struct gl_context *ctx,
> +                                 struct gl_framebuffer *fb,
> +                                 GLuint index,
> +                                 GLfloat *outValue)

Put 'static void' on its own line.


> +{
> +   struct st_context *st = st_context(ctx);
> +   struct st_renderbuffer *strb;
> +
> +   if (st->pipe->get_sample_position)
> +      st->pipe->get_sample_position(st->pipe, fb->Visual.samples, index, outValue);
> +}
> +
> +void st_init_msaa_functions(struct dd_function_table *functions)

'void' on its own line.


> +{
> +   functions->GetSamplePosition = st_GetSamplePosition;
> +}
> diff --git a/src/mesa/state_tracker/st_cb_msaa.h b/src/mesa/state_tracker/st_cb_msaa.h
> new file mode 100644
> index 0000000..ba4c06f
> --- /dev/null
> +++ b/src/mesa/state_tracker/st_cb_msaa.h
> @@ -0,0 +1,39 @@
> +/**************************************************************************
> + *
> + * Copyright 2013 Red Hat
> + * All Rights Reserved.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the
> + * "Software"), to deal in the Software without restriction, including
> + * without limitation the rights to use, copy, modify, merge, publish,
> + * distribute, sub license, and/or sell copies of the Software, and to
> + * permit persons to whom the Software is furnished to do so, subject to
> + * the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the
> + * next paragraph) shall be included in all copies or substantial portions
> + * of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
> + * IN NO EVENT SHALL THE AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR
> + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
> + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
> + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> + *
> + **************************************************************************/
> +
> +
> +#ifndef ST_CB_MSAA_H
> +#define ST_CB_MSAA_H
> +
> +#include "main/glheader.h"
> +
> +struct dd_function_table;
> +
> +extern void
> +st_init_msaa_functions(struct dd_function_table *functions);
> +
> +#endif
> diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
> index f9a584b..a7f7be2 100644
> --- a/src/mesa/state_tracker/st_context.c
> +++ b/src/mesa/state_tracker/st_context.c
> @@ -49,6 +49,7 @@
>   #include "st_cb_eglimage.h"
>   #include "st_cb_fbo.h"
>   #include "st_cb_feedback.h"
> +#include "st_cb_msaa.h"
>   #include "st_cb_program.h"
>   #include "st_cb_queryobj.h"
>   #include "st_cb_readpixels.h"
> @@ -335,6 +336,7 @@ void st_init_driver_functions(struct dd_function_table *functions)
>
>      st_init_fbo_functions(functions);
>      st_init_feedback_functions(functions);
> +   st_init_msaa_functions(functions);
>      st_init_program_functions(functions);
>      st_init_query_functions(functions);
>      st_init_cond_render_functions(functions);

Reviewed-by: Brian Paul <brianp at vmware.com>