diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-27 15:15:06 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-27 15:15:06 +0200 |
| commit | 24703f26d8ed55b1971aa2e94d33636e871bff0b (patch) | |
| tree | 3e57b600f4446a1db1d8e73cb8a83519570eb678 /mesalib/src/mesa/main/glheader.h | |
| parent | 94ef26cb962261d0b47daf7ef3c856510999bd4c (diff) | |
| parent | 2cf1e3de4759264eac2fa8ac758ea750636542f8 (diff) | |
| download | vcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.tar.gz vcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.tar.bz2 vcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver pixman xkeyboard-config git update 27 sep 2012
Diffstat (limited to 'mesalib/src/mesa/main/glheader.h')
| -rw-r--r-- | mesalib/src/mesa/main/glheader.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/glheader.h b/mesalib/src/mesa/main/glheader.h index 315232371..e93ca30e7 100644 --- a/mesalib/src/mesa/main/glheader.h +++ b/mesalib/src/mesa/main/glheader.h @@ -144,6 +144,13 @@ typedef void *GLeglImageOES; #endif +/* Inexplicably, GL_HALF_FLOAT_OES has a different value than GL_HALF_FLOAT. + */ +#ifndef GL_HALF_FLOAT_OES +#define GL_HALF_FLOAT_OES 0x8D61 +#endif + + /** * Internal token to represent a GLSL shader program (a collection of * one or more shaders that get linked together). Note that GLSL |