diff options
author | marha <marha@users.sourceforge.net> | 2013-10-01 08:10:02 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-10-01 08:10:02 +0200 |
commit | 11b60c4ebaf348b01051bfff19f947b073028a99 (patch) | |
tree | 4f4a25423fa7a6cf28e2575eeec77e5f8a4a34bb /mesalib/src/mesa/main/glheader.h | |
parent | 4366c8fe34719e14906c420d7596e818aadf6ce0 (diff) | |
parent | a5391fdea94a7b827069c6f926f83a235076ccb4 (diff) | |
download | vcxsrv-11b60c4ebaf348b01051bfff19f947b073028a99.tar.gz vcxsrv-11b60c4ebaf348b01051bfff19f947b073028a99.tar.bz2 vcxsrv-11b60c4ebaf348b01051bfff19f947b073028a99.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa xkeyboard-config mesa git update 1 Oct 2013
Diffstat (limited to 'mesalib/src/mesa/main/glheader.h')
-rw-r--r-- | mesalib/src/mesa/main/glheader.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/glheader.h b/mesalib/src/mesa/main/glheader.h index b3b0c52a0..4ed51b317 100644 --- a/mesalib/src/mesa/main/glheader.h +++ b/mesalib/src/mesa/main/glheader.h @@ -115,12 +115,6 @@ typedef void *GLeglImageOES; #define GL_PALETTE8_RGB5_A1_OES 0x8B99 #endif -#ifndef GL_OES_matrix_get -#define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES 0x898D -#define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES 0x898E -#define GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES 0x898F -#endif - #ifndef GL_ES_VERSION_2_0 #define GL_SHADER_BINARY_FORMATS 0x8DF8 #define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 |