8 files changed, 37 insertions, 15 deletions
diff --git a/src/mesa/es/Makefile b/src/mesa/es/Makefile
index cdd770f7d86..d5d21c03796 100644
--- a/src/mesa/es/Makefile
+++ b/src/mesa/es/Makefile
@@ -1,5 +1,7 @@
 # src/mesa/es/Makefile
 #
+# TODO Merge back to core mesa
+#
 TOP := ../../..
 MESA := ..
 
@@ -24,14 +26,6 @@ ES2_OBJ_DIR := objs-es2
 
 include $(MESA)/sources.mak
 
-# TODO Make core mesa more feature-aware and remove the omit list
-VBO_OMITTED :=				\
-	vbo/vbo_save.c			\
-	vbo/vbo_save_api.c		\
-	vbo/vbo_save_draw.c		\
-	vbo/vbo_save_loopback.c
-VBO_SOURCES := $(filter-out $(VBO_OMITTED), $(VBO_SOURCES))
-
 # adjust source dir
 ES_SOURCES := $(addprefix $(MESA)/, $(MESA_SOURCES))
 ES_GALLIUM_SOURCES := $(addprefix $(MESA)/, $(MESA_GALLIUM_SOURCES))
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index 13148fc3e22..580850574c9 100644
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -198,10 +198,8 @@ GLboolean _vbo_CreateContext( GLcontext *ctx )
     * vtxfmt mechanism can be removed now.
     */
    vbo_exec_init( ctx );
-#if FEATURE_dlist
    if (ctx->API == API_OPENGL)
       vbo_save_init( ctx );
-#endif
 
    _math_init_eval();
 
@@ -233,10 +231,8 @@ void _vbo_DestroyContext( GLcontext *ctx )
       }
 
       vbo_exec_destroy(ctx);
-#if FEATURE_dlist
       if (ctx->API == API_OPENGL)
          vbo_save_destroy(ctx);
-#endif
       FREE(vbo);
       ctx->swtnl_im = NULL;
    }
diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h
index 8b726dc8ac5..00cfc522a0d 100644
--- a/src/mesa/vbo/vbo_context.h
+++ b/src/mesa/vbo/vbo_context.h
@@ -54,9 +54,7 @@
 #include "vbo.h"
 #include "vbo_attrib.h"
 #include "vbo_exec.h"
-#if FEATURE_dlist
 #include "vbo_save.h"
-#endif
 
 
 struct vbo_context {
diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c
index fd9a1302705..dd5570689e7 100644
--- a/src/mesa/vbo/vbo_save.c
+++ b/src/mesa/vbo/vbo_save.c
@@ -33,6 +33,8 @@
 #include "vbo_context.h"
 
 
+#if FEATURE_dlist
+
 
 static void vbo_save_callback_init( GLcontext *ctx )
 {
@@ -117,3 +119,4 @@ void vbo_save_fallback( GLcontext *ctx, GLboolean fallback )
 }
 
 
+#endif /* FEATURE_dlist */
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h
index 86bbd24f7b1..82ba6c8afe7 100644
--- a/src/mesa/vbo/vbo_save.h
+++ b/src/mesa/vbo/vbo_save.h
@@ -153,6 +153,7 @@ struct vbo_save_context {
    GLubyte *currentsz[VBO_ATTRIB_MAX];
 };
 
+#if FEATURE_dlist
 
 void vbo_save_init( GLcontext *ctx );
 void vbo_save_destroy( GLcontext *ctx );
@@ -181,4 +182,18 @@ void vbo_save_playback_vertex_list( GLcontext *ctx, void *data );
 
 void vbo_save_api_init( struct vbo_save_context *save );
 
-#endif
+#else /* FEATURE_dlist */
+
+static INLINE void
+vbo_save_init( GLcontext *ctx )
+{
+}
+
+static INLINE void
+vbo_save_destroy( GLcontext *ctx )
+{
+}
+
+#endif /* FEATURE_dlist */
+
+#endif /* VBO_SAVE_H */
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index c867cb03f63..c3727cb52ac 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -83,6 +83,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "vbo_context.h"
 
 
+#if FEATURE_dlist
+
+
 #ifdef ERROR
 #undef ERROR
 #endif
@@ -1263,3 +1266,5 @@ void vbo_save_api_init( struct vbo_save_context *save )
    _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
 }
 
+
+#endif /* FEATURE_dlist */
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index a7cf29acd4f..148ea283312 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -38,6 +38,9 @@
 #include "vbo_context.h"
 
 
+#if FEATURE_dlist
+
+
 /*
  * After playback, copy everything but the position from the
  * last vertex to the saved state
@@ -288,3 +291,6 @@ void vbo_save_playback_vertex_list( GLcontext *ctx, void *data )
     */
    _playback_copy_to_current( ctx, node );
 }
+
+
+#endif /* FEATURE_dlist */
diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c
index 3f581ea02da..5d1c7e48102 100644
--- a/src/mesa/vbo/vbo_save_loopback.c
+++ b/src/mesa/vbo/vbo_save_loopback.c
@@ -36,6 +36,8 @@
 #include "vbo_context.h"
 
 
+#if FEATURE_dlist
+
 
 typedef void (*attr_func)( GLcontext *ctx, GLint target, const GLfloat * );
 
@@ -188,3 +190,6 @@ void vbo_loopback_vertex_list( GLcontext *ctx,
       }
    }
 }
+
+
+#endif /* FEATURE_dlist */