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 <mattst88@gmail.com>

diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index 2195e01e35d6a476852db6f74d0d15821c0f89bf..eb3d54b08f3aa333a333e183b8076c61f8807275 100644 (file)
--- 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 afaea009db8e17bdc81df57d7a793e2ce43fbe00..59011341018b3a3018fe0dbf7d8f7c9f56bfb8f0 100644 (file)
--- 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 44413a6e8c7bc3605aa5dbe52be2948ba133197d..f4fd4929f733fc4ee7bedfa74713cdc18cec143e 100644 (file)
--- 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 533d6e5d15885bec968df11c6775b35cb9b7785f..01a958af5a275e3c5fa8cbc3235abec81c783954 100644 (file)
--- 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 55c3b59fa0cdbca465facd156780058126d29301..e1165d702142a669629aaac3d4c9ef959e5d15b2 100644 (file)
--- 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 0c0a9dd5e6cd200f1bb2fcb01d7c50e36ba8e59c..e696ce497e0bca96db31f808e4bd48d10d10a870 100644 (file)
--- 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 eb2cb8922d0f25e6f523f81c995953ac8b36eb8f..181c05ca50e87e9a355c9d1b651a3080071d4bf9 100644 (file)
--- 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 1d145a03bd6c8e3a33d739fe1fd36120177ba819..47a2bf0e5855d5f4afad0091e556576ab89e66c0 100644 (file)
--- 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 c12ef97b8fd3a7193d99ef7b4e6c3ca79bccb896..fd1782e1bcb40ec879aea9a417eb4e0c942265aa 100644 (file)
--- 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 2d36936de79d67e184acd247e1134038a4b5cb52..dc28c68d41ba45cac8b07a7cb837f9324f949590 100644 (file)
--- 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 7199169d3c0c1bdd9d8618402c4a485ebe09fce0..9d91b83c1c2b0e28c4a208da82fb11f5ba572907 100644 (file)
--- 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 2734210a57a49d72598dad35ba03ae6140c9af5b..438b71fe33230c7a6b6c8d72147a7f48cd9eaac2 100644 (file)
--- 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 aad5d2ecf768da8a4ef5518e5f43ff6ad1a8cb1a..84adfc06182bbe8ee1d0bdb1b24397fe683c2282 100644 (file)
--- 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 34ade8905550817c520fdae1b7d6cb0bebd07b8d..efccd901aa6ca2131ee5df9af23cf8ea8f321724 100644 (file)
--- 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 bdfa4c77010ccf83154aae13bb220ae7b585912e..62f676ca6d7bdf09b4d9708cdc2867beef56a45f 100644 (file)
--- 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 f8584c96810e365b410feed0919e82a3973e70c6..ea3024d512ae6d0a979950e4a6b93b7fa5ee1c6f 100644 (file)
--- 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"