diff options
author | marha <marha@users.sourceforge.net> | 2012-08-13 10:09:30 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-08-13 10:09:30 +0200 |
commit | 9ddf44af81782451cee798e06749ce3067a14a41 (patch) | |
tree | f84b06f6897929113f080d8e505621fa6bf73fb9 /mesalib/src/mesa/main/varray.c | |
parent | f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0 (diff) | |
download | vcxsrv-9ddf44af81782451cee798e06749ce3067a14a41.tar.gz vcxsrv-9ddf44af81782451cee798e06749ce3067a14a41.tar.bz2 vcxsrv-9ddf44af81782451cee798e06749ce3067a14a41.zip |
mesa pixman xkeyboard-config xserver git update 13 Aug 2012
Diffstat (limited to 'mesalib/src/mesa/main/varray.c')
-rw-r--r-- | mesalib/src/mesa/main/varray.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c index 7ec7cfee6..327fabbc1 100644 --- a/mesalib/src/mesa/main/varray.c +++ b/mesalib/src/mesa/main/varray.c @@ -568,7 +568,7 @@ get_vertex_array_attrib(struct gl_context *ctx, GLuint index, GLenum pname, case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB: return array->BufferObj->Name; case GL_VERTEX_ATTRIB_ARRAY_INTEGER: - if (ctx->VersionMajor >= 3 || ctx->Extensions.EXT_gpu_shader4) { + if (ctx->Version >= 30 || ctx->Extensions.EXT_gpu_shader4) { return array->Integer; } goto error; @@ -1092,8 +1092,7 @@ _mesa_PrimitiveRestartIndex(GLuint index) { GET_CURRENT_CONTEXT(ctx); - if (!ctx->Extensions.NV_primitive_restart && - ctx->VersionMajor * 10 + ctx->VersionMinor < 31) { + if (!ctx->Extensions.NV_primitive_restart && ctx->Version < 31) { _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartIndexNV()"); return; } |