Merge "libEGL: Make vendor extensions a device option" into gingerbread

dirtyspark23 · Jul 17, 2011 · f28f826 · f28f826
2 parents 8ae6be2 + e55efa7
commit f28f826
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk
@@ -13,6 +13,10 @@ LOCAL_SRC_FILES:= 	       \
 	EGL/Loader.cpp 	       \
 #
 
+ifneq ($(TARGET_USES_GL_VENDOR_EXTENSIONS),false)
+    LOCAL_CFLAGS += -DENABLE_VENDOR_EXTENSIONS
+endif
+
 LOCAL_SHARED_LIBRARIES += libcutils libutils
 LOCAL_LDLIBS := -lpthread -ldl
 LOCAL_MODULE:= libEGL

diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp
@@ -52,7 +52,6 @@
 // There's also an extra subtlety with the EGLimage entry points in GL, which
 // can't work properly if they're called directly (they have to go through
 // a wrapper).
-#define ENABLE_VENDOR_EXTENSIONS
 
 #define MAKE_CONFIG(_impl, _index)  ((EGLConfig)(((_impl)<<24) | (_index)))
 #define setError(_e, _r) setErrorEtc(__FUNCTION__, __LINE__, _e, _r)