Jordan Justen <jordan.l.jus...@intel.com> writes: > diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c > index 15de321..2a39693 100644 > --- a/src/mesa/main/get.c > +++ b/src/mesa/main/get.c > @@ -391,6 +391,7 @@ extra_NV_read_buffer_api_gl[] = { > #define API_OPENGL_BIT (1 << API_OPENGL) > #define API_OPENGLES_BIT (1 << API_OPENGLES) > #define API_OPENGLES2_BIT (1 << API_OPENGLES2) > +#define API_OPENGL_CORE_BIT (1 << API_OPENGL_CORE) > > /* This is the big table describing all the enums we accept in > * glGet*v(). The table is partitioned into six parts: enums > @@ -405,7 +406,9 @@ extra_NV_read_buffer_api_gl[] = { > static const struct value_desc values[] = { > /* Enums shared between OpenGL, GLES1 and GLES2 */ > { 0, 0, TYPE_API_MASK, > - API_OPENGL_BIT | API_OPENGLES_BIT | API_OPENGLES2_BIT, NO_EXTRA}, > + API_OPENGL_BIT | API_OPENGLES_BIT |API_OPENGLES2_BIT |
weird little bit of whitespace loss there. > diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c > index efa63b0..fee5669 100644 > --- a/src/mesa/main/varray.c > +++ b/src/mesa/main/varray.c > @@ -92,7 +92,7 @@ type_to_bit(const struct gl_context *ctx, GLenum type) > case GL_DOUBLE: > return DOUBLE_BIT; > case GL_FIXED: > - return ctx->API == API_OPENGL ? FIXED_GL_BIT : FIXED_ES_BIT; > + return (_mesa_is_desktop_gl(ctx)) ? FIXED_GL_BIT : FIXED_ES_BIT; funny extra parens. other than that, the series is: Reviewed-by: Eric Anholt <e...@anholt.net>
pgpgqQJYuerL3.pgp
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev