[Mesa-dev] [PATCH 1/4] mesa: Remove pointless USE_EXTERNAL_DXTN_LIB macro.

[Roland Scheidegger]

Am 02.04.2015 um 16:32 schrieb Jose Fonseca:
> I'm not sure what was the original intention, but currently
> USE_EXTERNAL_DXTN_LIB always ends up defined, one way or another.
> ---
>  configure.ac                     | 2 +-
>  src/mesa/main/texcompress_s3tc.c | 8 --------
>  2 files changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 4ed4b74..520cc22 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -230,7 +230,7 @@ _SAVE_LDFLAGS="$LDFLAGS"
>  _SAVE_CPPFLAGS="$CPPFLAGS"
>  
>  dnl Compiler macros
> -DEFINES="-DUSE_EXTERNAL_DXTN_LIB=1"
> +DEFINES=""
>  AC_SUBST([DEFINES])
>  case "$host_os" in
>  linux*|*-gnu*|gnu*)
> diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
> index 38ce5f8..7ce3cb8 100644
> --- a/src/mesa/main/texcompress_s3tc.c
> +++ b/src/mesa/main/texcompress_s3tc.c
> @@ -29,10 +29,6 @@
>   * GL_EXT_texture_compression_s3tc support.
>   */
>  
> -#ifndef USE_EXTERNAL_DXTN_LIB
> -#define USE_EXTERNAL_DXTN_LIB 1
> -#endif
> -
>  #include "glheader.h"
>  #include "imports.h"
>  #include "dlopen.h"
> @@ -76,7 +72,6 @@ _mesa_init_texture_s3tc( struct gl_context *ctx )
>  {
>     /* called during context initialization */
>     ctx->Mesa_DXTn = GL_FALSE;
> -#if USE_EXTERNAL_DXTN_LIB
>     if (!dxtlibhandle) {
>        dxtlibhandle = _mesa_dlopen(DXTN_LIBNAME, 0);
>        if (!dxtlibhandle) {
> @@ -117,9 +112,6 @@ _mesa_init_texture_s3tc( struct gl_context *ctx )
>     if (dxtlibhandle) {
>        ctx->Mesa_DXTn = GL_TRUE;
>     }
> -#else
> -   (void) ctx;
> -#endif
>  }
>  
>  /**
> 

I believe the idea was to be able to easily disable this (might even
have defaulted to 0 at some point). I agree though it serves no purpose
nowadays.
For the series:
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
(though for 4/4 someone more familiar with build systems should give a look)

Roland