From 26a26e9992d243dbdcd2f7f9a47723fe5cf060d2 Mon Sep 17 00:00:00 2001
From: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Date: Tue, 11 Sep 2012 09:16:33 +0300
Subject: mesa: remove FEATURE_feedback define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---
 src/mesa/main/feedback.c  |  6 ------
 src/mesa/main/feedback.h  | 37 -------------------------------------
 src/mesa/main/mfeatures.h |  1 -
 3 files changed, 44 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index f95e3b5d459..8a63acdf1c6 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -40,9 +40,6 @@
 #include "main/dispatch.h"
 
 
-#if FEATURE_feedback
-
-
 #define FB_3D		0x01
 #define FB_4D		0x02
 #define FB_COLOR	0x04
@@ -515,9 +512,6 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp)
 }
 
 
-#endif /* FEATURE_feedback */
-
-
 /**********************************************************************/
 /** \name Initialization */
 /*@{*/
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index c64db31344a..cc4cf15a833 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -31,8 +31,6 @@
 #include "main/mtypes.h"
 
 
-#if FEATURE_feedback
-
 extern GLint GLAPIENTRY
 _mesa_RenderMode( GLenum mode );
 
@@ -60,41 +58,6 @@ _mesa_update_hitflag( struct gl_context *ctx, GLfloat z );
 extern void
 _mesa_init_feedback_dispatch(struct _glapi_table *disp);
 
-#else /* FEATURE_feedback */
-
-#include "main/compiler.h"
-
-static inline void
-_mesa_feedback_vertex( struct gl_context *ctx,
-                       const GLfloat win[4],
-                       const GLfloat color[4],
-                       const GLfloat texcoord[4] )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-
-static inline void
-_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-static inline void
-_mesa_update_hitflag( struct gl_context *ctx, GLfloat z )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-static inline void
-_mesa_init_feedback_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_feedback */
 
 extern void
 _mesa_init_feedback( struct gl_context *ctx );
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index c1abe8110a7..d604c69ec77 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,7 +84,6 @@
 #define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_feedback                  FEATURE_GL
 #define FEATURE_pixel_transfer            FEATURE_GL
 #define FEATURE_queryobj                  FEATURE_GL
 #define FEATURE_rastpos                   FEATURE_GL
-- 
cgit v1.2.3