rename dri_sw to drisw_util for consistency

4 files changed, 4 insertions, 4 deletions

diff --git a/src/mesa/drivers/dri/common/dri_sw.c b/src/mesa/drivers/dri/common/drisw_util.c
index b7f9036f47..141ca302d0 100644
--- a/src/mesa/drivers/dri/common/dri_sw.c
+++ b/src/mesa/drivers/dri/common/drisw_util.c
@@ -22,12 +22,12 @@
  */
 
 /**
- * \file dri_sw.c
+ * \file drisw_util.c
  *
  * DRISW utility functions, i.e. dri_util.c stripped from drm-specific bits.
  */
 
-#include "dri_sw.h"
+#include "drisw_util.h"
 #include "utils.h"
 
 
diff --git a/src/mesa/drivers/dri/common/dri_sw.h b/src/mesa/drivers/dri/common/drisw_util.h
index e353e26b34..e353e26b34 100644
--- a/src/mesa/drivers/dri/common/dri_sw.h
+++ b/src/mesa/drivers/dri/common/drisw_util.h
diff --git a/src/mesa/drivers/dri/swrast/Makefile b/src/mesa/drivers/dri/swrast/Makefile
index aeefece440..d2cf6dbc55 100644
--- a/src/mesa/drivers/dri/swrast/Makefile
+++ b/src/mesa/drivers/dri/swrast/Makefile
@@ -20,7 +20,7 @@ ASM_SOURCES =
 SWRAST_COMMON_SOURCES = \
 	../../common/driverfuncs.c \
 	../common/utils.c \
-	../common/dri_sw.c
+	../common/drisw_util.c
 
 include ../Makefile.template
 
diff --git a/src/mesa/drivers/dri/swrast/swrast_priv.h b/src/mesa/drivers/dri/swrast/swrast_priv.h
index 77670d89a5..007642be95 100644
--- a/src/mesa/drivers/dri/swrast/swrast_priv.h
+++ b/src/mesa/drivers/dri/swrast/swrast_priv.h
@@ -30,7 +30,7 @@
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
 #include "main/mtypes.h"
-#include "dri_sw.h"
+#include "drisw_util.h"
 
 
 /**