From 281f26a1dfda732687680a36857960f74608df5b Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 25 Oct 2012 09:59:33 +0200 Subject: fontconfig mesa pixman git update fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822 mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0 --- mesalib/src/mesa/main/samplerobj.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'mesalib/src/mesa/main/samplerobj.c') diff --git a/mesalib/src/mesa/main/samplerobj.c b/mesalib/src/mesa/main/samplerobj.c index 4514b1224..09cbd2939 100644 --- a/mesalib/src/mesa/main/samplerobj.c +++ b/mesalib/src/mesa/main/samplerobj.c @@ -1444,7 +1444,8 @@ _mesa_init_sampler_object_functions(struct dd_function_table *driver) void -_mesa_init_sampler_object_dispatch(struct _glapi_table *disp) +_mesa_init_sampler_object_dispatch(const struct gl_context *ctx, + struct _glapi_table *disp) { SET_GenSamplers(disp, _mesa_GenSamplers); SET_DeleteSamplers(disp, _mesa_DeleteSamplers); @@ -1454,10 +1455,13 @@ _mesa_init_sampler_object_dispatch(struct _glapi_table *disp) SET_SamplerParameterf(disp, _mesa_SamplerParameterf); SET_SamplerParameteriv(disp, _mesa_SamplerParameteriv); SET_SamplerParameterfv(disp, _mesa_SamplerParameterfv); - SET_SamplerParameterIiv(disp, _mesa_SamplerParameterIiv); - SET_SamplerParameterIuiv(disp, _mesa_SamplerParameterIuiv); SET_GetSamplerParameteriv(disp, _mesa_GetSamplerParameteriv); SET_GetSamplerParameterfv(disp, _mesa_GetSamplerParameterfv); - SET_GetSamplerParameterIiv(disp, _mesa_GetSamplerParameterIiv); - SET_GetSamplerParameterIuiv(disp, _mesa_GetSamplerParameterIuiv); + + if (_mesa_is_desktop_gl(ctx)) { + SET_SamplerParameterIiv(disp, _mesa_SamplerParameterIiv); + SET_SamplerParameterIuiv(disp, _mesa_SamplerParameterIuiv); + SET_GetSamplerParameterIiv(disp, _mesa_GetSamplerParameterIiv); + SET_GetSamplerParameterIuiv(disp, _mesa_GetSamplerParameterIuiv); + } } -- cgit v1.2.3