Rename swrastg_dri to swrast_dri

I prefer it this way and it has been suggested earlier by others too.
Opinions?

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 35a598ecab855bab63f53c9972c98369933f29ac..0aca929e6aae7ef16d5e3840e684b9d097ae1d0d 100644 (file)
--- 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 948c45abe5c64c4c73c78ae863e2c40d19581ff4..45b933e3f93cb27468e084c22a4acb0e76f019e5 100644 (file)
--- 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 33acc614e76756f1b74595da28a06268e0178650..6b64c56413cf7b658de4da4da8d05b30229d316e 100644 (file)
--- 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 d63f6e8d5ff81063d598a338e2cd2017fe7dfb54..d0137ee65177938ed10525d6956f74a8b9175966 100644 (file)
--- 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;
 }