Module: Mesa Branch: master Commit: 8348076ae444ab26d381cec1b388a1af4e0b0eba URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8348076ae444ab26d381cec1b388a1af4e0b0eba
Author: Brian Paul <[email protected]> Date: Sat Sep 22 09:30:24 2012 -0600 mesa: move GL_HALF_FLOAT_OES definition to glheader.h Reviewed-by: Kenneth Graunke <[email protected]> --- src/mesa/main/glheader.h | 7 +++++++ src/mesa/main/readpix.c | 5 ----- 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 3152323..e93ca30 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 e10f921..1793095 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 e4bee28..fb22c8d 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 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
