mesa: Only compile ES files when ES1 or ES2 are selected

This still requieres manual generation of the es1 and es2 glapis and is
disabled by default.

diff --git a/configs/autoconf.in b/configs/autoconf.in
index eeb99780bec06bfffe60106f4f2024d5ccd8bf53..119aadb6d4f2e0bf55f2523ea58ce5a08eef64ac 100644 (file)
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -33,9 +33,10 @@ LLVM_LDFLAGS = @LLVM_LDFLAGS@
 LLVM_LIBS = @LLVM_LIBS@
 
 
-# Assembler
+# Source selection
 MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
 GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@
+ES_SOURCES = @ES1_SOURCES@ @ES2_SOURCES@
 
 # Misc tools and flags
 MAKE = @MAKE@

diff --git a/configure.ac b/configure.ac
index 2811ec9e40875df8a06eafdc625cd890ba493283..ef8a7eef82bc699c44e395489f6897226c75e8ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -745,6 +745,8 @@ AC_ARG_ENABLE([gles2],
 
 API_DEFINES=""
 APIS=""
+ES1_SOURCES=""
+ES2_SOURCES=""
 if test "x$enable_opengl" = xno; then
     API_DEFINES="$API_DEFINES -DFEATURE_GL=0"
 else
@@ -754,16 +756,20 @@ fi
 if test "x$enable_gles1" = xyes; then
     API_DEFINES="$API_DEFINES -DFEATURE_ES1=1"
     APIS="$APIS es1"
+    ES1_SOURCES='$(ES1_SOURCES)'
 fi
 if test "x$enable_gles2" = xyes; then
     API_DEFINES="$API_DEFINES -DFEATURE_ES2=1"
     APIS="$APIS es2"
+    ES2_SOURCES='$(ES2_SOURCES)'
 fi
 if test "x$enable_gles1" = xyes -o "x$enable_gles2"; then
     SRC_DIRS="$SRC_DIRS gles"
 fi
 AC_SUBST([API_DEFINES])
 AC_SUBST([APIS])
+AC_SUBST([ES1_SOURCES])
+AC_SUBST([ES2_SOURCES])
 
 dnl If $with_dri_drivers is yes, directories will be added through
 dnl platform checks

diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 3b2dcad885805c2002f32986875abb87e6b743f6..be859e43256bd2183a123cdcd8f0c1f66a95c937 100644 (file)
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -1,10 +1,16 @@
 ### Lists of source files, included by Makefiles
 
+ES1_SOURCES = \
+       main/api_exec_es1.c \
+       main/get_es1.c
+
+ES2_SOURCES = \
+       main/api_exec_es2.c \
+       main/get_es2.c
+
 MAIN_SOURCES = \
        main/api_arrayelt.c \
        main/api_exec.c \
-       main/api_exec_es1.c \
-       main/api_exec_es2.c \
        main/api_loopback.c \
        main/api_noop.c \
        main/api_validate.c \
@@ -40,8 +46,6 @@ MAIN_SOURCES = \
        main/formats.c \
        main/framebuffer.c \
        main/get.c \
-       main/get_es1.c \
-       main/get_es2.c \
        main/getstring.c \
        main/hash.c \
        main/hint.c \
@@ -91,7 +95,8 @@ MAIN_SOURCES = \
        main/varray.c \
        main/version.c \
        main/viewport.c \
-       main/vtxfmt.c
+       main/vtxfmt.c \
+       $(ES_SOURCES)
 
 GLAPI_SOURCES = \
        glapi/glapi.c \