mesa: Move simple_list.h to src/util.

We have two copies of it in the tree, I'm going to delete one.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

src/gallium/targets/dri/Makefile.am

@@ -3,6 +3,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
 AM_CFLAGS = \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa \
+	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/mesa/drivers/dri/common \
 	-I$(top_srcdir)/src/gallium/state_trackers/dri \
 	$(GALLIUM_TARGET_CFLAGS)

src/mesa/Makefile.sources

@@ -176,7 +176,6 @@ MAIN_FILES = \
 	main/shader_query.cpp \
 	main/shared.c \
 	main/shared.h \
-	main/simple_list.h \
 	main/state.c \
 	main/state.h \
 	main/stencil.c \

src/mesa/drivers/dri/i915/i830_texblend.c

@@ -28,7 +28,7 @@
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/enums.h"
 #include "main/mm.h"
 

src/mesa/drivers/dri/i915/intel_syncobj.c

@@ -38,7 +38,7 @@
  * performance bottleneck, though.
  */
 
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/imports.h"
 
 #include "intel_context.h"

src/mesa/drivers/dri/r200/r200_cmdbuf.c

@@ -35,7 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/imports.h"
 #include "main/macros.h"
 #include "main/context.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 
 #include "radeon_common.h"
 #include "r200_context.h"

src/mesa/drivers/dri/r200/r200_context.c

@@ -37,7 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/api_arrayelt.h"
 #include "main/api_exec.h"
 #include "main/context.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/imports.h"
 #include "main/extensions.h"
 #include "main/version.h"

src/mesa/drivers/dri/r200/r200_ioctl.h

@@ -35,7 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __R200_IOCTL_H__
 #define __R200_IOCTL_H__
 
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 
 #include "radeon_bo_gem.h"
 #include "radeon_cs_gem.h"

src/mesa/drivers/dri/r200/r200_swtcl.c

@@ -39,7 +39,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/image.h"
 #include "main/imports.h"
 #include "main/macros.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 
 #include "swrast/s_context.h"
 #include "swrast/s_fog.h"

src/mesa/drivers/dri/r200/r200_tex.c

@@ -37,7 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/image.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/teximage.h"
 #include "main/texobj.h"
 #include "main/samplerobj.h"

src/mesa/drivers/dri/radeon/radeon_common_context.c

@@ -41,7 +41,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/fbobject.h"
 #include "main/renderbuffer.h"
 #include "main/state.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
 #include "tnl/tnl.h"

src/mesa/drivers/dri/radeon/radeon_context.c

@@ -39,7 +39,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/api_arrayelt.h"
 #include "main/api_exec.h"
 #include "main/context.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/imports.h"
 #include "main/extensions.h"
 #include "main/version.h"

src/mesa/drivers/dri/radeon/radeon_dma.c

@@ -33,7 +33,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <errno.h>
 #include "radeon_common.h"
 #include "radeon_fog.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 
 #if defined(USE_X86_ASM)
 #define COPY_DWORDS( dst, src, nr )					\

src/mesa/drivers/dri/radeon/radeon_ioctl.c

@@ -43,7 +43,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "main/glheader.h"
 #include "main/imports.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 
 #include "radeon_context.h"
 #include "radeon_common.h"

src/mesa/drivers/dri/radeon/radeon_ioctl.h

@@ -36,7 +36,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_IOCTL_H__
 #define __RADEON_IOCTL_H__
 
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "radeon_bo_gem.h"
 #include "radeon_cs_gem.h"
 

src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c

@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/teximage.h"
 #include "main/texobj.h"
 #include "main/enums.h"

src/mesa/drivers/dri/radeon/radeon_queryobj.c

@@ -29,7 +29,7 @@
 #include "radeon_debug.h"
 
 #include "main/imports.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 
 #include <inttypes.h>
 

src/mesa/drivers/dri/radeon/radeon_queryobj.h

@@ -26,7 +26,7 @@
  */
 
 #include "main/imports.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "radeon_common_context.h"
 
 extern void radeonEmitQueryBegin(struct gl_context *ctx);

src/mesa/drivers/dri/radeon/radeon_state.c

@@ -40,7 +40,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/context.h"
 #include "main/framebuffer.h"
 #include "main/fbobject.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/state.h"
 #include "main/core.h"
 #include "main/stencil.h"

src/mesa/drivers/dri/radeon/radeon_swtcl.c

@@ -38,7 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/enums.h"
 #include "main/imports.h"
 #include "main/macros.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 
 #include "math/m_xform.h"
 

src/mesa/drivers/dri/radeon/radeon_tex.c

@@ -37,7 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/image.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/teximage.h"
 #include "main/texobj.h"
 

src/mesa/main/context.c

@@ -118,7 +118,7 @@
 #include "scissor.h"
 #include "shared.h"
 #include "shaderobj.h"
-#include "simple_list.h"
+#include "util/simple_list.h"
 #include "state.h"
 #include "stencil.h"
 #include "texcompress_s3tc.h"

src/mesa/main/enable.c

@@ -34,7 +34,7 @@
 #include "enable.h"
 #include "errors.h"
 #include "light.h"
-#include "simple_list.h"
+#include "util/simple_list.h"
 #include "mtypes.h"
 #include "enums.h"
 #include "api_arrayelt.h"

src/mesa/main/light.c

@@ -30,7 +30,7 @@
 #include "enums.h"
 #include "light.h"
 #include "macros.h"
-#include "simple_list.h"
+#include "util/simple_list.h"
 #include "mtypes.h"
 #include "math/m_matrix.h"
 

src/mesa/main/mtypes.h

@@ -41,7 +41,7 @@
 #include "main/config.h"
 #include "glapi/glapi.h"
 #include "math/m_matrix.h"	/* GLmatrix */
-#include "main/simple_list.h"	/* struct simple_node */
+#include "util/simple_list.h"	/* struct simple_node */
 #include "main/formats.h"       /* MESA_FORMAT_COUNT */
 
 

src/mesa/program/prog_hash_table.c

@@ -29,7 +29,7 @@
  */
 
 #include "main/imports.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "hash_table.h"
 
 struct node {

src/mesa/tnl/t_rasterpos.c

@@ -28,7 +28,7 @@
 #include "main/feedback.h"
 #include "main/light.h"
 #include "main/macros.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/mtypes.h"
 
 #include "math/m_matrix.h"

src/mesa/tnl/t_vb_light.c

@@ -29,7 +29,7 @@
 #include "main/light.h"
 #include "main/macros.h"
 #include "main/imports.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/mtypes.h"
 
 #include "math/m_translate.h"

src/mesa/tnl/t_vertex_generic.c

@@ -29,7 +29,7 @@
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/colormac.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "swrast/s_chan.h"
 #include "t_context.h"
 #include "t_vertex.h"

src/mesa/tnl/t_vertex_sse.c

@@ -28,7 +28,7 @@
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/colormac.h"
-#include "main/simple_list.h"
+#include "util/simple_list.h"
 #include "main/enums.h"
 #include "swrast/s_chan.h"
 #include "t_context.h"

src/util/Makefile.sources

@@ -15,6 +15,7 @@ MESA_UTIL_FILES :=	\
 	rgtc.h \
 	set.c \
 	set.h \
+	simple_list.h \
 	strtod.cpp \
 	strtod.h \
 	texcompress_rgtc_tmp.h \