drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread

Browse Source
This commit is contained in:
Mathias Agopian
2010-10-20 20:04:52 -07:00
committed by Android (Google) Code Review
parent 583fefc8dc 2db76167b1
commit 73655bd2d3
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/rs/Android.mk
View File

@ -102,6 +102,9 @@ LOCAL_SRC_FILES:= \
rsType.cpp \ rsType.cpp \
rsVertexArray.cpp rsVertexArray.cpp
ifeq ($(TARGET_BOARD_PLATFORM), s5pc110)
LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY
endif
LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libGLESv2 libui libacc LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libGLESv2 libui libacc
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl

14
libs/rs/rsContext.cpp
View File

@ -26,6 +26,7 @@
#include <cutils/properties.h> #include <cutils/properties.h>
#include <EGL/eglext.h>
#include <GLES/gl.h> #include <GLES/gl.h>
#include <GLES/glext.h> #include <GLES/glext.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
@ -58,7 +59,18 @@ void Context::initEGL(bool useGL2)
mEGL.mNumConfigs = -1; mEGL.mNumConfigs = -1;
EGLint configAttribs[128]; EGLint configAttribs[128];
EGLint *configAttribsPtr = configAttribs; EGLint *configAttribsPtr = configAttribs;
EGLint context_attribs2[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE }; EGLint context_attribs2[] = { EGL_CONTEXT_CLIENT_VERSION, 2,
EGL_NONE, GL_NONE, EGL_NONE };
#ifdef HAS_CONTEXT_PRIORITY
#ifdef EGL_IMG_context_priority
#warning "using EGL_IMG_context_priority"
if (mThreadPriority > 0) {
context_attribs2[2] = EGL_CONTEXT_PRIORITY_LEVEL_IMG;
context_attribs2[3] = EGL_CONTEXT_PRIORITY_LOW_IMG;
}
#endif
#endif
memset(configAttribs, 0, sizeof(configAttribs)); memset(configAttribs, 0, sizeof(configAttribs));