softpipe: rename sp_quad.[ch] -> sp_quad_pipe.[ch]

Be more consistant with 'draw' module.

diff --git a/src/gallium/drivers/softpipe/Makefile b/src/gallium/drivers/softpipe/Makefile
index 120bdfd..f186f6d 100644 (file)
--- a/src/gallium/drivers/softpipe/Makefile
+++ b/src/gallium/drivers/softpipe/Makefile
@@ -14,7 +14,7 @@ C_SOURCES = \
        sp_draw_arrays.c \
        sp_prim_setup.c \
        sp_prim_vbuf.c \
-       sp_quad.c \
+       sp_quad_pipe.c \
        sp_quad_alpha_test.c \
        sp_quad_blend.c \
        sp_quad_colormask.c \

diff --git a/src/gallium/drivers/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
index c1f7daa..f872063 100644 (file)
--- a/src/gallium/drivers/softpipe/SConscript
+++ b/src/gallium/drivers/softpipe/SConscript
@@ -17,7 +17,7 @@ softpipe = env.ConvenienceLibrary(
                'sp_setup.c',
                'sp_quad_alpha_test.c',
                'sp_quad_blend.c',
-               'sp_quad.c',
+               'sp_quad_pipe.c',
                'sp_quad_colormask.c',
                'sp_quad_coverage.c',
                'sp_quad_depth_test.c',

diff --git a/src/gallium/drivers/softpipe/sp_context.h b/src/gallium/drivers/softpipe/sp_context.h
index e2451c6..4437cd4 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_context.h
+++ b/src/gallium/drivers/softpipe/sp_context.h
@@ -36,7 +36,7 @@
 
 #include "draw/draw_vertex.h"
 
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 #include "sp_tex_sample.h"
 
 

diff --git a/src/gallium/drivers/softpipe/sp_quad_alpha_test.c b/src/gallium/drivers/softpipe/sp_quad_alpha_test.c
index 85c9f03..41560be 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_alpha_test.c
+++ b/src/gallium/drivers/softpipe/sp_quad_alpha_test.c
@@ -5,7 +5,7 @@
 
 #include "sp_context.h"
 #include "sp_headers.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
 

diff --git a/src/gallium/drivers/softpipe/sp_quad_blend.c b/src/gallium/drivers/softpipe/sp_quad_blend.c
index fb1d430..9186895 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_blend.c
+++ b/src/gallium/drivers/softpipe/sp_quad_blend.c
@@ -37,7 +37,7 @@
 #include "sp_headers.h"
 #include "sp_surface.h"
 #include "sp_tile_cache.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 
 
 #define VEC4_COPY(DST, SRC) \

diff --git a/src/gallium/drivers/softpipe/sp_quad_bufloop.c b/src/gallium/drivers/softpipe/sp_quad_bufloop.c
index d7d6a69..47ae7c9 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_bufloop.c
+++ b/src/gallium/drivers/softpipe/sp_quad_bufloop.c
@@ -3,7 +3,7 @@
 #include "sp_context.h"
 #include "sp_headers.h"
 #include "sp_surface.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 
 
 /**

diff --git a/src/gallium/drivers/softpipe/sp_quad_colormask.c b/src/gallium/drivers/softpipe/sp_quad_colormask.c
index 563c2fc..ff922d7 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_colormask.c
+++ b/src/gallium/drivers/softpipe/sp_quad_colormask.c
@@ -36,7 +36,7 @@
 #include "sp_context.h"
 #include "sp_headers.h"
 #include "sp_surface.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 #include "sp_tile_cache.h"
 
 

diff --git a/src/gallium/drivers/softpipe/sp_quad_coverage.c b/src/gallium/drivers/softpipe/sp_quad_coverage.c
index c27fd14..44e2268 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_coverage.c
+++ b/src/gallium/drivers/softpipe/sp_quad_coverage.c
@@ -36,7 +36,7 @@
 #include "util/u_memory.h"
 #include "sp_context.h"
 #include "sp_headers.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 
 
 /**

diff --git a/src/gallium/drivers/softpipe/sp_quad_depth_test.c b/src/gallium/drivers/softpipe/sp_quad_depth_test.c
index 523bd3e..df44499 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_depth_test.c
+++ b/src/gallium/drivers/softpipe/sp_quad_depth_test.c
@@ -34,7 +34,7 @@
 #include "sp_context.h"
 #include "sp_headers.h"
 #include "sp_surface.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 #include "sp_tile_cache.h"
 
 

diff --git a/src/gallium/drivers/softpipe/sp_quad_earlyz.c b/src/gallium/drivers/softpipe/sp_quad_earlyz.c
index 6e2dde3..f15d989 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_earlyz.c
+++ b/src/gallium/drivers/softpipe/sp_quad_earlyz.c
@@ -32,7 +32,7 @@
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
 #include "sp_headers.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 
 
 /**

diff --git a/src/gallium/drivers/softpipe/sp_quad_fs.c b/src/gallium/drivers/softpipe/sp_quad_fs.c
index 5dacbbe..7298e9a 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_fs.c
+++ b/src/gallium/drivers/softpipe/sp_quad_fs.c
@@ -44,7 +44,7 @@
 #include "sp_context.h"
 #include "sp_state.h"
 #include "sp_headers.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 #include "sp_texture.h"
 #include "sp_tex_sample.h"
 

diff --git a/src/gallium/drivers/softpipe/sp_quad_occlusion.c b/src/gallium/drivers/softpipe/sp_quad_occlusion.c
index 169bd82..be3df91 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_occlusion.c
+++ b/src/gallium/drivers/softpipe/sp_quad_occlusion.c
@@ -37,7 +37,7 @@
 #include "sp_context.h"
 #include "sp_headers.h"
 #include "sp_surface.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 
 static unsigned count_bits( unsigned val )
 {

diff --git a/src/gallium/drivers/softpipe/sp_quad_output.c b/src/gallium/drivers/softpipe/sp_quad_output.c
index a37c8b4..d6c406e 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_output.c
+++ b/src/gallium/drivers/softpipe/sp_quad_output.c
@@ -29,7 +29,7 @@
 #include "sp_context.h"
 #include "sp_headers.h"
 #include "sp_surface.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 #include "sp_tile_cache.h"
 
 

diff --git a/src/gallium/drivers/softpipe/sp_quad.c b/src/gallium/drivers/softpipe/sp_quad_pipe.c
similarity index 100%
rename from src/gallium/drivers/softpipe/sp_quad.c
rename to src/gallium/drivers/softpipe/sp_quad_pipe.c

diff --git a/src/gallium/drivers/softpipe/sp_quad.h b/src/gallium/drivers/softpipe/sp_quad_pipe.h
similarity index 100%
rename from src/gallium/drivers/softpipe/sp_quad.h
rename to src/gallium/drivers/softpipe/sp_quad_pipe.h

diff --git a/src/gallium/drivers/softpipe/sp_quad_stencil.c b/src/gallium/drivers/softpipe/sp_quad_stencil.c
index 7495515..914b934 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_stencil.c
+++ b/src/gallium/drivers/softpipe/sp_quad_stencil.c
@@ -8,7 +8,7 @@
 #include "sp_headers.h"
 #include "sp_surface.h"
 #include "sp_tile_cache.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
 

diff --git a/src/gallium/drivers/softpipe/sp_quad_stipple.c b/src/gallium/drivers/softpipe/sp_quad_stipple.c
index ccf37f6..90b0905 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_quad_stipple.c
+++ b/src/gallium/drivers/softpipe/sp_quad_stipple.c
@@ -5,7 +5,7 @@
 
 #include "sp_context.h"
 #include "sp_headers.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
 

diff --git a/src/gallium/drivers/softpipe/sp_setup.c b/src/gallium/drivers/softpipe/sp_setup.c
index b1adb9c..752e9d3 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_setup.c
+++ b/src/gallium/drivers/softpipe/sp_setup.c
@@ -36,7 +36,7 @@
 
 #include "sp_context.h"
 #include "sp_headers.h"
-#include "sp_quad.h"
+#include "sp_quad_pipe.h"
 #include "sp_state.h"
 #include "sp_prim_setup.h"
 #include "draw/draw_context.h"