[Mesa-dev] [PATCH 1/3] mesa: Mark _mesa_{init, delete}_sampler_object as static

Kenneth Graunke kenneth at whitecape.org
Mon Dec 31 22:15:28 PST 2012


On 12/31/2012 08:35 PM, Matt Turner wrote:
> ---
>   src/mesa/main/samplerobj.c |    4 ++--
>   src/mesa/main/samplerobj.h |    7 -------
>   2 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
> index 3c3bfff..9b21216 100644
> --- a/src/mesa/main/samplerobj.c
> +++ b/src/mesa/main/samplerobj.c
> @@ -110,7 +110,7 @@ _mesa_reference_sampler_object_(struct gl_context *ctx,
>   /**
>    * Initialize the fields of the given sampler object.
>    */
> -void
> +static void
>   _mesa_init_sampler_object(struct gl_sampler_object *sampObj, GLuint name)
>   {
>      sampObj->Name = name;
> @@ -151,7 +151,7 @@ _mesa_new_sampler_object(struct gl_context *ctx, GLuint name)
>   /**
>    * Fallback for ctx->Driver.DeleteSamplerObject();
>    */
> -void
> +static void
>   _mesa_delete_sampler_object(struct gl_context *ctx,
>                               struct gl_sampler_object *sampObj)
>   {
> diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
> index ecff032..dce7c6c 100644
> --- a/src/mesa/main/samplerobj.h
> +++ b/src/mesa/main/samplerobj.h
> @@ -63,17 +63,10 @@ _mesa_reference_sampler_object(struct gl_context *ctx,
>   }
>
>
> -extern void
> -_mesa_init_sampler_object(struct gl_sampler_object *sampObj, GLuint name);
> -
>   extern struct gl_sampler_object *
>   _mesa_new_sampler_object(struct gl_context *ctx, GLuint name);
>
>   extern void
> -_mesa_delete_sampler_object(struct gl_context *ctx,
> -                            struct gl_sampler_object *sampObj);
> -
> -extern void
>   _mesa_init_sampler_object_functions(struct dd_function_table *driver);
>
>   extern void

This series is:
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>


More information about the mesa-dev mailing list