diff options
| author | Matt Turner <mattst88@gmail.com> | 2017-09-27 21:17:45 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2017-10-02 19:41:22 -0700 |
| commit | c5d508028454f42923aee1ea1ab876f01f680ae7 (patch) | |
| tree | 507cb39551ab616e4146e7fb67e2772c712a0894 /src/mesa/main/teximage.c | |
| parent | 78c6221f18ab451f2e57bc61852595a60f82e3cb (diff) | |
mesa: Drop Mesa_DXTn from gl_context
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/mesa/main/teximage.c')
| -rw-r--r-- | src/mesa/main/teximage.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index d0642051909..0a3025a2e6b 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -2769,38 +2769,6 @@ _mesa_choose_texture_format(struct gl_context *ctx, } } - /* If the application requested compression to an S3TC format but we don't - * have the DXTn library, force a generic compressed format instead. - */ - if (internalFormat != format && format != GL_NONE) { - const GLenum before = internalFormat; - - switch (internalFormat) { - case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: - if (!ctx->Mesa_DXTn) - internalFormat = GL_COMPRESSED_RGB; - break; - case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT: - case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT: - case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: - if (!ctx->Mesa_DXTn) - internalFormat = GL_COMPRESSED_RGBA; - break; - default: - break; - } - - if (before != internalFormat) { - _mesa_warning(ctx, - "DXT compression requested (%s), " - "but libtxc_dxtn library not installed. Using %s " - "instead.", - _mesa_enum_to_string(before), - _mesa_enum_to_string(internalFormat)); - } - } - - /* choose format from scratch */ f = ctx->Driver.ChooseTextureFormat(ctx, target, internalFormat, format, type); assert(f != MESA_FORMAT_NONE); |