I'm in favor for this FWIW.
Jose
----- Original Message -----
> I prefer it this way and it has been suggested earlier by others too.
> Opinions?
> ---
> 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;
> }
>
> --
> 1.7.4.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
