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

am 21e799ed: am e9e50b57: Merge change I7136220b into eclair

Browse Source 
Merge commit '21e799ed62d4fca56fc472acef2995fa2235c0c1' into eclair-mr2-plus-aosp

* commit '21e799ed62d4fca56fc472acef2995fa2235c0c1':
  Fix egl cleanup code on context teardown.
This commit is contained in:
Jason Sams
2009-10-29 01:44:47 -07:00
committed by Android Git Automerger
parent 4f049475c7 21e799ed62
commit 3c249da7ea
2 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
libs/rs/rsContext.cpp
View File

@ -30,8 +30,21 @@ using namespace android::renderscript;
pthread_key_t Context::gThreadTLSKey = 0;
uint32_t Context::gThreadTLSKeyCount = 0;
uint32_t Context::gGLContextCount = 0;
pthread_mutex_t Context::gInitMutex = PTHREAD_MUTEX_INITIALIZER;
static void checkEglError(const char* op, EGLBoolean returnVal = EGL_TRUE) {
if (returnVal != EGL_TRUE) {
fprintf(stderr, "%s() returned %d\n", op, returnVal);
}
for (EGLint error = eglGetError(); error != EGL_SUCCESS; error
= eglGetError()) {
fprintf(stderr, "after %s() eglError %s (0x%x)\n", op, EGLUtils::strerror(error),
error);
}
}
void Context::initEGL()
{
mEGL.mNumConfigs = -1;
@ -61,7 +74,10 @@ void Context::initEGL()
LOGV("initEGL start");
mEGL.mDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
checkEglError("eglGetDisplay");
eglInitialize(mEGL.mDisplay, &mEGL.mMajorVersion, &mEGL.mMinorVersion);
checkEglError("eglInitialize");
status_t err = EGLUtils::selectConfigForNativeWindow(mEGL.mDisplay, configAttribs, mWndSurface, &mEGL.mConfig);
if (err) {
@ -76,9 +92,24 @@ void Context::initEGL()
android_createDisplaySurface(),
NULL);
}
checkEglError("eglCreateWindowSurface");
if (mEGL.mSurface == EGL_NO_SURFACE) {
LOGE("eglCreateWindowSurface returned EGL_NO_SURFACE");
}
mEGL.mContext = eglCreateContext(mEGL.mDisplay, mEGL.mConfig, EGL_NO_CONTEXT, NULL);
checkEglError("eglCreateContext");
if (mEGL.mContext == EGL_NO_CONTEXT) {
LOGE("eglCreateContext returned EGL_NO_CONTEXT");
}
gGLContextCount++;
EGLBoolean ret = eglMakeCurrent(mEGL.mDisplay, mEGL.mSurface, mEGL.mSurface, mEGL.mContext);
checkEglError("eglCreateContext", ret);
if (mEGL.mContext == EGL_NO_CONTEXT) {
LOGE("eglCreateContext returned EGL_NO_CONTEXT");
}
mEGL.mContext = eglCreateContext(mEGL.mDisplay, mEGL.mConfig, NULL, NULL);
eglMakeCurrent(mEGL.mDisplay, mEGL.mSurface, mEGL.mSurface, mEGL.mContext);
eglQuerySurface(mEGL.mDisplay, mEGL.mSurface, EGL_WIDTH, &mEGL.mWidth);
eglQuerySurface(mEGL.mDisplay, mEGL.mSurface, EGL_HEIGHT, &mEGL.mHeight);
@ -101,6 +132,24 @@ void Context::initEGL()
}
}
void Context::deinitEGL()
{
EGLBoolean ret = eglMakeCurrent(mEGL.mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
checkEglError("eglCreateContext", ret);
if (mEGL.mContext == EGL_NO_CONTEXT) {
LOGE("eglCreateContext returned EGL_NO_CONTEXT");
}
eglDestroyContext(mEGL.mDisplay, mEGL.mContext);
checkEglError("eglDestroyContext");
gGLContextCount--;
if (!gGLContextCount) {
eglTerminate(mEGL.mDisplay);
}
}
bool Context::runScript(Script *s, uint32_t launchID)
{
ObjectBaseRef<ProgramFragment> frag(mFragment);
@ -232,7 +281,9 @@ void * Context::threadProc(void *vrsc)
rsc->props.mLogScripts = getProp("debug.rs.script");
rsc->props.mLogObjects = getProp("debug.rs.objects");
pthread_mutex_lock(&gInitMutex);
rsc->initEGL();
pthread_mutex_unlock(&gInitMutex);
ScriptTLSStruct *tlsStruct = new ScriptTLSStruct;
if (!tlsStruct) {
@ -294,7 +345,11 @@ void * Context::threadProc(void *vrsc)
glClearColor(0,0,0,0);
glClear(GL_COLOR_BUFFER_BIT);
eglSwapBuffers(rsc->mEGL.mDisplay, rsc->mEGL.mSurface);
eglTerminate(rsc->mEGL.mDisplay);
pthread_mutex_lock(&gInitMutex);
rsc->deinitEGL();
pthread_mutex_unlock(&gInitMutex);
rsc->objDestroyOOBRun();
LOGV("RS Thread exited");
return NULL;

2
libs/rs/rsContext.h
View File

@ -54,6 +54,7 @@ public:
static pthread_key_t gThreadTLSKey;
static uint32_t gThreadTLSKeyCount;
static uint32_t gGLContextCount;
static pthread_mutex_t gInitMutex;
struct ScriptTLSStruct {
@ -215,6 +216,7 @@ private:
Context();
void initEGL();
void deinitEGL();
bool runRootScript();