diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-26 10:45:42 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-26 10:45:42 +0100 |
| commit | 40bdd8b27f5c730b8d0c9a189e89fb51a5400611 (patch) | |
| tree | 23d7ead2d11ebc95c1d0a5e57cdb2ee5b358110b /mesalib/src/mesa/main/texformat.c | |
| parent | ffbc36adb7ea5781a93731212226c47f1d49da5e (diff) | |
| parent | eb4c088eb71f93b9639f4ff651523d794f1433f7 (diff) | |
| download | vcxsrv-40bdd8b27f5c730b8d0c9a189e89fb51a5400611.tar.gz vcxsrv-40bdd8b27f5c730b8d0c9a189e89fb51a5400611.tar.bz2 vcxsrv-40bdd8b27f5c730b8d0c9a189e89fb51a5400611.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/texformat.c')
| -rw-r--r-- | mesalib/src/mesa/main/texformat.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c index 259eb9044..5fdc2ab1f 100644 --- a/mesalib/src/mesa/main/texformat.c +++ b/mesalib/src/mesa/main/texformat.c @@ -706,6 +706,12 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, RETURN_IF_SUPPORTED(MESA_FORMAT_INTENSITY_INT32); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32); break; + } + } + + if (ctx->VersionMajor >= 3 || + ctx->Extensions.EXT_texture_integer) { + switch (internalFormat) { case GL_RGB8UI_EXT: RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_UINT8); RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8); @@ -822,7 +828,9 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat, } } - if (ctx->Extensions.ARB_texture_rg && ctx->Extensions.EXT_texture_integer) { + if (ctx->VersionMajor >= 3 || + (ctx->Extensions.ARB_texture_rg && + ctx->Extensions.EXT_texture_integer)) { switch (internalFormat) { case GL_R8UI: RETURN_IF_SUPPORTED(MESA_FORMAT_R_UINT8); |