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

Merge "Fix rendering issues in Movie Studio." into honeycomb

Browse Source
This commit is contained in:
Romain Guy
2011-01-24 20:20:50 -08:00
committed by Android (Google) Code Review
parent 68b29902c0 d88f54c5c4
commit 92dcf629e1
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/view/HardwareRenderer.java
View File

@ -232,6 +232,10 @@ public abstract class HardwareRenderer {
private static final int EGL_SURFACE_TYPE = 0x3033; private static final int EGL_SURFACE_TYPE = 0x3033;
private static final int EGL_SWAP_BEHAVIOR_PRESERVED_BIT = 0x0400; private static final int EGL_SWAP_BEHAVIOR_PRESERVED_BIT = 0x0400;
private static final int SURFACE_STATE_ERROR = 0;
private static final int SURFACE_STATE_SUCCESS = 1;
private static final int SURFACE_STATE_UPDATED = 2;
static EGLContext sEglContext; static EGLContext sEglContext;
static EGL10 sEgl; static EGL10 sEgl;
static EGLDisplay sEglDisplay; static EGLDisplay sEglDisplay;
@ -535,7 +539,13 @@ public abstract class HardwareRenderer {
startTime = SystemClock.elapsedRealtime(); startTime = SystemClock.elapsedRealtime();
} }
if (checkCurrent()) { final int surfaceState = checkCurrent();
if (surfaceState != SURFACE_STATE_ERROR) {
// We had to change the current surface and/or context, redraw everything
if (surfaceState == SURFACE_STATE_UPDATED) {
dirty = null;
}
onPreDraw(dirty); onPreDraw(dirty);
HardwareCanvas canvas = mCanvas; HardwareCanvas canvas = mCanvas;
@ -588,7 +598,7 @@ public abstract class HardwareRenderer {
} }
} }
private boolean checkCurrent() { private int checkCurrent() {
// TODO: Don't check the current context when we have one per UI thread // TODO: Don't check the current context when we have one per UI thread
// TODO: Use a threadlocal flag to know whether the surface has changed // TODO: Use a threadlocal flag to know whether the surface has changed
if (sEgl.eglGetCurrentContext() != sEglContext || if (sEgl.eglGetCurrentContext() != sEglContext ||
@ -597,10 +607,12 @@ public abstract class HardwareRenderer {
fallback(true); fallback(true);
Log.e(LOG_TAG, "eglMakeCurrent failed " + Log.e(LOG_TAG, "eglMakeCurrent failed " +
getEGLErrorString(sEgl.eglGetError())); getEGLErrorString(sEgl.eglGetError()));
return false; return SURFACE_STATE_ERROR;
} else {
return SURFACE_STATE_UPDATED;
} }
} }
return true; return SURFACE_STATE_SUCCESS;
} }
static abstract class EglConfigChooser { static abstract class EglConfigChooser {
@ -673,6 +685,7 @@ public abstract class HardwareRenderer {
ComponentSizeChooser(int glVersion, int redSize, int greenSize, int blueSize, ComponentSizeChooser(int glVersion, int redSize, int greenSize, int blueSize,
int alphaSize, int depthSize, int stencilSize) { int alphaSize, int depthSize, int stencilSize) {
//noinspection PointlessBitwiseExpression
super(glVersion, new int[] { super(glVersion, new int[] {
EGL10.EGL_RED_SIZE, redSize, EGL10.EGL_RED_SIZE, redSize,
EGL10.EGL_GREEN_SIZE, greenSize, EGL10.EGL_GREEN_SIZE, greenSize,