diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-22 07:41:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-22 07:41:15 +0200 |
| commit | de2ff253dcff3d6034758a9e89dd2158a655e60e (patch) | |
| tree | f2a98c6e3228aa0418e39cb7c41d6b98395e1063 | |
| parent | c732a28a020f7c0a0cc90889fedeb7fd53e2b31e (diff) | |
| parent | e91ed68959d63f79e3b4973bc80c7ebcd07ed021 (diff) | |
| download | vcxsrv-de2ff253dcff3d6034758a9e89dd2158a655e60e.tar.gz vcxsrv-de2ff253dcff3d6034758a9e89dd2158a655e60e.tar.bz2 vcxsrv-de2ff253dcff3d6034758a9e89dd2158a655e60e.zip | |
Merge remote-tracking branch 'origin/released'
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 32 | ||||
| -rw-r--r-- | xorg-server/configure.ac | 6 |
2 files changed, 5 insertions, 33 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index fd02a1be2..27294ba80 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -541,32 +541,6 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) /** - * Is the given texture format a generic compressed format? - */ -static GLboolean -is_generic_compressed_format(GLenum format) -{ - switch (format) { - case GL_COMPRESSED_RED: - case GL_COMPRESSED_RG: - case GL_COMPRESSED_RGB: - case GL_COMPRESSED_RGBA: - case GL_COMPRESSED_ALPHA: - case GL_COMPRESSED_LUMINANCE: - case GL_COMPRESSED_LUMINANCE_ALPHA: - case GL_COMPRESSED_INTENSITY: - case GL_COMPRESSED_SRGB: - case GL_COMPRESSED_SRGB_ALPHA: - case GL_COMPRESSED_SLUMINANCE: - case GL_COMPRESSED_SLUMINANCE_ALPHA: - return GL_TRUE; - default: - return GL_FALSE; - } -} - - -/** * For cube map faces, return a face index in [0,5]. * For other targets return 0; */ @@ -1745,8 +1719,7 @@ texture_error_check( struct gl_context *ctx, } /* additional checks for compressed textures */ - if (_mesa_is_compressed_format(ctx, internalFormat) || - is_generic_compressed_format(internalFormat)) { + if (_mesa_is_compressed_format(ctx, internalFormat)) { if (!target_can_be_compressed(ctx, target, internalFormat)) { if (!isProxy) _mesa_error(ctx, GL_INVALID_ENUM, @@ -2077,8 +2050,7 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions, return GL_TRUE; } - if (_mesa_is_compressed_format(ctx, internalFormat) || - is_generic_compressed_format(internalFormat)) { + if (_mesa_is_compressed_format(ctx, internalFormat)) { if (!target_can_be_compressed(ctx, target, internalFormat)) { _mesa_error(ctx, GL_INVALID_ENUM, "glCopyTexImage%dD(target)", dimensions); diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index e126355c6..abfe72766 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -26,9 +26,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.12.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2012-08-07" -RELEASE_NAME="Sweating Aardvark" +AC_INIT([xorg-server], 1.12.99.905, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2012-08-21" +RELEASE_NAME="Splashing Orca" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE |