diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-13 10:11:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-13 10:11:17 +0200 |
| commit | f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1 (patch) | |
| tree | 921a5a742930124e7bd7e9a7e73f6029bd74338d /mesalib/src/mesa/main/enable.c | |
| parent | ec4051f308e8e84146e0ecc39b6d228e500e9636 (diff) | |
| parent | 9ddf44af81782451cee798e06749ce3067a14a41 (diff) | |
| download | vcxsrv-f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1.tar.gz vcxsrv-f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1.tar.bz2 vcxsrv-f5a4fa87e844b3ea2658a2355a4c4ac3393a65a1.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/enable.c')
| -rw-r--r-- | mesalib/src/mesa/main/enable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c index c811f2a9c..f8110578a 100644 --- a/mesalib/src/mesa/main/enable.c +++ b/mesalib/src/mesa/main/enable.c @@ -902,7 +902,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) * GL_PRIMITIVE_RESTART_NV (which is client state). */ case GL_PRIMITIVE_RESTART: - if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) { + if (ctx->Version < 31) { goto invalid_enum_error; } if (ctx->Array.PrimitiveRestart != state) { @@ -1419,7 +1419,7 @@ _mesa_IsEnabled( GLenum cap ) /* GL 3.1 primitive restart */ case GL_PRIMITIVE_RESTART: - if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) { + if (ctx->Version < 31) { goto invalid_enum_error; } return ctx->Array.PrimitiveRestart; |