mesa: Remove inclusion of compiler.h from mtypes.h.

mtypes.h does not use any symbols from compiler.h.

Also add the required headers for files that depended on symbols from
compiler.h but were indirectly including compiler.h through mtypes.h.

diff --git a/src/mesa/drivers/dri/i965/brw_util.c b/src/mesa/drivers/dri/i965/brw_util.c
index 1db2a210d454b57c332c45e2dd09694e6ccf9964..e878da3850dba165d97080fe2529fb5794e2569b 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_util.c
+++ b/src/mesa/drivers/dri/i965/brw_util.c
@@ -30,6 +30,8 @@
   */
          
 
+#include <assert.h>
+
 #include "main/mtypes.h"
 #include "program/prog_parameter.h"
 #include "brw_util.h"

diff --git a/src/mesa/drivers/dri/mach64/mach64_ioctl.h b/src/mesa/drivers/dri/mach64/mach64_ioctl.h
index 1ffda1932f1422ad2ed9b5f2504f946ca94ee243..9145ee6e6cf90ce4a3024e16c6f333099d1f5f6f 100644 (file)
--- a/src/mesa/drivers/dri/mach64/mach64_ioctl.h
+++ b/src/mesa/drivers/dri/mach64/mach64_ioctl.h
@@ -32,6 +32,9 @@
 #ifndef __MACH64_IOCTL_H__
 #define __MACH64_IOCTL_H__
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "mach64_dri.h"
 #include "mach64_reg.h"
 #include "mach64_lock.h"

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 7bb554d51991d120ff82db64eeba1e5797d61064..3c2addb3a31a011e872d7736ac2af92047aa8bd2 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -36,7 +36,6 @@
 
 #include "main/glheader.h"
 #include "main/config.h"
-#include "main/compiler.h"
 #include "main/mfeatures.h"
 #include "glapi/glapi.h"
 #include "math/m_matrix.h"     /* GLmatrix */

diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 17ac68000c5092515c2602fff148ab92bd38170a..912cb6779851cc49291b9328dc9c2815f0336465 100644 (file)
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -32,6 +32,7 @@
 #define TEXSTATE_H
 
 
+#include "compiler.h"
 #include "mtypes.h"
 
 

diff --git a/src/mesa/program/prog_parameter_layout.c b/src/mesa/program/prog_parameter_layout.c
index a8885738321d64390fa938bbb87b919bb8a79c7b..d7dc97edbfb5b68ac94824b0c2889047431d3afa 100644 (file)
--- a/src/mesa/program/prog_parameter_layout.c
+++ b/src/mesa/program/prog_parameter_layout.c
@@ -28,6 +28,7 @@
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
+#include "main/compiler.h"
 #include "main/mtypes.h"
 #include "prog_parameter.h"
 #include "prog_parameter_layout.h"

diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c
index 3c07afba9aaf588a78e97d1b24428eac215c4ee8..1616e945fea869d9cb825963bbf8609149805856 100644 (file)
--- a/src/mesa/state_tracker/st_atom_depth.c
+++ b/src/mesa/state_tracker/st_atom_depth.c
@@ -33,6 +33,8 @@
   */
  
 
+#include <assert.h>
+
 #include "st_context.h"
 #include "st_atom.h"
 #include "pipe/p_context.h"

diff --git a/src/mesa/state_tracker/st_atom_stipple.c b/src/mesa/state_tracker/st_atom_stipple.c
index 31e124b32935a4d20bd6f02fd7b27e4afe6eb9e6..ecdd9f06f6a347cba4a946403647a35c73d8c1fe 100644 (file)
--- a/src/mesa/state_tracker/st_atom_stipple.c
+++ b/src/mesa/state_tracker/st_atom_stipple.c
@@ -33,6 +33,8 @@
   */
  
 
+#include <assert.h>
+
 #include "st_context.h"
 #include "st_atom.h"
 #include "pipe/p_context.h"

diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 1a499e66d0320d74841e72b51d06c4f0d6096474..a19dcc92534a0be9932fcfd58764a1e8c09a3f8d 100644 (file)
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -214,7 +214,7 @@ src_register( struct st_translate *t,
       return ureg_src_undef();
 
    case PROGRAM_TEMPORARY:
-      ASSERT(index >= 0);
+      assert(index >= 0);
       if (ureg_dst_is_undef(t->temps[index]))
          t->temps[index] = ureg_DECL_temporary( t->ureg );
       assert(index < Elements(t->temps));
@@ -224,7 +224,7 @@ src_register( struct st_translate *t,
    case PROGRAM_ENV_PARAM:
    case PROGRAM_LOCAL_PARAM:
    case PROGRAM_UNIFORM:
-      ASSERT(index >= 0);
+      assert(index >= 0);
       return t->constants[index];
    case PROGRAM_STATE_VAR:
    case PROGRAM_CONSTANT:       /* ie, immediate */

diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index dbdf1ea1ad0420037b4e48bfeede0f4fceaabef0..add6e949dfb68facd7e3c90f8fd1c8ffd9c5d1eb 100644 (file)
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -25,14 +25,14 @@
  * 
  **************************************************************************/
 
+#include <stdio.h>
+
 #include "st_context.h"
 #include "st_format.h"
 #include "st_texture.h"
 #include "st_cb_fbo.h"
 #include "main/enums.h"
 
-#undef Elements  /* fix re-defined macro warning */
-
 #include "pipe/p_state.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"

diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index be2b646ee3597787ca0a7d18588723a131dc6fc6..84ae1b87f9319b11c42cf7a0ac9567ec4d2ac803 100644 (file)
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -27,6 +27,7 @@
 
 #include "main/glheader.h"
 #include "main/bufferobj.h"
+#include "main/compiler.h"
 #include "main/enums.h"
 #include "main/state.h"