diff options
| author | Brian Paul <[email protected]> | 2012-08-24 08:37:40 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-08-24 13:15:27 -0600 |
| commit | ba7218061b6a6c09d5d20f12de6267673276e094 (patch) | |
| tree | ade93ff0041c9a2f3e9708988ceea68e3abe964c /src | |
| parent | 09fafd3b856109ad4b24ac082ccf436022a1701c (diff) | |
xlib: remove texture compression hackery
I think this was left-over debug code from long ago.
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/x11/xm_api.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/xm_dd.c | 25 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/xmesaP.h | 2 |
3 files changed, 0 insertions, 29 deletions
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index fb8288922c8..249bbdf9a40 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -921,13 +921,11 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list ) _mesa_enable_1_5_extensions(mesaCtx); _mesa_enable_2_0_extensions(mesaCtx); _mesa_enable_2_1_extensions(mesaCtx); -#if ENABLE_EXT_texure_compression_s3tc if (mesaCtx->Mesa_DXTn) { _mesa_enable_extension(mesaCtx, "GL_EXT_texture_compression_s3tc"); _mesa_enable_extension(mesaCtx, "GL_S3_s3tc"); } _mesa_enable_extension(mesaCtx, "GL_3DFX_texture_compression_FXT1"); -#endif #if ENABLE_EXT_timer_query _mesa_enable_extension(mesaCtx, "GL_EXT_timer_query"); #endif diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index 12004ba71df..2662398eda0 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -737,25 +737,6 @@ xmesa_update_state( struct gl_context *ctx, GLbitfield new_state ) } - -/** - * In SW, we don't really compress GL_COMPRESSED_RGB[A] textures! - */ -static gl_format -choose_tex_format( struct gl_context *ctx, GLint internalFormat, - GLenum format, GLenum type ) -{ - switch (internalFormat) { - case GL_COMPRESSED_RGB_ARB: - return MESA_FORMAT_RGB888; - case GL_COMPRESSED_RGBA_ARB: - return MESA_FORMAT_RGBA8888; - default: - return _mesa_choose_tex_format(ctx, internalFormat, format, type); - } -} - - /** * Called by glViewport. * This is a good time for us to poll the current X window size and adjust @@ -891,12 +872,6 @@ xmesa_init_driver_functions( XMesaVisual xmvisual, driver->MapRenderbuffer = xmesa_MapRenderbuffer; driver->UnmapRenderbuffer = xmesa_UnmapRenderbuffer; -#if ENABLE_EXT_texure_compression_s3tc - driver->ChooseTextureFormat = choose_tex_format; -#else - (void) choose_tex_format; -#endif - #if ENABLE_EXT_timer_query driver->NewQueryObject = xmesa_new_query_object; driver->BeginQuery = xmesa_begin_query; diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h index 7e7b1f8a43d..fcf96aea343 100644 --- a/src/mesa/drivers/x11/xmesaP.h +++ b/src/mesa/drivers/x11/xmesaP.h @@ -415,8 +415,6 @@ extern void xmesa_register_swrast_functions( struct gl_context *ctx ); -#define ENABLE_EXT_texure_compression_s3tc 0 /* SW texture compression */ - #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L #define ENABLE_EXT_timer_query 1 /* should have 64-bit GLuint64EXT */ #else |