[Mesa-dev] [PATCH 17/21] mesa/samplerobj: Allow meta module to call sampler functions

[Brian Paul]

On 06/11/2012 12:59 AM, Pauli Nieminen wrote:
> To allow meta module to use sample objects mesa GL functions need to be
> visible and linkable for meta module.
>
> Signed-off-by: Pauli Nieminen<pauli.nieminen at linux.intel.com>
> ---
>   src/mesa/main/samplerobj.c |    8 ++++----
>   src/mesa/main/samplerobj.h |   11 +++++++++++
>   2 files changed, 15 insertions(+), 4 deletions(-)
>
> diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
> index f276296..f2d99a0 100644
> --- a/src/mesa/main/samplerobj.c
> +++ b/src/mesa/main/samplerobj.c
> @@ -160,7 +160,7 @@ _mesa_delete_sampler_object(struct gl_context *ctx,
>   }
>
>
> -static void GLAPIENTRY
> +void GLAPIENTRY
>   _mesa_GenSamplers(GLsizei count, GLuint *samplers)
>   {
>      GET_CURRENT_CONTEXT(ctx);
> @@ -192,7 +192,7 @@ _mesa_GenSamplers(GLsizei count, GLuint *samplers)
>   }
>
>
> -static void GLAPIENTRY
> +void GLAPIENTRY
>   _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers)
>   {
>      GET_CURRENT_CONTEXT(ctx);
> @@ -242,7 +242,7 @@ _mesa_IsSampler(GLuint sampler)
>   }
>
>
> -static void GLAPIENTRY
> +void GLAPIENTRY
>   _mesa_BindSampler(GLuint unit, GLuint sampler)
>   {
>      struct gl_sampler_object *sampObj;
> @@ -601,7 +601,7 @@ set_sampler_srgb_decode(struct gl_context *ctx,
>   }
>
>
> -static void GLAPIENTRY
> +void GLAPIENTRY
>   _mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
>   {
>      struct gl_sampler_object *sampObj;
> diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
> index 33da894..e70ee48 100644
> --- a/src/mesa/main/samplerobj.h
> +++ b/src/mesa/main/samplerobj.h
> @@ -79,5 +79,16 @@ _mesa_init_sampler_object_functions(struct dd_function_table *driver);
>   extern void
>   _mesa_init_sampler_object_dispatch(struct _glapi_table *disp);
>
> +extern void GLAPIENTRY
> +_mesa_BindSampler(GLuint unit, GLuint sampler);
> +
> +extern void GLAPIENTRY
> +_mesa_GenSamplers(GLsizei count, GLuint *samplers);
> +
> +extern void GLAPIENTRY
> +_mesa_DeleteSamplers(GLsizei count, const GLuint *samplers);
> +
> +extern void GLAPIENTRY
> +_mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param);
>
>   #endif /* SAMPLEROBJ_H */


This and the rest of the meta-related changes look good too.

Nice work!

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