From: Ian Romanick <ian.d.roman...@intel.com>
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.roman...@intel.com>
Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com> [v1]
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> [v1]
Acked-by: Eric Anholt <e...@anholt.net> [v1]
Cc: Lee Salzman <lsalz...@gmail.com>
---
src/mesa/drivers/dri/intel/intel_extensions.c | 10 ++++------
1 file 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 40170e5..f8a1b46 100755
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -175,13 +175,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;
--
1.7.11.7
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
