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.h | |
| 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.h')
| -rw-r--r-- | mesalib/src/mesa/main/samplerobj.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/samplerobj.h b/mesalib/src/mesa/main/samplerobj.h index e70ee4881..bea4c2232 100644 --- a/mesalib/src/mesa/main/samplerobj.h +++ b/mesalib/src/mesa/main/samplerobj.h @@ -77,7 +77,8 @@ extern void _mesa_init_sampler_object_functions(struct dd_function_table *driver); extern void -_mesa_init_sampler_object_dispatch(struct _glapi_table *disp); +_mesa_init_sampler_object_dispatch(const struct gl_context *ctx, + struct _glapi_table *disp); extern void GLAPIENTRY _mesa_BindSampler(GLuint unit, GLuint sampler); |