From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 28 Jun 2013 01:20:18 +0000 (-0700)
Subject: x11: Don't call _mesa_enable_._._extensions and _mesa_enable_sw_extensions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=89cf6e627368f3b712b8bca70c23cbe86a3856b2;p=mesa.git

x11: Don't call _mesa_enable_._._extensions and _mesa_enable_sw_extensions

_mesa_enable_sw_extensions enables all the extensions (and more) that
the others enable.  Also, don't duplicate the DXTn checks.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index b7c94aa4c96..ac290a546b4 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -922,16 +922,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
    }
 
    _mesa_enable_sw_extensions(mesaCtx);
-   _mesa_enable_1_3_extensions(mesaCtx);
-   _mesa_enable_1_4_extensions(mesaCtx);
-   _mesa_enable_1_5_extensions(mesaCtx);
-   _mesa_enable_2_0_extensions(mesaCtx);
-   _mesa_enable_2_1_extensions(mesaCtx);
-    if (mesaCtx->Mesa_DXTn) {
-       mesaCtx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;
-       mesaCtx->Extensions.ANGLE_texture_compression_dxt = GL_TRUE; 
-    }
-    mesaCtx->Extensions.TDFX_texture_compression_FXT1 = GL_TRUE;
+
 #if ENABLE_EXT_timer_query
     mesaCtx->Extensions.EXT_timer_query = GL_TRUE;
 #endif