diff options
| -rw-r--r-- | opengl/libs/Android.mk | 12 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl_cache.cpp | 18 |
2 files changed, 3 insertions, 27 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index 4f7c7e456f..ceabf26d6a 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -42,18 +42,6 @@ LOCAL_CFLAGS += -DLOG_TAG=\"libEGL\" LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -fvisibility=hidden -ifneq ($(MAX_EGL_CACHE_ENTRY_SIZE),) - LOCAL_CFLAGS += -DMAX_EGL_CACHE_ENTRY_SIZE=$(MAX_EGL_CACHE_ENTRY_SIZE) -endif - -ifneq ($(MAX_EGL_CACHE_KEY_SIZE),) - LOCAL_CFLAGS += -DMAX_EGL_CACHE_KEY_SIZE=$(MAX_EGL_CACHE_KEY_SIZE) -endif - -ifneq ($(MAX_EGL_CACHE_SIZE),) - LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE) -endif - ifneq ($(filter address,$(SANITIZE_TARGET)),) LOCAL_CFLAGS_32 += -DEGL_WRAPPER_DIR=\"/$(TARGET_COPY_OUT_DATA)/lib\" LOCAL_CFLAGS_64 += -DEGL_WRAPPER_DIR=\"/$(TARGET_COPY_OUT_DATA)/lib64\" diff --git a/opengl/libs/EGL/egl_cache.cpp b/opengl/libs/EGL/egl_cache.cpp index 8c135c81eb..1fe322dc9f 100644 --- a/opengl/libs/EGL/egl_cache.cpp +++ b/opengl/libs/EGL/egl_cache.cpp @@ -27,22 +27,10 @@ #include <sys/types.h> #include <unistd.h> -#ifndef MAX_EGL_CACHE_ENTRY_SIZE -#define MAX_EGL_CACHE_ENTRY_SIZE (16 * 1024); -#endif - -#ifndef MAX_EGL_CACHE_KEY_SIZE -#define MAX_EGL_CACHE_KEY_SIZE (1024); -#endif - -#ifndef MAX_EGL_CACHE_SIZE -#define MAX_EGL_CACHE_SIZE (64 * 1024); -#endif - // Cache size limits. -static const size_t maxKeySize = MAX_EGL_CACHE_KEY_SIZE; -static const size_t maxValueSize = MAX_EGL_CACHE_ENTRY_SIZE; -static const size_t maxTotalSize = MAX_EGL_CACHE_SIZE; +static const size_t maxKeySize = 12 * 1024; +static const size_t maxValueSize = 64 * 1024; +static const size_t maxTotalSize = 2 * 1024 * 1024; // Cache file header static const char* cacheFileMagic = "EGL$"; |