summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2010-03-31 12:44:26 +0800
committerChia-I Wu <olv@lunarg.com>2010-05-12 12:30:22 +0800
commitcc289e22213c5f5fe72602ce81db992bc8f7b1ad (patch)
tree759c035088d88d808704f43335c84dc0d01a318d
parent1975208919a273018a2cda87e765870c5f86d01f (diff)
mesa/es: Update sources.mak and fix the build.
Remove sources that are feature-aware from the omit list. x86 -O0 build is ~12KiB smaller afther making those sources feature-aware. Also, remove get.c from the omit list as get_es[12].c have been merged to it.
-rw-r--r--src/mesa/es/sources.mak18
-rw-r--r--src/mesa/main/api_exec.c6
2 files changed, 8 insertions, 16 deletions
diff --git a/src/mesa/es/sources.mak b/src/mesa/es/sources.mak
index bc479e66eb..e603acd4b1 100644
--- a/src/mesa/es/sources.mak
+++ b/src/mesa/es/sources.mak
@@ -1,3 +1,5 @@
+# TODO Make core mesa more feature-aware and remove this file
+
include $(MESA)/sources.mak
LOCAL_ES1_INCLUDES := \
@@ -8,14 +10,6 @@ LOCAL_ES1_INCLUDES := \
LOCAL_ES2_INCLUDES := $(subst es1,es2, $(LOCAL_ES1_INCLUDES))
# MESA sources
-# Ideally, the omit list should be replaced by features.
-
-MAIN_OMITTED := \
- main/api_exec.c \
- main/condrender.c \
- main/dlopen.c \
- main/get.c
-MAIN_SOURCES := $(filter-out $(MAIN_OMITTED), $(MAIN_SOURCES))
VBO_OMITTED := \
vbo/vbo_save.c \
@@ -24,14 +18,6 @@ VBO_OMITTED := \
vbo/vbo_save_loopback.c
VBO_SOURCES := $(filter-out $(VBO_OMITTED), $(VBO_SOURCES))
-STATETRACKER_OMITTED := \
- state_tracker/st_api.c \
- state_tracker/st_cb_drawpixels.c \
- state_tracker/st_cb_feedback.c \
- state_tracker/st_cb_rasterpos.c \
- state_tracker/st_draw_feedback.c
-STATETRACKER_SOURCES := $(filter-out $(STATETRACKER_OMITTED), $(STATETRACKER_SOURCES))
-
SHADER_OMITTED := \
shader/atifragshader.c
SHADER_SOURCES := $(filter-out $(SHADER_OMITTED), $(SHADER_SOURCES))
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 8fa8887a6c..ad18472dea 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -107,6 +107,10 @@
#endif
#include "main/dispatch.h"
+
+#if FEATURE_GL
+
+
#ifdef _GLAPI_USE_REMAP_TABLE
#define need_MESA_remap_table
@@ -816,3 +820,5 @@ _mesa_create_exec_table(void)
return exec;
}
+
+#endif /* FEATURE_GL */