None of the remaining FEATURE_x symbols in mfeatures.h are used anymore.
---
src/mesa/drivers/dri/intel/intel_buffer_objects.c | 1 -
src/mesa/drivers/dri/intel/intel_extensions.c | 1 -
src/mesa/drivers/dri/intel/intel_fbo.c | 1 -
src/mesa/drivers/dri/intel/intel_screen.c | 1 -
src/mesa/drivers/dri/intel/intel_tex_image.c | 1 -
src/mesa/drivers/dri/nouveau/nouveau_driver.c | 1 -
src/mesa/drivers/dri/nouveau/nouveau_fbo.c | 1 -
src/mesa/drivers/dri/r200/r200_context.c | 1 -
src/mesa/drivers/dri/r200/r200_tex.c | 1 -
src/mesa/drivers/dri/radeon/radeon_context.c | 1 -
src/mesa/drivers/dri/radeon/radeon_fbo.c | 1 -
src/mesa/drivers/dri/radeon/radeon_tex.c | 1 -
src/mesa/drivers/dri/radeon/radeon_texture.c | 1 -
src/mesa/drivers/dri/radeon/radeon_texture.h | 1 -
src/mesa/main/accum.c | 1 -
src/mesa/main/accum.h | 1 -
src/mesa/main/api_arrayelt.c | 1 -
src/mesa/main/api_arrayelt.h | 1 -
src/mesa/main/api_loopback.c | 1 -
src/mesa/main/api_loopback.h | 2 --
src/mesa/main/api_validate.c | 1 -
src/mesa/main/api_validate.h | 1 -
src/mesa/main/arrayobj.c | 1 -
src/mesa/main/atifragshader.c | 1 -
src/mesa/main/atifragshader.h | 1 -
src/mesa/main/attrib.c | 1 -
src/mesa/main/attrib.h | 1 -
src/mesa/main/bufferobj.c | 1 -
src/mesa/main/bufferobj.h | 1 -
src/mesa/main/colortab.c | 1 -
src/mesa/main/colortab.h | 1 -
src/mesa/main/context.c | 1 -
src/mesa/main/convolve.c | 1 -
src/mesa/main/convolve.h | 1 -
src/mesa/main/debug.h | 1 -
src/mesa/main/depth.h | 1 -
src/mesa/main/dlist.c | 1 -
src/mesa/main/dlist.h | 1 -
src/mesa/main/drawpix.c | 1 -
src/mesa/main/drawpix.h | 1 -
src/mesa/main/drawtex.c | 1 -
src/mesa/main/drawtex.h | 1 -
src/mesa/main/enable.c | 1 -
src/mesa/main/enums.h | 1 -
src/mesa/main/es1_conversion.c | 1 -
src/mesa/main/eval.c | 1 -
src/mesa/main/eval.h | 1 -
src/mesa/main/extensions.c | 1 -
src/mesa/main/extensions.h | 1 -
src/mesa/main/fbobject.c | 1 -
src/mesa/main/feedback.c | 1 -
src/mesa/main/feedback.h | 1 -
src/mesa/main/ffvertex_prog.c | 1 -
src/mesa/main/fog.h | 1 -
src/mesa/main/formatquery.c | 1 -
src/mesa/main/formats.c | 1 -
src/mesa/main/get.c | 1 -
src/mesa/main/getstring.c | 1 -
src/mesa/main/hint.h | 1 -
src/mesa/main/histogram.c | 1 -
src/mesa/main/histogram.h | 1 -
src/mesa/main/image.c | 1 -
src/mesa/main/light.h | 1 -
src/mesa/main/matrix.c | 1 -
src/mesa/main/mtypes.h | 1 -
src/mesa/main/pixel.c | 1 -
src/mesa/main/pixel.h | 1 -
src/mesa/main/pixelstore.c | 1 -
src/mesa/main/querymatrix.h | 1 -
src/mesa/main/queryobj.c | 1 -
src/mesa/main/queryobj.h | 1 -
src/mesa/main/rastpos.c | 1 -
src/mesa/main/rastpos.h | 1 -
src/mesa/main/remap.c | 1 -
src/mesa/main/remap.h | 1 -
src/mesa/main/samplerobj.c | 1 -
src/mesa/main/shaderapi.c | 1 -
src/mesa/main/shaderobj.c | 1 -
src/mesa/main/shared.c | 1 -
src/mesa/main/syncobj.c | 1 -
src/mesa/main/syncobj.h | 1 -
src/mesa/main/tests/dispatch_sanity.cpp | 4 ----
src/mesa/main/texcompress.c | 1 -
src/mesa/main/texcompress.h | 1 -
src/mesa/main/texcompress_cpal.c | 1 -
src/mesa/main/texcompress_etc.c | 1 -
src/mesa/main/texcompress_etc.h | 1 -
src/mesa/main/texcompress_fxt1.c | 1 -
src/mesa/main/texcompress_fxt1.h | 1 -
src/mesa/main/texcompress_rgtc.c | 1 -
src/mesa/main/texcompress_rgtc.h | 1 -
src/mesa/main/texcompress_s3tc.c | 1 -
src/mesa/main/texcompress_s3tc.h | 1 -
src/mesa/main/texformat.c | 1 -
src/mesa/main/texgen.c | 1 -
src/mesa/main/texgen.h | 1 -
src/mesa/main/texgetimage.c | 1 -
src/mesa/main/teximage.c | 1 -
src/mesa/main/texobj.c | 1 -
src/mesa/main/texparam.c | 1 -
src/mesa/main/texstate.c | 1 -
src/mesa/main/texstorage.c | 1 -
src/mesa/main/texstore.c | 1 -
src/mesa/main/transformfeedback.c | 1 -
src/mesa/main/transformfeedback.h | 1 -
src/mesa/main/varray.c | 1 -
src/mesa/main/varray.h | 1 -
src/mesa/main/vtxfmt.c | 1 -
src/mesa/main/vtxfmt.h | 1 -
src/mesa/program/program.c | 1 -
src/mesa/state_tracker/st_draw_feedback.c | 1 -
src/mesa/vbo/vbo_context.h | 1 -
src/mesa/vbo/vbo_exec.h | 1 -
src/mesa/vbo/vbo_exec_api.c | 1 -
src/mesa/vbo/vbo_exec_draw.c | 1 -
src/mesa/vbo/vbo_noop.c | 1 -
src/mesa/vbo/vbo_noop.h | 1 -
src/mesa/vbo/vbo_save.c | 1 -
src/mesa/vbo/vbo_save.h | 1 -
src/mesa/vbo/vbo_save_api.c | 1 -
src/mesa/vbo/vbo_save_draw.c | 1 -
src/mesa/vbo/vbo_save_loopback.c | 1 -
122 files changed, 0 insertions(+), 126 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index f94c6f5..a5ad900 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -27,7 +27,6 @@
#include "main/imports.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "main/bufferobj.h"
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c
b/src/mesa/drivers/dri/intel/intel_extensions.c
index bf5e2b5..cf42c28 100755
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -25,7 +25,6 @@
*
**************************************************************************/
-#include "main/mfeatures.h"
#include "main/version.h"
#include "intel_chipset.h"
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c
b/src/mesa/drivers/dri/intel/intel_fbo.c
index 9a9bb9f..ccb64a2 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -29,7 +29,6 @@
#include "main/enums.h"
#include "main/imports.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/fbobject.h"
#include "main/framebuffer.h"
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c
b/src/mesa/drivers/dri/intel/intel_screen.c
index 277b133..604e993 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -34,7 +34,6 @@
#include "main/texobj.h"
#include "main/hash.h"
#include "main/fbobject.h"
-#include "main/mfeatures.h"
#include "main/version.h"
#include "swrast/s_renderbuffer.h"
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c
b/src/mesa/drivers/dri/intel/intel_tex_image.c
index d227ee5..e121187 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -1,7 +1,6 @@
#include "main/glheader.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/enums.h"
#include "main/bufferobj.h"
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c
b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
index f56b3b2..ec7b349 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
@@ -24,7 +24,6 @@
*
*/
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/fbobject.h"
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
index 156b4a3..b487009 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
@@ -32,7 +32,6 @@
#include "main/framebuffer.h"
#include "main/renderbuffer.h"
#include "main/fbobject.h"
-#include "main/mfeatures.h"
static GLboolean
set_renderbuffer_format(struct gl_renderbuffer *rb, GLenum internalFormat)
diff --git a/src/mesa/drivers/dri/r200/r200_context.c
b/src/mesa/drivers/dri/r200/r200_context.c
index ee66683..4d62bc4 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -40,7 +40,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
#include "main/simple_list.h"
#include "main/imports.h"
#include "main/extensions.h"
-#include "main/mfeatures.h"
#include "main/version.h"
#include "main/vtxfmt.h"
diff --git a/src/mesa/drivers/dri/r200/r200_tex.c
b/src/mesa/drivers/dri/r200/r200_tex.c
index a4347c6..31a65c8 100644
--- a/src/mesa/drivers/dri/r200/r200_tex.c
+++ b/src/mesa/drivers/dri/r200/r200_tex.c
@@ -37,7 +37,6 @@ 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/mfeatures.h"
#include "main/simple_list.h"
#include "main/teximage.h"
#include "main/texobj.h"
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c
b/src/mesa/drivers/dri/radeon/radeon_context.c
index a2f2228..e1b83a2 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -42,7 +42,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
#include "main/simple_list.h"
#include "main/imports.h"
#include "main/extensions.h"
-#include "main/mfeatures.h"
#include "main/version.h"
#include "main/vtxfmt.h"
diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c
b/src/mesa/drivers/dri/radeon/radeon_fbo.c
index 9ab74c4..eb592db 100644
--- a/src/mesa/drivers/dri/radeon/radeon_fbo.c
+++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c
@@ -28,7 +28,6 @@
#include "main/imports.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/enums.h"
#include "main/fbobject.h"
diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c
b/src/mesa/drivers/dri/radeon/radeon_tex.c
index 5ca07e0..301949d 100644
--- a/src/mesa/drivers/dri/radeon/radeon_tex.c
+++ b/src/mesa/drivers/dri/radeon/radeon_tex.c
@@ -37,7 +37,6 @@ 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/mfeatures.h"
#include "main/simple_list.h"
#include "main/teximage.h"
#include "main/texobj.h"
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c
b/src/mesa/drivers/dri/radeon/radeon_texture.c
index 4835147..0bd2c24 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -33,7 +33,6 @@
#include "main/imports.h"
#include "main/context.h"
#include "main/enums.h"
-#include "main/mfeatures.h"
#include "main/mipmap.h"
#include "main/pbo.h"
#include "main/texcompress.h"
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.h
b/src/mesa/drivers/dri/radeon/radeon_texture.h
index b18beb0..b0a07fc 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.h
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.h
@@ -32,7 +32,6 @@
#define RADEON_TEXTURE_H
#include "main/formats.h"
-#include "main/mfeatures.h"
extern gl_format _radeon_texformat_rgba8888;
extern gl_format _radeon_texformat_argb8888;
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index f588801..3900bce 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -30,7 +30,6 @@
#include "format_pack.h"
#include "imports.h"
#include "macros.h"
-#include "mfeatures.h"
#include "state.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h
index 00c24b2..fde96af 100644
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -38,7 +38,6 @@
#define ACCUM_H
#include "main/glheader.h"
-#include "main/mfeatures.h"
struct _glapi_table;
struct gl_context;
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index ea33614..7479aa3 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -40,7 +40,6 @@
#include "context.h"
#include "imports.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/src/mesa/main/api_arrayelt.h b/src/mesa/main/api_arrayelt.h
index 9887032..2afd401 100644
--- a/src/mesa/main/api_arrayelt.h
+++ b/src/mesa/main/api_arrayelt.h
@@ -28,7 +28,6 @@
#define API_ARRAYELT_H
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) \
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 59d399b..14f89e0 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -36,7 +36,6 @@
#include "glapi/glapi.h"
#include "glapi/glthread.h"
#include "main/dispatch.h"
-#include "mfeatures.h"
#include "main/context.h"
/* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index c35d57b..08cbb23 100644
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -28,14 +28,12 @@
#define API_LOOPBACK_H
#include "main/compiler.h"
-#include "main/mfeatures.h"
#include "main/glheader.h" // ?
#include "main/macros.h" // ?
#include "main/mtypes.h" // ?
#include "glapi/glapi.h" // ?
#include "glapi/glthread.h" // ?
#include "main/dispatch.h" // ?
-#include "main/mfeatures.h" // ?
#include "main/context.h" // ?
struct _glapi_table;
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index 53b0021..cd45895 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -28,7 +28,6 @@
#include "bufferobj.h"
#include "context.h"
#include "imports.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "enums.h"
#include "vbo/vbo.h"
diff --git a/src/mesa/main/api_validate.h b/src/mesa/main/api_validate.h
index 0ca9c90..5cd0419 100644
--- a/src/mesa/main/api_validate.h
+++ b/src/mesa/main/api_validate.h
@@ -29,7 +29,6 @@
#include "glheader.h"
-#include "mfeatures.h"
struct gl_buffer_object;
struct gl_context;
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index ac3e7e6..6747389 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -44,7 +44,6 @@
#include "image.h"
#include "imports.h"
#include "context.h"
-#include "mfeatures.h"
#include "bufferobj.h"
#include "arrayobj.h"
#include "macros.h"
diff --git a/src/mesa/main/atifragshader.c b/src/mesa/main/atifragshader.c
index 2a07908..7077c96 100644
--- a/src/mesa/main/atifragshader.c
+++ b/src/mesa/main/atifragshader.c
@@ -26,7 +26,6 @@
#include "main/hash.h"
#include "main/imports.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "main/enums.h"
#include "main/mtypes.h"
#include "main/dispatch.h"
diff --git a/src/mesa/main/atifragshader.h b/src/mesa/main/atifragshader.h
index c47a7d5..afaea00 100644
--- a/src/mesa/main/atifragshader.h
+++ b/src/mesa/main/atifragshader.h
@@ -10,7 +10,6 @@
#include "compiler.h"
#include "glheader.h"
-#include "mfeatures.h"
struct _glapi_table;
struct gl_context;
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index a951283..77cffbb 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -43,7 +43,6 @@
#include "lines.h"
#include "macros.h"
#include "matrix.h"
-#include "mfeatures.h"
#include "multisample.h"
#include "points.h"
#include "polygon.h"
diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index 1ecf3a5..4f051a0 100644
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -28,7 +28,6 @@
#include "compiler.h"
#include "glheader.h"
-#include "mfeatures.h"
struct _glapi_table;
struct gl_context;
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index b82ba7b..21d208c 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -39,7 +39,6 @@
#include "context.h"
#include "bufferobj.h"
#include "fbobject.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "texobj.h"
#include "transformfeedback.h"
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index e98e476..fae5fdc 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -29,7 +29,6 @@
#define BUFFEROBJ_H
-#include "mfeatures.h"
#include "mtypes.h"
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index c201a27..8762483 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -29,7 +29,6 @@
#include "context.h"
#include "image.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "pack.h"
#include "pbo.h"
diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index f25fbe8..f2d5268 100644
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -29,7 +29,6 @@
#include "compiler.h"
#include "glheader.h"
-#include "mfeatures.h"
struct _glapi_table;
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 02acfc2..881f074 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -77,7 +77,6 @@
#include "glheader.h"
-#include "mfeatures.h"
#include "imports.h"
#include "accum.h"
#include "api_exec.h"
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index dfc1b94..cb62e2a 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -36,7 +36,6 @@
#include "colormac.h"
#include "convolve.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h
index 812debd..9280603 100644
--- a/src/mesa/main/convolve.h
+++ b/src/mesa/main/convolve.h
@@ -29,7 +29,6 @@
#include "compiler.h"
-#include "mfeatures.h"
struct _glapi_table;
diff --git a/src/mesa/main/debug.h b/src/mesa/main/debug.h
index 6bc5365..e1ae595 100644
--- a/src/mesa/main/debug.h
+++ b/src/mesa/main/debug.h
@@ -37,7 +37,6 @@
#define _DEBUG_H
#include "glheader.h"
-#include "mfeatures.h"
struct gl_context;
struct gl_texture_image;
diff --git a/src/mesa/main/depth.h b/src/mesa/main/depth.h
index fe6b33f..288a331 100644
--- a/src/mesa/main/depth.h
+++ b/src/mesa/main/depth.h
@@ -33,7 +33,6 @@
#include "glheader.h"
-#include "mfeatures.h"
struct gl_context;
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 4b20d89..33aeffc 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -37,7 +37,6 @@
#include "api_validate.h"
#include "atifragshader.h"
#include "config.h"
-#include "mfeatures.h"
#include "bufferobj.h"
#include "arrayobj.h"
#include "context.h"
diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index e049476..2722e06 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -33,7 +33,6 @@
#define DLIST_H
-#include "main/mfeatures.h"
#include "main/mtypes.h"
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index d9f55d3..829d9a1 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -31,7 +31,6 @@
#include "feedback.h"
#include "framebuffer.h"
#include "image.h"
-#include "mfeatures.h"
#include "pbo.h"
#include "state.h"
#include "dispatch.h"
diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h
index 087b3a8..cd2ab7a 100644
--- a/src/mesa/main/drawpix.h
+++ b/src/mesa/main/drawpix.h
@@ -27,7 +27,6 @@
#include "compiler.h"
-#include "mfeatures.h"
struct _glapi_table;
diff --git a/src/mesa/main/drawtex.c b/src/mesa/main/drawtex.c
index 7285805..7c0ec83 100644
--- a/src/mesa/main/drawtex.c
+++ b/src/mesa/main/drawtex.c
@@ -24,7 +24,6 @@
#include "main/drawtex.h"
#include "main/state.h"
#include "main/imports.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
diff --git a/src/mesa/main/drawtex.h b/src/mesa/main/drawtex.h
index b916150..28e2435 100644
--- a/src/mesa/main/drawtex.h
+++ b/src/mesa/main/drawtex.h
@@ -26,7 +26,6 @@
#include "glheader.h"
-#include "mfeatures.h"
extern void GLAPIENTRY
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 7e85fdf..a7a0a31 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -33,7 +33,6 @@
#include "enable.h"
#include "light.h"
#include "simple_list.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "enums.h"
#include "api_arrayelt.h"
diff --git a/src/mesa/main/enums.h b/src/mesa/main/enums.h
index 8f40694..ed69ead 100644
--- a/src/mesa/main/enums.h
+++ b/src/mesa/main/enums.h
@@ -36,7 +36,6 @@
#ifndef _ENUMS_H_
#define _ENUMS_H_
-#include "mfeatures.h"
extern const char *_mesa_lookup_enum_by_nr( int nr );
diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c
index cd527dd..60a60e2 100644
--- a/src/mesa/main/es1_conversion.c
+++ b/src/mesa/main/es1_conversion.c
@@ -1,5 +1,4 @@
#include <stdbool.h>
-#include "main/mfeatures.h"
#include "api_loopback.h"
#include "api_exec.h"
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index b3c2841..f739dbb 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -43,7 +43,6 @@
#include "context.h"
#include "eval.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h
index cfde53f..19cd890 100644
--- a/src/mesa/main/eval.h
+++ b/src/mesa/main/eval.h
@@ -37,7 +37,6 @@
#define EVAL_H
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include <stdbool.h>
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index e90a296..ec8762f 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -35,7 +35,6 @@
#include "context.h"
#include "extensions.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
enum {
diff --git a/src/mesa/main/extensions.h b/src/mesa/main/extensions.h
index 8acbd4b..8cc0170 100644
--- a/src/mesa/main/extensions.h
+++ b/src/mesa/main/extensions.h
@@ -37,7 +37,6 @@
#define _EXTENSIONS_H_
#include "glheader.h"
-#include "mfeatures.h"
struct gl_context;
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 89bc575..93befce 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -42,7 +42,6 @@
#include "glformats.h"
#include "hash.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "renderbuffer.h"
#include "state.h"
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 5d4c6e4..f6834e9 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -35,7 +35,6 @@
#include "enums.h"
#include "feedback.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index a697dc0d..5946201 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -27,7 +27,6 @@
#define FEEDBACK_H
-#include "main/mfeatures.h"
#include "main/mtypes.h"
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index efdca01..8d01419 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -36,7 +36,6 @@
#include "main/glheader.h"
#include "main/mtypes.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "main/enums.h"
#include "main/ffvertex_prog.h"
#include "program/program.h"
diff --git a/src/mesa/main/fog.h b/src/mesa/main/fog.h
index 20a75e9..2d56f0e 100644
--- a/src/mesa/main/fog.h
+++ b/src/mesa/main/fog.h
@@ -38,7 +38,6 @@
#include "glheader.h"
-#include "mfeatures.h"
struct gl_context;
diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c
index bd895e8..169c898 100644
--- a/src/mesa/main/formatquery.c
+++ b/src/mesa/main/formatquery.c
@@ -25,7 +25,6 @@
#include "context.h"
#include "glformats.h"
#include "macros.h"
-#include "mfeatures.h"
#include "enums.h"
#include "fbobject.h"
#include "formatquery.h"
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 68ce984..9a6920f 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -26,7 +26,6 @@
#include "imports.h"
#include "formats.h"
-#include "mfeatures.h"
#include "macros.h"
#include "glformats.h"
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 524418e..9a1bd25 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -29,7 +29,6 @@
#include "extensions.h"
#include "get.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "state.h"
#include "texcompress.h"
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 5280b4d..8618d0c 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -29,7 +29,6 @@
#include "get.h"
#include "enums.h"
#include "extensions.h"
-#include "mfeatures.h"
#include "mtypes.h"
diff --git a/src/mesa/main/hint.h b/src/mesa/main/hint.h
index ca9659d..8d2bcc7 100644
--- a/src/mesa/main/hint.h
+++ b/src/mesa/main/hint.h
@@ -37,7 +37,6 @@
#define HINT_H
#include "glheader.h"
-#include "mfeatures.h"
struct gl_context;
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index fe454bc..9669487 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -28,7 +28,6 @@
#include "colormac.h"
#include "histogram.h"
#include "macros.h"
-#include "mfeatures.h"
#include "main/dispatch.h"
diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index 06781e7..896f1c3 100644
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -37,7 +37,6 @@
#define HISTOGRAM_H
#include "compiler.h"
-#include "mfeatures.h"
struct _glapi_table;
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 52804bd..2036bab 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -36,7 +36,6 @@
#include "image.h"
#include "imports.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index e25dbf22..ccdf772 100644
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -29,7 +29,6 @@
#include "glheader.h"
-#include "mfeatures.h"
struct gl_context;
struct gl_light;
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index f2fd567..362de33 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -40,7 +40,6 @@
#include "context.h"
#include "enums.h"
#include "macros.h"
-#include "mfeatures.h"
#include "matrix.h"
#include "mtypes.h"
#include "math/m_matrix.h"
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index b92f98e..9fd937e 100644
--- 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/mfeatures.h"
#include "glapi/glapi.h"
#include "math/m_matrix.h" /* GLmatrix */
#include "main/simple_list.h" /* struct simple_node */
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index e9f75a7..976304c 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -33,7 +33,6 @@
#include "colormac.h"
#include "context.h"
#include "macros.h"
-#include "mfeatures.h"
#include "pixel.h"
#include "pbo.h"
#include "mtypes.h"
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 433208c..8f6ea2c 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -35,7 +35,6 @@
#include "compiler.h"
#include "glheader.h"
-#include "mfeatures.h"
struct _glapi_table;
struct gl_context;
diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c
index 01068e8..5635bef 100644
--- a/src/mesa/main/pixelstore.c
+++ b/src/mesa/main/pixelstore.c
@@ -32,7 +32,6 @@
#include "bufferobj.h"
#include "context.h"
#include "pixelstore.h"
-#include "mfeatures.h"
#include "mtypes.h"
diff --git a/src/mesa/main/querymatrix.h b/src/mesa/main/querymatrix.h
index 187b5f4..e08d843 100644
--- a/src/mesa/main/querymatrix.h
+++ b/src/mesa/main/querymatrix.h
@@ -25,7 +25,6 @@
#define QUERYMATRIX_H
-#include "mfeatures.h"
#include "mtypes.h"
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index d0c5a25..3a84526 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -29,7 +29,6 @@
#include "hash.h"
#include "imports.h"
#include "queryobj.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "main/dispatch.h"
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index 0616c94..88e2f15 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -27,7 +27,6 @@
#define QUERYOBJ_H
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/hash.h"
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 5a030be..c7ce56c 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -32,7 +32,6 @@
#include "context.h"
#include "feedback.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "rastpos.h"
#include "state.h"
diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h
index bbd32ab..53acb4d 100644
--- a/src/mesa/main/rastpos.h
+++ b/src/mesa/main/rastpos.h
@@ -33,7 +33,6 @@
#include "compiler.h"
-#include "mfeatures.h"
struct _glapi_table;
struct gl_context;
diff --git a/src/mesa/main/remap.c b/src/mesa/main/remap.c
index bc4ac9b..44ec964 100644
--- a/src/mesa/main/remap.c
+++ b/src/mesa/main/remap.c
@@ -36,7 +36,6 @@
* a dynamic entry, or the corresponding static entry, in glapi.
*/
-#include "mfeatures.h"
#include "remap.h"
#include "imports.h"
#include "glapi/glapi.h"
diff --git a/src/mesa/main/remap.h b/src/mesa/main/remap.h
index 6f20c3e..bfef6ac 100644
--- a/src/mesa/main/remap.h
+++ b/src/mesa/main/remap.h
@@ -29,7 +29,6 @@
#include "main/compiler.h"
-#include "main/mfeatures.h"
struct gl_function_pool_remap {
int pool_index;
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 319a444..a9ba605 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -35,7 +35,6 @@
#include "main/enums.h"
#include "main/hash.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/samplerobj.h"
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 8b160bc..ef0727a 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -41,7 +41,6 @@
#include "main/dispatch.h"
#include "main/enums.h"
#include "main/hash.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/shaderapi.h"
#include "main/shaderobj.h"
diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 59daff5..96fc922 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -32,7 +32,6 @@
#include "main/glheader.h"
#include "main/context.h"
#include "main/hash.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index a98a45c..5a2655b 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -28,7 +28,6 @@
*/
#include "imports.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "hash.h"
#include "hash_table.h"
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 020fa1d..c8d25cd 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -60,7 +60,6 @@
#include "imports.h"
#include "context.h"
#include "macros.h"
-#include "mfeatures.h"
#include "get.h"
#include "dispatch.h"
#include "mtypes.h"
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
index 6b43674..faa3f55 100644
--- a/src/mesa/main/syncobj.h
+++ b/src/mesa/main/syncobj.h
@@ -32,7 +32,6 @@
#define SYNCOBJ_H
#include "glheader.h"
-#include "mfeatures.h"
struct _glapi_table;
struct dd_function_table;
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp
b/src/mesa/main/tests/dispatch_sanity.cpp
index bf6b297..08f52b2 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -39,10 +39,6 @@
* modified to expect dispatch functions for the new extension functions.
*/
-extern "C" {
-#include "main/mfeatures.h"
-}
-
#include <gtest/gtest.h>
extern "C" {
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 734294e..f74ac5d 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -35,7 +35,6 @@
#include "colormac.h"
#include "context.h"
#include "formats.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "context.h"
#include "texcompress.h"
diff --git a/src/mesa/main/texcompress.h b/src/mesa/main/texcompress.h
index b45e7cf..50c0293 100644
--- a/src/mesa/main/texcompress.h
+++ b/src/mesa/main/texcompress.h
@@ -27,7 +27,6 @@
#include "formats.h"
#include "glheader.h"
-#include "mfeatures.h"
struct gl_context;
diff --git a/src/mesa/main/texcompress_cpal.c b/src/mesa/main/texcompress_cpal.c
index 75389a4..c22ae9d 100644
--- a/src/mesa/main/texcompress_cpal.c
+++ b/src/mesa/main/texcompress_cpal.c
@@ -33,7 +33,6 @@
#include "glheader.h"
#include "compiler.h" /* for ASSERT */
#include "context.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "imports.h"
#include "pixelstore.h"
diff --git a/src/mesa/main/texcompress_etc.c b/src/mesa/main/texcompress_etc.c
index 7ad4dde..442f844 100644
--- a/src/mesa/main/texcompress_etc.c
+++ b/src/mesa/main/texcompress_etc.c
@@ -38,7 +38,6 @@
*/
#include <stdbool.h>
-#include "mfeatures.h"
#include "texcompress.h"
#include "texcompress_etc.h"
#include "texstore.h"
diff --git a/src/mesa/main/texcompress_etc.h b/src/mesa/main/texcompress_etc.h
index 503d038..9da0fb3 100644
--- a/src/mesa/main/texcompress_etc.h
+++ b/src/mesa/main/texcompress_etc.h
@@ -26,7 +26,6 @@
#include <inttypes.h>
#include "glheader.h"
-#include "mfeatures.h"
#include "texcompress.h"
#include "texstore.h"
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index f7254f9..2d60d56 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -34,7 +34,6 @@
#include "colormac.h"
#include "image.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mipmap.h"
#include "texcompress.h"
#include "texcompress_fxt1.h"
diff --git a/src/mesa/main/texcompress_fxt1.h b/src/mesa/main/texcompress_fxt1.h
index 5949df9..818d223 100644
--- a/src/mesa/main/texcompress_fxt1.h
+++ b/src/mesa/main/texcompress_fxt1.h
@@ -26,7 +26,6 @@
#define TEXCOMPRESS_FXT1_H
#include "glheader.h"
-#include "mfeatures.h"
#include "texstore.h"
diff --git a/src/mesa/main/texcompress_rgtc.c b/src/mesa/main/texcompress_rgtc.c
index 1f8de25..a700661 100644
--- a/src/mesa/main/texcompress_rgtc.c
+++ b/src/mesa/main/texcompress_rgtc.c
@@ -38,7 +38,6 @@
#include "colormac.h"
#include "image.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mipmap.h"
#include "texcompress.h"
#include "texcompress_rgtc.h"
diff --git a/src/mesa/main/texcompress_rgtc.h b/src/mesa/main/texcompress_rgtc.h
index 9e1cce4..98638f0 100644
--- a/src/mesa/main/texcompress_rgtc.h
+++ b/src/mesa/main/texcompress_rgtc.h
@@ -25,7 +25,6 @@
#define TEXCOMPRESS_RGTC_H
#include "glheader.h"
-#include "mfeatures.h"
#include "texstore.h"
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index 4a81ad8..4c162b1 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -39,7 +39,6 @@
#include "dlopen.h"
#include "image.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "texcompress.h"
#include "texcompress_s3tc.h"
diff --git a/src/mesa/main/texcompress_s3tc.h b/src/mesa/main/texcompress_s3tc.h
index d9ef689..d5b577e 100644
--- a/src/mesa/main/texcompress_s3tc.h
+++ b/src/mesa/main/texcompress_s3tc.h
@@ -27,7 +27,6 @@
#include "compiler.h"
#include "glheader.h"
-#include "mfeatures.h"
#include "texstore.h"
#include "texcompress.h"
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 6f22a4f..d5800a5 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -35,7 +35,6 @@
#include "context.h"
#include "enums.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "texcompress.h"
#include "texformat.h"
diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
index e45cfe1..d6fa682 100644
--- a/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@ -34,7 +34,6 @@
#include "main/context.h"
#include "main/enums.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "main/texgen.h"
#include "main/texstate.h"
#include "math/m_matrix.h"
diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h
index 97563a0..bf295fe 100644
--- a/src/mesa/main/texgen.h
+++ b/src/mesa/main/texgen.h
@@ -29,7 +29,6 @@
#include "compiler.h"
#include "glheader.h"
-#include "mfeatures.h"
struct _glapi_table;
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 7299a4b..7303fe9 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -37,7 +37,6 @@
#include "format_unpack.h"
#include "glformats.h"
#include "image.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "pack.h"
#include "pbo.h"
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index f8f517a..1756197 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -39,7 +39,6 @@
#include "image.h"
#include "imports.h"
#include "macros.h"
-#include "mfeatures.h"
#include "state.h"
#include "texcompress.h"
#include "texcompress_cpal.h"
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index e99b0dc..7a2872d 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -28,7 +28,6 @@
*/
-#include "mfeatures.h"
#include "bufferobj.h"
#include "colortab.h"
#include "context.h"
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index b6afd35..2e62761 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -37,7 +37,6 @@
#include "main/formats.h"
#include "main/glformats.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/state.h"
#include "main/texcompress.h"
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 9e591d3..e803cb9 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -29,7 +29,6 @@
*/
#include "glheader.h"
-#include "mfeatures.h"
#include "bufferobj.h"
#include "colormac.h"
#include "colortab.h"
diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c
index 00f19ba..b285589 100644
--- a/src/mesa/main/texstorage.c
+++ b/src/mesa/main/texstorage.c
@@ -34,7 +34,6 @@
#include "enums.h"
#include "imports.h"
#include "macros.h"
-#include "mfeatures.h"
#include "teximage.h"
#include "texobj.h"
#include "texstorage.h"
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 0e13d89..d7a8334 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -58,7 +58,6 @@
#include "image.h"
#include "macros.h"
#include "mipmap.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "pack.h"
#include "pbo.h"
diff --git a/src/mesa/main/transformfeedback.c
b/src/mesa/main/transformfeedback.c
index fd4718d..d0118c5 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -35,7 +35,6 @@
#include "context.h"
#include "hash.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "transformfeedback.h"
#include "shaderapi.h"
diff --git a/src/mesa/main/transformfeedback.h
b/src/mesa/main/transformfeedback.h
index c128746..4268757 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -28,7 +28,6 @@
#include <stdbool.h>
#include "compiler.h"
#include "glheader.h"
-#include "mfeatures.h"
#include "mtypes.h"
struct _glapi_table;
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 213b845..427934b 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -33,7 +33,6 @@
#include "hash.h"
#include "image.h"
#include "macros.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "varray.h"
#include "arrayobj.h"
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 904fa1b..8d454df 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -29,7 +29,6 @@
#include "glheader.h"
-#include "mfeatures.h"
struct gl_client_array;
struct gl_context;
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 8669c40..f4298d2 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -30,7 +30,6 @@
#include "api_arrayelt.h"
#include "context.h"
#include "imports.h"
-#include "mfeatures.h"
#include "mtypes.h"
#include "vtxfmt.h"
#include "eval.h"
diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index 16ffb6f..03e1ec0 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -34,7 +34,6 @@
#define _VTXFMT_H_
#include "compiler.h"
-#include "mfeatures.h"
#include "mtypes.h"
extern void _mesa_install_exec_vtxfmt( struct gl_context *ctx, const
GLvertexformat *vfmt );
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index fb0aeb7..e9ee23e 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -32,7 +32,6 @@
#include "main/glheader.h"
#include "main/context.h"
#include "main/hash.h"
-#include "main/mfeatures.h"
#include "program.h"
#include "prog_cache.h"
#include "prog_parameter.h"
diff --git a/src/mesa/state_tracker/st_draw_feedback.c
b/src/mesa/state_tracker/st_draw_feedback.c
index ae87fb2..cdad2d9 100644
--- a/src/mesa/state_tracker/st_draw_feedback.c
+++ b/src/mesa/state_tracker/st_draw_feedback.c
@@ -28,7 +28,6 @@
#include "main/imports.h"
#include "main/image.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "vbo/vbo.h"
diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h
index 1ff6ec0..c30ac11 100644
--- a/src/mesa/vbo/vbo_context.h
+++ b/src/mesa/vbo/vbo_context.h
@@ -51,7 +51,6 @@
#ifndef _VBO_CONTEXT_H
#define _VBO_CONTEXT_H
-#include "main/mfeatures.h"
#include "vbo.h"
#include "vbo_attrib.h"
#include "vbo_exec.h"
diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h
index 96cf4c8..9fc8791 100644
--- a/src/mesa/vbo/vbo_exec.h
+++ b/src/mesa/vbo/vbo_exec.h
@@ -34,7 +34,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __VBO_EXEC_H__
#define __VBO_EXEC_H__
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "vbo.h"
#include "vbo_attrib.h"
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 353f8cf..c06e464 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -34,7 +34,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/bufferobj.h"
#include "main/context.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "main/vtxfmt.h"
#include "main/dlist.h"
#include "main/eval.h"
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 9529ce0..66cdb5f 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -30,7 +30,6 @@
#include "main/compiler.h"
#include "main/context.h"
#include "main/enums.h"
-#include "main/mfeatures.h"
#include "main/state.h"
#include "main/vtxfmt.h"
diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c
index 2f22002..19b9a43 100644
--- a/src/mesa/vbo/vbo_noop.c
+++ b/src/mesa/vbo/vbo_noop.c
@@ -34,7 +34,6 @@
#include "main/dispatch.h"
#include "main/dlist.h"
#include "main/eval.h"
-#include "main/mfeatures.h"
#include "vbo/vbo_noop.h"
static void GLAPIENTRY
diff --git a/src/mesa/vbo/vbo_noop.h b/src/mesa/vbo/vbo_noop.h
index 044d373..f39faaa 100644
--- a/src/mesa/vbo/vbo_noop.h
+++ b/src/mesa/vbo/vbo_noop.h
@@ -26,7 +26,6 @@
#define _API_NOOP_H
-#include "main/mfeatures.h"
#include "main/mtypes.h"
diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c
index ad11b5d..d4b3898 100644
--- a/src/mesa/vbo/vbo_save.c
+++ b/src/mesa/vbo/vbo_save.c
@@ -29,7 +29,6 @@
#include "main/mtypes.h"
#include "main/bufferobj.h"
#include "main/imports.h"
-#include "main/mfeatures.h"
#include "vbo_context.h"
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h
index 750117b..c1108ca 100644
--- a/src/mesa/vbo/vbo_save.h
+++ b/src/mesa/vbo/vbo_save.h
@@ -34,7 +34,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef VBO_SAVE_H
#define VBO_SAVE_H
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "vbo.h"
#include "vbo_attrib.h"
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 7490717..6e833d5 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -74,7 +74,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "main/enums.h"
#include "main/eval.h"
#include "main/macros.h"
-#include "main/mfeatures.h"
#include "main/api_validate.h"
#include "main/api_arrayelt.h"
#include "main/vtxfmt.h"
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index efb386e..e5f2d71 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -30,7 +30,6 @@
#include "main/bufferobj.h"
#include "main/context.h"
#include "main/imports.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/macros.h"
#include "main/light.h"
diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c
index 98772be..25d4c51 100644
--- a/src/mesa/vbo/vbo_save_loopback.c
+++ b/src/mesa/vbo/vbo_save_loopback.c
@@ -29,7 +29,6 @@
#include "main/glheader.h"
#include "main/enums.h"
#include "main/imports.h"
-#include "main/mfeatures.h"
#include "main/mtypes.h"
#include "main/dispatch.h"
#include "glapi/glapi.h"
--
1.7.3.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
