diff options
| author | Eric Anholt <eric@anholt.net> | 2012-07-26 14:43:56 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-08-07 11:47:19 -0700 |
| commit | 9c1b41879aab2ff7386c547a2ccce7686c018cf5 (patch) | |
| tree | 934b03d503f257d3979d6ebe9ad36cee2953bb25 /src/mesa/drivers | |
| 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 <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_screen.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_context.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_context.c | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 088fd61eff..3c595bc6e7 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -724,9 +724,7 @@ intelCreateContext(gl_api api, (struct gl_context *) driContextPriv->driverPrivate; _mesa_compute_version(ctx); - if (ctx->VersionMajor > major_version - || (ctx->VersionMajor == major_version - && ctx->VersionMinor >= minor_version)) { + if (ctx->Version >= major_version * 10 + minor_version) { return true; } diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c index d7d5a04e69..f79430890f 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_context.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c @@ -75,9 +75,7 @@ nouveau_context_create(gl_api api, dri_ctx->driverPrivate = ctx; _mesa_compute_version(ctx); - if (ctx->VersionMajor < major_version - || (ctx->VersionMajor == major_version - && ctx->VersionMinor < minor_version)) { + if (ctx->Version < major_version * 10 + minor_version) { nouveau_context_destroy(dri_ctx); *error = __DRI_CTX_ERROR_BAD_VERSION; return GL_FALSE; diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 244973e847..17e08a10fc 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -454,9 +454,7 @@ GLboolean r200CreateContext( gl_api api, } _mesa_compute_version(ctx); - if (ctx->VersionMajor < major_version - || (ctx->VersionMajor == major_version - && ctx->VersionMinor < minor_version)) { + if (ctx->Version < major_version * 10 + minor_version) { r200DestroyContext(driContextPriv); *error = __DRI_CTX_ERROR_BAD_VERSION; return GL_FALSE; diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 9881d002fa..34c392ef8b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -402,9 +402,7 @@ r100CreateContext( gl_api api, } _mesa_compute_version(ctx); - if (ctx->VersionMajor < major_version - || (ctx->VersionMajor == major_version - && ctx->VersionMinor < minor_version)) { + if (ctx->Version < major_version * 10 + minor_version) { radeonDestroyContext(driContextPriv); *error = __DRI_CTX_ERROR_BAD_VERSION; return GL_FALSE; |