Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3677781 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

am b8d20d02: Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1 

* commit 'b8d20d028ca590f6a9c57e0e8fee5e5f80e9ae54':
  EGL: Use cache sizes defined in the BoardConfig
parents f59fa92c e011aa2b

opengl/libs/Android.mk

+8 −1
Original line number Diff line number Diff line
@@ -44,10 +44,17 @@ ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true) 
  LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER

endif



ifneq ($(MAX_EGL_CACHE_ENTRY_SIZE),)

  LOCAL_CFLAGS += -DMAX_EGL_CACHE_ENTRY_SIZE=$(MAX_EGL_CACHE_ENTRY_SIZE)

endif



ifneq ($(MAX_EGL_CACHE_SIZE),)

  LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE)

endif



include $(BUILD_SHARED_LIBRARY)

installed_libEGL := $(LOCAL_INSTALLED_MODULE)





# OpenGL drivers config file

ifneq ($(BOARD_EGL_CFG),)

opengl/libs/EGL/egl_cache.cpp

+10 −2
Original line number Diff line number Diff line
@@ -25,10 +25,18 @@ 
#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_SIZE

#define MAX_EGL_CACHE_SIZE (64 * 1024);

#endif



// Cache size limits.

static const size_t maxKeySize = 1024;

static const size_t maxValueSize = 4096;

static const size_t maxTotalSize = 64 * 1024;

static const size_t maxValueSize = MAX_EGL_CACHE_ENTRY_SIZE;

static const size_t maxTotalSize = MAX_EGL_CACHE_SIZE;



// Cache file header

static const char* cacheFileMagic = "EGL$";