Mesa (master): intel: Enable S3TC extensions always

[Ian Romanick]

Module: Mesa
Branch: master
Commit: 5bd86b26df30d32412ca1b7ac02892ab5e10c6ef
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5bd86b26df30d32412ca1b7ac02892ab5e10c6ef

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Aug 21 15:33:04 2012 -0700

intel: Enable S3TC extensions always

Always enable the use of pre-compressed texture data.  The ability to
perform on-line compression still requires the presence of libtxc_dxtn
or an explicit driconf over-ride.  Applications that just want to submit
precompessed data when an on-line compressor is not available can look
for the GL_EXT_texture_compression_dxt1 and
GL_ANGLE_texture_compression_dxt[35] extensions.

v2: Only enable the extensions that do not require on-line compression
by default.  The previous statement "This should not impact many (if
any) real applications." proved to be false for at least Sauerbraten.
This application mostly submits pre-compressed data, but it also can
submit uncompressed data that it asks the driver to compress.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com> [v1]
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org> [v1]
Acked-by: Eric Anholt <eric at anholt.net> [v1]
Acked-by: Lee Salzman <lsalzman at gmail.com>

---

 src/mesa/drivers/dri/intel/intel_extensions.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 78b928d..d760f30 100755
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -177,13 +177,11 @@ intelInitExtensions(struct gl_context *ctx)
 	 ctx->Extensions.ARB_occlusion_query = true;
    }
 
-   if (intel->ctx.Mesa_DXTn) {
-      ctx->Extensions.ANGLE_texture_compression_dxt = true;
+   if (intel->ctx.Mesa_DXTn
+       || driQueryOptionb(&intel->optionCache, "force_s3tc_enable"))
       ctx->Extensions.EXT_texture_compression_s3tc = true;
-   }
-   else if (driQueryOptionb(&intel->optionCache, "force_s3tc_enable")) {
-      ctx->Extensions.EXT_texture_compression_s3tc = true;
-   }
+
+   ctx->Extensions.ANGLE_texture_compression_dxt = true;
 
    if (intel->gen >= 4) {
       ctx->Extensions.NV_primitive_restart = true;