diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-09-12 15:54:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-12 15:54:39 -0700 |
| commit | e45b01f575e877b463ca2d2b124633c3a8997e82 (patch) | |
| tree | 277a6727887011c6c0620625d98c3831e2e6ccb1 | |
| parent | 2c7c8ba56ad9c0c08fde6f86771475f03a03e6fd (diff) | |
| parent | f478e6d18cb9eba1ded1f124ce16a899d271689e (diff) | |
| download | frameworks_native-e45b01f575e877b463ca2d2b124633c3a8997e82.zip frameworks_native-e45b01f575e877b463ca2d2b124633c3a8997e82.tar.gz frameworks_native-e45b01f575e877b463ca2d2b124633c3a8997e82.tar.bz2 | |
Merge "EGL: make max cache key size BoardConfig-able" into jb-mr1-dev
| -rw-r--r-- | opengl/libs/Android.mk | 4 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl_cache.cpp | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index eea79f8..31bfcd7 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -57,6 +57,10 @@ 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 diff --git a/opengl/libs/EGL/egl_cache.cpp b/opengl/libs/EGL/egl_cache.cpp index ed2bef3..72655df 100644 --- a/opengl/libs/EGL/egl_cache.cpp +++ b/opengl/libs/EGL/egl_cache.cpp @@ -29,12 +29,16 @@ #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 = 1024; +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; |