diff options
| author | Eric Anholt <[email protected]> | 2012-07-26 14:43:56 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-08-07 11:47:19 -0700 |
| commit | 9c1b41879aab2ff7386c547a2ccce7686c018cf5 (patch) | |
| tree | 934b03d503f257d3979d6ebe9ad36cee2953bb25 /src/mesa/main/enable.c | |
| parent | 3aaeb3e5e76b7b468e2eb2a26f30d68d19d3c854 (diff) | |
mesa: Replace VersionMajor/VersionMinor with a Version field.
As we get into supporting GL 3.x core, we come across more and more features
of the API that depend on the version number as opposed to just the extension
list. This will let us more sanely do version checks than "(VersionMajor == 3
&& VersionMinor >= 2) || VersionMajor >= 4".
v2: Fix a bad <= 30 check.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/enable.c')
| -rw-r--r-- | src/mesa/main/enable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index c811f2a9c74..f8110578ad4 100644 --- a/src/mesa/main/enable.c +++ b/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; |