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/main/texformat.c | |
| parent | 3aaeb3e5e76b7b468e2eb2a26f30d68d19d3c854 (diff) | |
| download | external_mesa3d-9c1b41879aab2ff7386c547a2ccce7686c018cf5.zip external_mesa3d-9c1b41879aab2ff7386c547a2ccce7686c018cf5.tar.gz external_mesa3d-9c1b41879aab2ff7386c547a2ccce7686c018cf5.tar.bz2 | |
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/main/texformat.c')
| -rw-r--r-- | src/mesa/main/texformat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c index d360f0e..275e69e 100644 --- a/src/mesa/main/texformat.c +++ b/src/mesa/main/texformat.c @@ -719,7 +719,7 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, } } - if (ctx->VersionMajor >= 3 || + if (ctx->Version >= 30 || ctx->Extensions.EXT_texture_integer) { switch (internalFormat) { case GL_RGB8UI_EXT: @@ -838,7 +838,7 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, } } - if (ctx->VersionMajor >= 3 || + if (ctx->Version >= 30 || (ctx->Extensions.ARB_texture_rg && ctx->Extensions.EXT_texture_integer)) { switch (internalFormat) { |