From: Brian Paul Date: Thu, 26 Feb 2015 20:03:05 +0000 (-0700) Subject: mesa: trim down includes of compiler.h X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=775049b6adb3f83b7c00cfc06088c443aef0b514;p=mesa.git mesa: trim down includes of compiler.h In some cases, glheader.h is the right #include. Also remove some instances of struct _glapi_table declarations. Acked-by: Matt Turner --- diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h index 2195e01e35d..eb3d54b08f3 100644 --- a/src/mesa/main/api_loopback.h +++ b/src/mesa/main/api_loopback.h @@ -27,7 +27,6 @@ #ifndef API_LOOPBACK_H #define API_LOOPBACK_H -#include "main/compiler.h" #include "main/glheader.h" // ? #include "main/macros.h" // ? #include "main/mtypes.h" // ? diff --git a/src/mesa/main/atifragshader.h b/src/mesa/main/atifragshader.h index afaea009db8..59011341018 100644 --- a/src/mesa/main/atifragshader.h +++ b/src/mesa/main/atifragshader.h @@ -8,10 +8,9 @@ #ifndef ATIFRAGSHADER_H #define ATIFRAGSHADER_H -#include "compiler.h" #include "glheader.h" -struct _glapi_table; + struct gl_context; #define MAX_NUM_INSTRUCTIONS_PER_PASS_ATI 8 diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h index 44413a6e8c7..f4fd4929f73 100644 --- a/src/mesa/main/attrib.h +++ b/src/mesa/main/attrib.h @@ -26,7 +26,6 @@ #define ATTRIB_H -#include "compiler.h" #include "glheader.h" struct _glapi_table; diff --git a/src/mesa/main/blit.h b/src/mesa/main/blit.h index 533d6e5d158..01a958af5a2 100644 --- a/src/mesa/main/blit.h +++ b/src/mesa/main/blit.h @@ -26,7 +26,6 @@ #ifndef BLIT_H #define BLIT_H -#include "compiler.h" #include "glheader.h" diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h index 55c3b59fa0c..e1165d70214 100644 --- a/src/mesa/main/colortab.h +++ b/src/mesa/main/colortab.h @@ -26,8 +26,6 @@ #ifndef COLORTAB_H #define COLORTAB_H - -#include "compiler.h" #include "glheader.h" struct _glapi_table; diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h index 0c0a9dd5e6c..e696ce497e0 100644 --- a/src/mesa/main/convolve.h +++ b/src/mesa/main/convolve.h @@ -28,7 +28,7 @@ #define CONVOLVE_H -#include "compiler.h" +#include "glheader.h" struct _glapi_table; diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h index eb2cb8922d0..181c05ca50e 100644 --- a/src/mesa/main/drawpix.h +++ b/src/mesa/main/drawpix.h @@ -26,9 +26,7 @@ #define DRAWPIX_H -#include "compiler.h" - -struct _glapi_table; +#include "glheader.h" void GLAPIENTRY diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h index 1d145a03bd6..47a2bf0e585 100644 --- a/src/mesa/main/histogram.h +++ b/src/mesa/main/histogram.h @@ -36,9 +36,8 @@ #ifndef HISTOGRAM_H #define HISTOGRAM_H -#include "compiler.h" +#include "glheader.h" -struct _glapi_table; void GLAPIENTRY _mesa_GetnMinmaxARB(GLenum target, GLboolean reset, GLenum format, diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h index c12ef97b8fd..fd1782e1bcb 100644 --- a/src/mesa/main/pixel.h +++ b/src/mesa/main/pixel.h @@ -33,10 +33,8 @@ #define PIXEL_H -#include "compiler.h" #include "glheader.h" -struct _glapi_table; struct gl_context; diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h index 2d36936de79..dc28c68d41b 100644 --- a/src/mesa/main/rastpos.h +++ b/src/mesa/main/rastpos.h @@ -32,7 +32,8 @@ #define RASTPOS_H -#include "compiler.h" +#include "glheader.h" + struct _glapi_table; struct gl_context; diff --git a/src/mesa/main/remap.h b/src/mesa/main/remap.h index 7199169d3c0..9d91b83c1c2 100644 --- a/src/mesa/main/remap.h +++ b/src/mesa/main/remap.h @@ -27,8 +27,6 @@ #define REMAP_H -#include "main/compiler.h" - struct gl_function_pool_remap { int pool_index; int remap_index; diff --git a/src/mesa/main/texcompress_s3tc.h b/src/mesa/main/texcompress_s3tc.h index 2734210a57a..438b71fe332 100644 --- a/src/mesa/main/texcompress_s3tc.h +++ b/src/mesa/main/texcompress_s3tc.h @@ -25,7 +25,6 @@ #ifndef TEXCOMPRESS_S3TC_H #define TEXCOMPRESS_S3TC_H -#include "compiler.h" #include "glheader.h" #include "texstore.h" #include "texcompress.h" diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h index aad5d2ecf76..84adfc06182 100644 --- a/src/mesa/main/texgen.h +++ b/src/mesa/main/texgen.h @@ -27,7 +27,6 @@ #define TEXGEN_H -#include "compiler.h" #include "glheader.h" struct _glapi_table; diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h index 34ade890555..efccd901aa6 100644 --- a/src/mesa/main/vtxfmt.h +++ b/src/mesa/main/vtxfmt.h @@ -33,7 +33,6 @@ #ifndef _VTXFMT_H_ #define _VTXFMT_H_ -#include "compiler.h" #include "mtypes.h" extern void _mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt ); diff --git a/src/mesa/math/m_translate.h b/src/mesa/math/m_translate.h index bdfa4c77010..62f676ca6d7 100644 --- a/src/mesa/math/m_translate.h +++ b/src/mesa/math/m_translate.h @@ -26,7 +26,6 @@ #ifndef _M_TRANSLATE_H_ #define _M_TRANSLATE_H_ -#include "main/compiler.h" #include "main/glheader.h" /** diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp index f8584c96810..ea3024d512a 100644 --- a/src/mesa/program/sampler.cpp +++ b/src/mesa/program/sampler.cpp @@ -29,7 +29,6 @@ #include "../glsl/program.h" #include "ir_uniform.h" -#include "main/compiler.h" #include "main/mtypes.h" #include "program/hash_table.h" #include "program/prog_parameter.h"