[Mesa-dev] [PATCH 1/3] Rename swrastg_dri to swrast_dri

[Ian Romanick]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 07/12/2011 06:27 AM, Marek Olšák wrote:
> I prefer it this way and it has been suggested earlier by others too.
> Opinions?

So what happens to people that don't build any of gallium but do
occasionally compare with a software driver?  Does this make both
gallium and classic build swrast_dri.so?  That seems weird.

> ---
>  src/egl/drivers/dri2/egl_dri2.c           |    5 -----
>  src/gallium/targets/dri-swrast/Makefile   |    2 +-
>  src/gallium/targets/dri-swrast/SConscript |    6 +++---
>  src/glx/drisw_glx.c                       |    3 ---
>  4 files changed, 4 insertions(+), 12 deletions(-)
> 
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index 35a598e..0aca929 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -416,11 +416,6 @@ dri2_load_driver_swrast(_EGLDisplay *disp)
>  
>     dri2_dpy->driver_name = "swrast";
>     extensions = dri2_open_driver(disp);
> -   if (!extensions) {
> -      /* try again with swrastg */
> -      dri2_dpy->driver_name = "swrastg";
> -      extensions = dri2_open_driver(disp);
> -   }
>  
>     if (!extensions)
>        return EGL_FALSE;
> diff --git a/src/gallium/targets/dri-swrast/Makefile b/src/gallium/targets/dri-swrast/Makefile
> index 948c45a..45b933e 100644
> --- a/src/gallium/targets/dri-swrast/Makefile
> +++ b/src/gallium/targets/dri-swrast/Makefile
> @@ -1,7 +1,7 @@
>  TOP = ../../../..
>  include $(TOP)/configs/current
>  
> -LIBNAME = swrastg_dri.so
> +LIBNAME = swrast_dri.so
>  
>  DRIVER_DEFINES = \
>  	-D__NOT_HAVE_DRM_H -DGALLIUM_SOFTPIPE \
> diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript
> index 33acc61..6b64c56 100644
> --- a/src/gallium/targets/dri-swrast/SConscript
> +++ b/src/gallium/targets/dri-swrast/SConscript
> @@ -29,13 +29,13 @@ if env['llvm']:
>      env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
>      env.Prepend(LIBS = [llvmpipe])
>  
> -swrastg_sources = [
> +swrast_sources = [
>      'swrast_drm_api.c'
>  ]
>  
>  module = env.LoadableModule(
> -    target ='swrastg_dri.so',
> -    source = swrastg_sources,
> +    target ='swrast_dri.so',
> +    source = swrast_sources,
>      SHLIBPREFIX = '',
>  )
>  
> diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
> index d63f6e8..d0137ee 100644
> --- a/src/glx/drisw_glx.c
> +++ b/src/glx/drisw_glx.c
> @@ -425,9 +425,6 @@ driOpenSwrast(void)
>     if (driver == NULL)
>        driver = driOpenDriver("swrast");
>  
> -   if (driver == NULL)
> -      driver = driOpenDriver("swrastg");
> -
>     return driver;
>  }
>  

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk4cfMEACgkQX1gOwKyEAw+5KwCdHanTb/bAJnYbrSZU1cNYryLH
EokAoItGM5ftUKRSKCENCo8el+B02eZ2
=b9Bt
-----END PGP SIGNATURE-----