diff options
| author | Brian Paul <[email protected]> | 2012-09-22 09:30:24 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-09-26 07:43:49 -0600 |
| commit | 8348076ae444ab26d381cec1b388a1af4e0b0eba (patch) | |
| tree | c12fa1bebd8f34c10bf0dac1c97af4b8eb933822 /src/mesa | |
| parent | b52e05cecb3650f875bd27c27bef529f35faea0a (diff) | |
mesa: move GL_HALF_FLOAT_OES definition to glheader.h
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/glheader.h | 7 | ||||
| -rw-r--r-- | src/mesa/main/readpix.c | 5 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 315232371ed..e93ca30e7c1 100644 --- a/src/mesa/main/glheader.h +++ b/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 diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index e10f921d289..1793095d4a9 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -40,11 +40,6 @@ #include "fbobject.h" #include "teximage.h" -/* 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 /** * Tries to implement glReadPixels() of GL_DEPTH_COMPONENT using memcpy of the diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index e4bee287f0a..fb22c8d3af1 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -50,12 +50,6 @@ #include "glformats.h" -/* 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 - /** * State changes which we care about for glCopyTex[Sub]Image() calls. * In particular, we care about pixel transfer state and buffer state |