diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
| commit | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (patch) | |
| tree | 38fa447dc8970b83becb4d35487d2bb2e565301b /mesalib/src/mesa/main/multisample.h | |
| parent | d79b6645eb21ca82d506ef038b8ea71a1e431f3f (diff) | |
| parent | 31fd4c5654595a4763e492e4ec26f66ca3a8a405 (diff) | |
| download | vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.gz vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.bz2 vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013
Conflicts:
xorg-server/Xext/shm.c
xorg-server/os/xstrans.c
Diffstat (limited to 'mesalib/src/mesa/main/multisample.h')
| -rw-r--r-- | mesalib/src/mesa/main/multisample.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/multisample.h b/mesalib/src/mesa/main/multisample.h index 66848d269..7441d3ee9 100644 --- a/mesalib/src/mesa/main/multisample.h +++ b/mesalib/src/mesa/main/multisample.h @@ -44,6 +44,8 @@ _mesa_GetMultisamplefv(GLenum pname, GLuint index, GLfloat* val); extern void GLAPIENTRY _mesa_SampleMaski(GLuint index, GLbitfield mask); +extern void GLAPIENTRY +_mesa_MinSampleShading(GLclampf value); extern GLenum _mesa_check_sample_count(struct gl_context *ctx, GLenum target, |