summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2010-05-11 13:20:40 +0800
committerChia-I Wu <olv@lunarg.com>2010-05-12 12:12:56 +0800
commitb093016bd0660cc4ac6142aa8d4d6add5b6bfce8 (patch)
tree75b37b0c29ea2ae746542a979314d31027096bb5 /src/mesa/state_tracker
parent903986ca128d51ff031cc9eafa1976618834a8de (diff)
mesa: Make FEATURE_EXT_transform_feedback more modular.
This allows transformfeedback.h and st_cb_xformfb.h to be included and used without knowing if FEATURE_EXT_transform_feedback is enabled. Fix build of ES overlay.
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_cb_xformfb.c4
-rw-r--r--src/mesa/state_tracker/st_cb_xformfb.h10
-rw-r--r--src/mesa/state_tracker/st_context.c4
3 files changed, 14 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_cb_xformfb.c b/src/mesa/state_tracker/st_cb_xformfb.c
index fb48b57eb5..749e88e8db 100644
--- a/src/mesa/state_tracker/st_cb_xformfb.c
+++ b/src/mesa/state_tracker/st_cb_xformfb.c
@@ -40,6 +40,8 @@
#include "st_cb_xformfb.h"
+#if FEATURE_EXT_transform_feedback
+
#if 0
static struct gl_transform_feedback_object *
st_new_transform_feedback(GLcontext *ctx, GLuint name)
@@ -127,3 +129,5 @@ st_init_xformfb_functions(struct dd_function_table *functions)
functions->ResumeTransformFeedback = st_resume_transform_feedback;
functions->DrawTransformFeedback = st_draw_transform_feedback;
}
+
+#endif /* FEATURE_EXT_transform_feedback */
diff --git a/src/mesa/state_tracker/st_cb_xformfb.h b/src/mesa/state_tracker/st_cb_xformfb.h
index d6c354e5a5..50efcb9293 100644
--- a/src/mesa/state_tracker/st_cb_xformfb.h
+++ b/src/mesa/state_tracker/st_cb_xformfb.h
@@ -29,8 +29,18 @@
#define ST_CB_XFORMFB_H
+#if FEATURE_EXT_transform_feedback
+
extern void
st_init_xformfb_functions(struct dd_function_table *functions);
+#else
+
+static INLINE void
+st_init_xformfb_functions(struct dd_function_table *functions)
+{
+}
+
+#endif /* FEATURE_EXT_transform_feedback */
#endif /* ST_CB_XFORMFB_H */
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 93406141f6..806f8777f2 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -54,9 +54,7 @@
#include "st_cb_queryobj.h"
#include "st_cb_readpixels.h"
#include "st_cb_texture.h"
-#if FEATURE_EXT_transform_feedback
#include "st_cb_xformfb.h"
-#endif
#include "st_cb_flush.h"
#include "st_cb_strings.h"
#include "st_atom.h"
@@ -338,9 +336,7 @@ void st_init_driver_functions(struct dd_function_table *functions)
st_init_flush_functions(functions);
st_init_string_functions(functions);
-#if FEATURE_EXT_transform_feedback
st_init_xformfb_functions(functions);
-#endif
functions->UpdateState = st_invalidate_state;
}