diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2013-06-27 18:20:18 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-06-28 13:35:21 -0700 |
| commit | 89cf6e627368f3b712b8bca70c23cbe86a3856b2 (patch) | |
| tree | 4d613809b102456e8edade9912b91aae60902654 /src/mesa/drivers/x11 | |
| parent | 0b9398c74f0189b7d7904749e24934e08a0a4cfb (diff) | |
| download | external_mesa3d-89cf6e627368f3b712b8bca70c23cbe86a3856b2.zip external_mesa3d-89cf6e627368f3b712b8bca70c23cbe86a3856b2.tar.gz external_mesa3d-89cf6e627368f3b712b8bca70c23cbe86a3856b2.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa/drivers/x11')
| -rw-r--r-- | src/mesa/drivers/x11/xm_api.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index b7c94aa..ac290a5 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 |