diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-25 14:46:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-25 14:46:10 +0200 |
| commit | f6c8097ba5b5bb714185762dbd0ff9958d23e804 (patch) | |
| tree | 222a1d19624e55a205786f54edd7892aae79a7bd /mesalib/src/mesa/main/samplerobj.c | |
| parent | b929a2bab9e244cbc823f7bb2fe9e21537e3ceb7 (diff) | |
| parent | 281f26a1dfda732687680a36857960f74608df5b (diff) | |
| download | vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.tar.gz vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.tar.bz2 vcxsrv-f6c8097ba5b5bb714185762dbd0ff9958d23e804.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update
Diffstat (limited to 'mesalib/src/mesa/main/samplerobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/samplerobj.c | 14 |
1 files changed, 9 insertions, 5 deletions
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); + } } |