Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
---
src/mesa/main/api_loopback.c | 4 ++--
src/mesa/main/api_loopback.h | 6 +++---
src/mesa/main/mfeatures.h | 4 +---
src/mesa/main/vtxfmt.c | 4 ++--
src/mesa/main/vtxfmt.h | 6 +++---
src/mesa/vbo/vbo_exec.h | 6 +++---
src/mesa/vbo/vbo_exec_api.c | 6 +++---
src/mesa/vbo/vbo_exec_draw.c | 4 ++--
src/mesa/vbo/vbo_noop.c | 4 ++--
src/mesa/vbo/vbo_noop.h | 4 ++--
10 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index c438307..f917c9a 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -86,7 +86,7 @@
#define ATTRIBI_4UI(index,x,y,z,w) CALL_VertexAttribI4uiEXT(GET_DISPATCH(),
(index,x,y,z,w))
-#if FEATURE_beginend
+#if FEATURE_GL
static void GLAPIENTRY
@@ -1722,4 +1722,4 @@ _mesa_loopback_init_api_table( struct _glapi_table *dest )
}
-#endif /* FEATURE_beginend */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index f53b902..9acf9fb 100644
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -32,17 +32,17 @@
struct _glapi_table;
-#if FEATURE_beginend
+#if FEATURE_GL
extern void _mesa_loopback_init_api_table( struct _glapi_table *dest );
-#else /* FEATURE_beginend */
+#else /* FEATURE_GL */
static inline void
_mesa_loopback_init_api_table( struct _glapi_table *dest )
{
}
-#endif /* FEATURE_beginend */
+#endif /* FEATURE_GL */
#endif /* API_LOOPBACK_H */
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 62bb97b..cf652ad 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,11 +84,9 @@
#define FEATURE_remap_table 0
#endif
-/* this disables vtxfmt, api_loopback, and api_noop completely */
-#define FEATURE_beginend FEATURE_GL
#define FEATURE_colortable FEATURE_GL
#define FEATURE_convolve FEATURE_GL
-#define FEATURE_dlist (FEATURE_GL && FEATURE_beginend)
+#define FEATURE_dlist FEATURE_GL
#define FEATURE_draw_read_buffer FEATURE_GL
#define FEATURE_drawpix FEATURE_GL
#define FEATURE_evaluators FEATURE_GL
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 2b6e25e..a14f403 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -38,7 +38,7 @@
#include "main/dispatch.h"
-#if FEATURE_beginend
+#if FEATURE_GL
/**
* Use the per-vertex functions found in <vfmt> to initialize the given
@@ -237,4 +237,4 @@ _mesa_install_save_vtxfmt(struct gl_context *ctx, const
GLvertexformat *vfmt)
}
-#endif /* FEATURE_beginend */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index aac6568..51cd10a 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -37,12 +37,12 @@
#include "mfeatures.h"
#include "mtypes.h"
-#if FEATURE_beginend
+#if FEATURE_GL
extern void _mesa_install_exec_vtxfmt( struct gl_context *ctx, const
GLvertexformat *vfmt );
extern void _mesa_install_save_vtxfmt( struct gl_context *ctx, const
GLvertexformat *vfmt );
-#else /* FEATURE_beginend */
+#else /* FEATURE_GL */
static inline void
_mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
@@ -54,6 +54,6 @@ _mesa_install_save_vtxfmt( struct gl_context *ctx, const
GLvertexformat *vfmt )
{
}
-#endif /* FEATURE_beginend */
+#endif /* FEATURE_GL */
#endif /* _VTXFMT_H_ */
diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h
index 4ac7d16..719eebb 100644
--- a/src/mesa/vbo/vbo_exec.h
+++ b/src/mesa/vbo/vbo_exec.h
@@ -160,12 +160,12 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec );
void vbo_exec_vtx_destroy( struct vbo_exec_context *exec );
-#if FEATURE_beginend
+#if FEATURE_GL
void vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap );
void vbo_exec_vtx_map( struct vbo_exec_context *exec );
-#else /* FEATURE_beginend */
+#else /* FEATURE_GL */
static inline void
vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )
@@ -177,7 +177,7 @@ vbo_exec_vtx_map( struct vbo_exec_context *exec )
{
}
-#endif /* FEATURE_beginend */
+#endif /* FEATURE_GL */
void vbo_exec_vtx_wrap( struct vbo_exec_context *exec );
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index ded711b..8248eae 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -550,7 +550,7 @@ vbo_exec_FlushVertices_internal(struct vbo_exec_context
*exec, GLboolean unmap)
}
-#if FEATURE_beginend
+#if FEATURE_GL
#if FEATURE_evaluators
@@ -1048,7 +1048,7 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context
*exec )
}
-#else /* FEATURE_beginend */
+#else /* FEATURE_GL */
static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
@@ -1113,7 +1113,7 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context
*exec )
}
-#endif /* FEATURE_beginend */
+#endif /* FEATURE_GL */
/**
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 77db8ec..32d0fda 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -38,7 +38,7 @@
#include "vbo_noop.h"
-#if FEATURE_beginend
+#if FEATURE_GL
static void
@@ -443,4 +443,4 @@ vbo_exec_vtx_flush(struct vbo_exec_context *exec, GLboolean
keepUnmapped)
}
-#endif /* FEATURE_beginend */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c
index 2f472c2..9e01b04 100644
--- a/src/mesa/vbo/vbo_noop.c
+++ b/src/mesa/vbo/vbo_noop.c
@@ -37,7 +37,7 @@
#include "main/mfeatures.h"
#include "vbo/vbo_noop.h"
-#if FEATURE_beginend
+#if FEATURE_GL
static void GLAPIENTRY
@@ -516,4 +516,4 @@ _mesa_using_noop_vtxfmt(const struct _glapi_table *dispatch)
}
-#endif /* FEATURE_beginend */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/vbo/vbo_noop.h b/src/mesa/vbo/vbo_noop.h
index 92f61d3..f137e33 100644
--- a/src/mesa/vbo/vbo_noop.h
+++ b/src/mesa/vbo/vbo_noop.h
@@ -30,7 +30,7 @@
#include "main/mtypes.h"
-#if FEATURE_beginend
+#if FEATURE_GL
extern void
_mesa_noop_vtxfmt_init(GLvertexformat *vfmt);
@@ -45,7 +45,7 @@ _mesa_noop_vtxfmt_init(GLvertexformat *vfmt)
{
}
-#endif /* FEATURE_beginend */
+#endif /* FEATURE_GL */
#endif /* _API_NOOP_H */
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
