diff options
Diffstat (limited to 'src')
31 files changed, 29 insertions, 28 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 5df3a20a2a4..7f2ce6a6e08 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/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) diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 720ee5be4e1..b5912b76a34 100644 --- a/src/mesa/Makefile.sources +++ b/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 \ diff --git a/src/mesa/drivers/dri/i915/i830_texblend.c b/src/mesa/drivers/dri/i915/i830_texblend.c index feea38379da..d5cbb376752 100644 --- a/src/mesa/drivers/dri/i915/i830_texblend.c +++ b/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" diff --git a/src/mesa/drivers/dri/i915/intel_syncobj.c b/src/mesa/drivers/dri/i915/intel_syncobj.c index 9657d9af959..d918cd7d02e 100644 --- a/src/mesa/drivers/dri/i915/intel_syncobj.c +++ b/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" diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c b/src/mesa/drivers/dri/r200/r200_cmdbuf.c index 1e6c0d82484..13ac5af300d 100644 --- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c +++ b/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" diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 931f4376992..fb15082114f 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/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" diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h index 9133a22c04e..1f8125a92c7 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.h +++ b/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" diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c index 07c64f83800..cb07bcf1f8c 100644 --- a/src/mesa/drivers/dri/r200/r200_swtcl.c +++ b/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" diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c index a0e2623a9b5..17ae7b9c25b 100644 --- a/src/mesa/drivers/dri/r200/r200_tex.c +++ b/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" diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c index 06b606e8ac8..f28f380e7c7 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.c +++ b/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" diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index b376c0c1fef..d4d19354b6d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/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" diff --git a/src/mesa/drivers/dri/radeon/radeon_dma.c b/src/mesa/drivers/dri/radeon/radeon_dma.c index 3497d481d4b..a2be3d684e0 100644 --- a/src/mesa/drivers/dri/radeon/radeon_dma.c +++ b/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 ) \ diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.c b/src/mesa/drivers/dri/radeon/radeon_ioctl.c index fdb1a57701d..3b853e3c83d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_ioctl.c +++ b/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" diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.h b/src/mesa/drivers/dri/radeon/radeon_ioctl.h index 1659682f02c..849beb9867d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_ioctl.h +++ b/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" diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c index 57cd725cd84..363f9e00b57 100644 --- a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c +++ b/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" diff --git a/src/mesa/drivers/dri/radeon/radeon_queryobj.c b/src/mesa/drivers/dri/radeon/radeon_queryobj.c index 7efe52f0ef0..fe4aa4abc72 100644 --- a/src/mesa/drivers/dri/radeon/radeon_queryobj.c +++ b/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> diff --git a/src/mesa/drivers/dri/radeon/radeon_queryobj.h b/src/mesa/drivers/dri/radeon/radeon_queryobj.h index 0ad177a2c43..a2e7724da14 100644 --- a/src/mesa/drivers/dri/radeon/radeon_queryobj.h +++ b/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); diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index 0f4d84f7025..f2e8fa7a53f 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/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" diff --git a/src/mesa/drivers/dri/radeon/radeon_swtcl.c b/src/mesa/drivers/dri/radeon/radeon_swtcl.c index abed7daab0d..5a6cede4b1a 100644 --- a/src/mesa/drivers/dri/radeon/radeon_swtcl.c +++ b/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" diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c index 2c9c1bcb138..6e8ab563d1c 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tex.c +++ b/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" diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 38906ca5781..63d30a2c880 100644 --- a/src/mesa/main/context.c +++ b/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" diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index 417548a3cb8..11365ecc404 100644 --- a/src/mesa/main/enable.c +++ b/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" diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index d8ef8f258a7..b61941379f1 100644 --- a/src/mesa/main/light.c +++ b/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" diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 4c83379e327..145927a4f44 100644 --- a/src/mesa/main/mtypes.h +++ b/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 */ diff --git a/src/mesa/program/prog_hash_table.c b/src/mesa/program/prog_hash_table.c index 2445d843446..5592b6fb814 100644 --- a/src/mesa/program/prog_hash_table.c +++ b/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 { diff --git a/src/mesa/tnl/t_rasterpos.c b/src/mesa/tnl/t_rasterpos.c index e538c348fd8..2f52bb3069f 100644 --- a/src/mesa/tnl/t_rasterpos.c +++ b/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" diff --git a/src/mesa/tnl/t_vb_light.c b/src/mesa/tnl/t_vb_light.c index ee80f1b8267..f6884a464ea 100644 --- a/src/mesa/tnl/t_vb_light.c +++ b/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" diff --git a/src/mesa/tnl/t_vertex_generic.c b/src/mesa/tnl/t_vertex_generic.c index 8926c178ddb..079d473fc7c 100644 --- a/src/mesa/tnl/t_vertex_generic.c +++ b/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" diff --git a/src/mesa/tnl/t_vertex_sse.c b/src/mesa/tnl/t_vertex_sse.c index 4b52f7dbb17..93128fbe6b8 100644 --- a/src/mesa/tnl/t_vertex_sse.c +++ b/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" diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index 5ec3fe15253..1e29a032e22 100644 --- a/src/util/Makefile.sources +++ b/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 \ diff --git a/src/mesa/main/simple_list.h b/src/util/simple_list.h index 903432dce5c..903432dce5c 100644 --- a/src/mesa/main/simple_list.h +++ b/src/util/simple_list.h |