mesa: Include mtypes.h in files that use gl_context struct.

Directly include mtypes.h if a file uses a gl_context struct. This
allows future removal of headers that are not strictly necessary but
indirectly include mtypes.h for a file.

diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index c22e18c9fbc8e0b6aad450ad110bdfbcc7e51363..74ceabb1f495cca46a99c23a2ca00f85cb60bcf6 100644 (file)
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -40,6 +40,7 @@
 #include "context.h"
 #include "imports.h"
 #include "macros.h"
+#include "mtypes.h"
 #include "main/dispatch.h"
 
 typedef void (GLAPIENTRY *array_func)( const void * );

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 0d64b7de8dd9e4c66b86d97d690914d4a7c1009a..8d7f19a7d0bd81fb2a05650558fa403379971500 100644 (file)
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -48,6 +48,7 @@
 #endif
 #include "arrayobj.h"
 #include "macros.h"
+#include "mtypes.h"
 #include "main/dispatch.h"
 
 

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 4d62f54a95ae17d0eb97f20d6ebf311d42f849c4..27be304f57a5f1b8df8d69aa520629616bca163c 100644 (file)
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -39,6 +39,7 @@
 #include "context.h"
 #include "bufferobj.h"
 #include "fbobject.h"
+#include "mtypes.h"
 #include "texobj.h"
 
 

diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 86446311fe3fa0a66bfd64931558e4821e0e9db7..5c37f3d1a86874d8e85d5fbd86cb0bd039cfec12 100644 (file)
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -35,6 +35,7 @@
 #include "colormac.h"
 #include "context.h"
 #include "enums.h"
+#include "mtypes.h"
 
 
 #define BAD_MASK ~0u

diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index c4c1d96e49c44a5f726a3973c695f3711517cd04..43a9ccc116a1777dc45502130109486e349e73f9 100644 (file)
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -36,6 +36,7 @@
 #include "colormac.h"
 #include "enums.h"
 #include "macros.h"
+#include "mtypes.h"
 #include "state.h"
 
 

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index caa95835bc280a3d109f76c62482dd0a96115af3..8a6b1293e747a15f76c194df01ebb65ed95bc616 100644 (file)
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -29,6 +29,7 @@
 #include "context.h"
 #include "image.h"
 #include "macros.h"
+#include "mtypes.h"
 #include "pack.h"
 #include "state.h"
 #include "teximage.h"

diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c
index 25b3dd678dc5399b753d2531bf547bb40a0091de..352e2e2b165dbf8cea6a6e42b3edf840d3d1c844 100644 (file)
--- a/src/mesa/main/condrender.c
+++ b/src/mesa/main/condrender.c
@@ -34,6 +34,7 @@
 #include "glheader.h"
 #include "condrender.h"
 #include "enums.h"
+#include "mtypes.h"
 #include "queryobj.h"
 
 

diff --git a/src/mesa/main/drawtex.c b/src/mesa/main/drawtex.c
index b9afc9974e0ca02ecdaa499edef4fa5f9c67fc94..7a52d221e14dbcc0782ec4241bb30437363f1c98 100644 (file)
--- a/src/mesa/main/drawtex.c
+++ b/src/mesa/main/drawtex.c
@@ -24,6 +24,7 @@
 #include "main/drawtex.h"
 #include "main/state.h"
 #include "main/imports.h"
+#include "main/mtypes.h"
 
 
 #if FEATURE_OES_draw_texture

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index f004d7a8fcadeced7b8c87fae3ddaae163526510..c30fb727bcd08db2592192158435f36ac41f1413 100644 (file)
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -40,6 +40,7 @@
 #include "framebuffer.h"
 #include "hash.h"
 #include "macros.h"
+#include "mtypes.h"
 #include "renderbuffer.h"
 #include "state.h"
 #include "teximage.h"

diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index bfa283f6a30354a9357dbe8e072b5eaf6deeefce..032f4337d6b379f6bd3be4a7550a9eea00c033d3 100644 (file)
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -29,6 +29,7 @@
 #include "get.h"
 #include "enums.h"
 #include "extensions.h"
+#include "mtypes.h"
 
 
 /**

diff --git a/src/mesa/main/hint.c b/src/mesa/main/hint.c
index 878f10d4a4387631614914405d141bf5b7330107..bdbd7519d37410cceb740cc9058f8ab7df73ddf5 100644 (file)
--- a/src/mesa/main/hint.c
+++ b/src/mesa/main/hint.c
@@ -29,6 +29,7 @@
 #include "context.h"
 #include "hint.h"
 #include "imports.h"
+#include "mtypes.h"
 
 
 

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index f9f2ed73077621c040606e665f42334d1a2376cb..6182d3e518741f69729b702c037eb2b3393c995a 100644 (file)
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -35,6 +35,7 @@
 #include "image.h"
 #include "imports.h"
 #include "macros.h"
+#include "mtypes.h"
 
 
 /**

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index cefbf4d8c98772c1543167e97f1523383bad4733..bd1fd7cfbf8d359b730b5563ce97b623b2c5e5a1 100644 (file)
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -46,6 +46,7 @@
 
 #include "imports.h"
 #include "context.h"
+#include "mtypes.h"
 #include "version.h"
 
 #ifdef _GNU_SOURCE

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index ad63b178df8c688d78947c93a342704e31380588..e073e17039f4c93dfba65d608e8e8dc26600e56f 100644 (file)
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -30,6 +30,7 @@
 #include "imports.h"
 #include "formats.h"
 #include "mipmap.h"
+#include "mtypes.h"
 #include "teximage.h"
 #include "texstore.h"
 #include "image.h"

diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 5487d45f56b54408ff1d28a500b70acf78a32020..67fdb8c9db9288cffc41aa890e28d274a573060c 100644 (file)
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -27,6 +27,7 @@
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/multisample.h"
+#include "main/mtypes.h"
 
 
 /**

diff --git a/src/mesa/main/nvprogram.c b/src/mesa/main/nvprogram.c
index 36cea3bb9a61007761239c8788c89224a9718795..dd198b8141ab76108039181758f777d31388f8cc 100644 (file)
--- a/src/mesa/main/nvprogram.c
+++ b/src/mesa/main/nvprogram.c
@@ -42,6 +42,7 @@
 #include "main/hash.h"
 #include "main/imports.h"
 #include "main/macros.h"
+#include "main/mtypes.h"
 #include "main/nvprogram.h"
 #include "program/arbprogparse.h"
 #include "program/nvfragparse.h"

diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
index 6d524e64908d1c7c2b8901cb6280ac91d2bf507a..512835cb803d135e9e976bab2d3a307817c19246 100644 (file)
--- a/src/mesa/main/pack.c
+++ b/src/mesa/main/pack.c
@@ -34,6 +34,7 @@
 #include "enums.h"
 #include "image.h"
 #include "imports.h"
+#include "mtypes.h"
 #include "pack.h"
 #include "pixeltransfer.h"
 #include "imports.h"

diff --git a/src/mesa/main/pixeltransfer.c b/src/mesa/main/pixeltransfer.c
index 711181fd89e1c6ad24ee96ea1eb7fc9bd93ccc73..c1832972f5b831992fbb0e98e5bc7c7dae73aa7e 100644 (file)
--- a/src/mesa/main/pixeltransfer.c
+++ b/src/mesa/main/pixeltransfer.c
@@ -33,6 +33,7 @@
 #include "colormac.h"
 #include "pixeltransfer.h"
 #include "imports.h"
+#include "mtypes.h"
 
 
 /*

diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 6f52f07dfabf571f1648b62cf50bc96c3139952e..f9a4f7c05fc80d4012ae1af368fd711e4aa7ec28 100644 (file)
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -32,6 +32,7 @@
 #include "context.h"
 #include "feedback.h"
 #include "macros.h"
+#include "mtypes.h"
 #include "rastpos.h"
 #include "state.h"
 #include "main/dispatch.h"

diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index a5612e34ecf0a708689c19f816d066657557c185..e5b85ca32b47b04643ababcee2250990150fff30 100644 (file)
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -30,6 +30,7 @@
 #include "framebuffer.h"
 #include "formats.h"
 #include "image.h"
+#include "mtypes.h"
 #include "state.h"
 
 

diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c
index 4cf0bc2528c680cba51583f953dd93918b2f0d86..df665994a95395ca70a5d00ccc46be93186e0257 100644 (file)
--- a/src/mesa/main/scissor.c
+++ b/src/mesa/main/scissor.c
@@ -25,6 +25,7 @@
 
 #include "main/glheader.h"
 #include "main/context.h"
+#include "main/mtypes.h"
 #include "main/scissor.h"
 
 

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 96df58d35c241b9cb80772264c19fdb748656fe5..ad7abc2c6958d8f3a51559d5a22078c128a94c19 100644 (file)
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -41,6 +41,7 @@
 #include "main/dispatch.h"
 #include "main/enums.h"
 #include "main/hash.h"
+#include "main/mtypes.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "program/program.h"

diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 216bbce003299a4501b0a259726f3606c2cf4d5e..50bd5f9a238da8e106c8362737e6cb4d24bd0a14 100644 (file)
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -32,6 +32,7 @@
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/hash.h"
+#include "main/mtypes.h"
 #include "main/shaderobj.h"
 #include "program/program.h"
 #include "program/prog_parameter.h"

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 2c8bcbeaf7cbc2fcf5850886e851f0254fb2e452..0d5c8a170bb6b43cdb9848b5e9b1c23cf73c9339 100644 (file)
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -61,6 +61,7 @@
 #include "macros.h"
 #include "get.h"
 #include "dispatch.h"
+#include "mtypes.h"
 
 #if FEATURE_ARB_sync
 #include "syncobj.h"

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index e3d2a786b3eb7883614ebc7a6bb3762a2eb9f7d5..a4ca93cc2561315f678cf07a3220f87c29d17a69 100644 (file)
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -34,6 +34,7 @@
 #include "imports.h"
 #include "colormac.h"
 #include "formats.h"
+#include "mtypes.h"
 #include "texcompress.h"
 
 

diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index 0e893a59fa3780619f02d6bac958652422aea821..8afc05ac9096e106710c102e2b2558ff4c5f06e3 100644 (file)
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -39,6 +39,7 @@
 #include "dlopen.h"
 #include "image.h"
 #include "macros.h"
+#include "mtypes.h"
 #include "texcompress.h"
 #include "texcompress_s3tc.h"
 #include "texstore.h"

diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 508dbf4887de50ee7750c86324361cd2048ca0f1..194bcbea9831ccc463411221edf9bc8eeeb5f158 100644 (file)
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -34,6 +34,7 @@
 #include "main/context.h"
 #include "main/enums.h"
 #include "main/macros.h"
+#include "main/mtypes.h"
 #include "main/texenv.h"
 #include "main/texstate.h"
 

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index a8bffe416d9015e877eb2522d11cd0bfb9680874..a3fa3fe826cebcb790fd449d4bad5383dda6348b 100644 (file)
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -28,6 +28,7 @@
 
 #include "glheader.h"
 #include "imports.h"
+#include "mtypes.h"
 #include "program/program.h"
 #include "program/prog_parameter.h"
 #include "program/prog_cache.h"

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 41853bce5ffc703049acd82d4479b70f40ae5d5d..451e9044ccf8fb76540ce022d56417280eb9c96e 100644 (file)
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -34,6 +34,7 @@
 
 
 #include "context.h"
+#include "mtypes.h"
 #include "texcompress.h"
 #include "texformat.h"
 

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 71b8ce43f80488d29feeedae18132ccf4a809f5b..683b67afe611c6a65f892a4e624ab1c00539c069 100644 (file)
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -35,6 +35,7 @@
 #include "context.h"
 #include "formats.h"
 #include "image.h"
+#include "mtypes.h"
 #include "pack.h"
 #include "texgetimage.h"
 #include "teximage.h"

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index d5c83de97f78ed730b199aeb01dddcc29f50f5cc..91a1b62d1ff904fdd74c5473cfd27780a8a17373 100644 (file)
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -35,6 +35,7 @@
 #include "main/context.h"
 #include "main/formats.h"
 #include "main/macros.h"
+#include "main/mtypes.h"
 #include "main/texcompress.h"
 #include "main/texparam.h"
 #include "main/teximage.h"

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index de99e6c18626f8cbd0d9728de0af0cfb6e5d7b59..ba92cbbc327f565f014d61309afa043202946f27 100644 (file)
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -58,6 +58,7 @@
 #include "image.h"
 #include "macros.h"
 #include "mipmap.h"
+#include "mtypes.h"
 #include "pack.h"
 #include "imports.h"
 #include "pack.h"

diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index d297b5ed71234913d379774789bbf92e81dc7864..9423c040f043676b086a8bdb2223a835d9d44d76 100644 (file)
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -34,6 +34,7 @@
 #include "bufferobj.h"
 #include "context.h"
 #include "hash.h"
+#include "mtypes.h"
 #include "transformfeedback.h"
 #include "shaderapi.h"
 #include "shaderobj.h"

diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index d61856d0ebca4fda58b332f7bb195850a38b14ed..658be25f39badd65c825b4adc4b17d743ee2dcd7 100644 (file)
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -39,6 +39,7 @@
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/dispatch.h"
+#include "main/mtypes.h"
 #include "main/shaderapi.h"
 #include "main/shaderobj.h"
 #include "main/uniforms.h"

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 69a28da84c63ffad7fa90dfc38222d221b41f59f..dd57d3b2ae374c81f493ea80ad21b84ea3523010 100644 (file)
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -23,6 +23,7 @@
 
 
 #include "context.h"
+#include "mtypes.h"
 #include "version.h"
 
 

diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index 4747022d0b42c02aa2711925d825f02acc846625..d19ae3b6c1263b11a1b32aa484b394c15c05b0aa 100644 (file)
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -31,6 +31,7 @@
 
 #include "context.h"
 #include "macros.h"
+#include "mtypes.h"
 #include "viewport.h"