diff options
| author | Pauli Nieminen <[email protected]> | 2012-06-12 21:38:57 +0300 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-08-01 15:57:12 -0700 |
| commit | 5a320d5bcfb66afca6fe9fe5da133c2675ab4d27 (patch) | |
| tree | 2a158c4e3835c2663914fdd4341dd5eb681c6035 | |
| parent | cbdc1d53542b3ecca0085399c4bb3b3371f94809 (diff) | |
mesa: Allow meta module to call sampler functions
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 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mesa/main/samplerobj.c | 8 | ||||
| -rw-r--r-- | 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 5bb90cf72f0..dc8adfc3f72 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; @@ -600,7 +600,7 @@ set_sampler_srgb_decode(struct gl_context *ctx, return GL_TRUE; } -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 0bfda43517b..2b0cd794665 100644 --- a/src/mesa/main/samplerobj.h +++ b/src/mesa/main/samplerobj.h @@ -77,5 +77,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 */ |