Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 44b2fe3f: Track canvas clearing for swap buffers logic.

Browse Source 
* commit '44b2fe3fc114ee5f7273c6b0fee2cc999bf244a2':
  Track canvas clearing for swap buffers logic.
This commit is contained in:
Chet Haase
2012-06-07 09:45:16 -07:00
committed by Android Git Automerger
parent 7c5c86d762 44b2fe3fc1
commit ca43c96127
10 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/GLES20Canvas.java
View File

@@ -215,16 +215,17 @@ class GLES20Canvas extends HardwareCanvas {
private static native void nSetViewport(int renderer, int width, int height);
@Override
public void onPreDraw(Rect dirty) {
public int onPreDraw(Rect dirty) {
if (dirty != null) {
nPrepareDirty(mRenderer, dirty.left, dirty.top, dirty.right, dirty.bottom, mOpaque);
return nPrepareDirty(mRenderer, dirty.left, dirty.top, dirty.right, dirty.bottom,
mOpaque);
} else {
nPrepare(mRenderer, mOpaque);
return nPrepare(mRenderer, mOpaque);
}
}
private static native void nPrepare(int renderer, boolean opaque);
private static native void nPrepareDirty(int renderer, int left, int top, int right, int bottom,
private static native int nPrepare(int renderer, boolean opaque);
private static native int nPrepareDirty(int renderer, int left, int top, int right, int bottom,
boolean opaque);
@Override

9
core/java/android/view/HardwareCanvas.java
View File

@@ -41,8 +41,10 @@ public abstract class HardwareCanvas extends Canvas {
* Invoked before any drawing operation is performed in this canvas.
*
* @param dirty The dirty rectangle to update, can be null.
* @return {@link DisplayList#STATUS_DREW} if anything was drawn (such as a call to clear
* the canvas).
*/
public abstract void onPreDraw(Rect dirty);
public abstract int onPreDraw(Rect dirty);
/**
* Invoked after all drawing operation have been performed.
@@ -58,8 +60,9 @@ public abstract class HardwareCanvas extends Canvas {
* @param flags Optional flags about drawing, see {@link DisplayList} for
* the possible flags.
*
* @return One of {@link DisplayList#STATUS_DONE}, {@link DisplayList#STATUS_DRAW} or
* {@link DisplayList#STATUS_INVOKE}
* @return One of {@link DisplayList#STATUS_DONE}, {@link DisplayList#STATUS_DRAW}, or
* {@link DisplayList#STATUS_INVOKE}, or'd with {@link DisplayList#STATUS_DREW}
* if anything was drawn.
*/
public abstract int drawDisplayList(DisplayList displayList, Rect dirty, int flags);

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

@@ -1042,8 +1042,8 @@ public abstract class HardwareRenderer {
return mGl != null && mCanvas != null;
}
void onPreDraw(Rect dirty) {
int onPreDraw(Rect dirty) {
return DisplayList.STATUS_DONE;
}
void onPostDraw() {
@@ -1102,9 +1102,7 @@ public abstract class HardwareRenderer {
}
}
onPreDraw(dirty);
int status = DisplayList.STATUS_DONE;
int status = onPreDraw(dirty);
int saveCount = canvas.save();
callbacks.onHardwarePreDraw(canvas);
@@ -1138,7 +1136,7 @@ public abstract class HardwareRenderer {
drawDisplayListStartTime = System.nanoTime();
}
status = canvas.drawDisplayList(displayList, mRedrawClip,
status |= canvas.drawDisplayList(displayList, mRedrawClip,
DisplayList.FLAG_CLIP_CHILDREN);
if (mProfileEnabled) {
@@ -1372,8 +1370,8 @@ public abstract class HardwareRenderer {
}
@Override
void onPreDraw(Rect dirty) {
mGlCanvas.onPreDraw(dirty);
int onPreDraw(Rect dirty) {
return mGlCanvas.onPreDraw(dirty);
}
@Override

12
core/jni/android_view_GLES20Canvas.cpp
View File

@@ -133,15 +133,15 @@ static void android_view_GLES20Canvas_setViewport(JNIEnv* env, jobject clazz,
renderer->setViewport(width, height);
}
static void android_view_GLES20Canvas_prepare(JNIEnv* env, jobject clazz,
static int android_view_GLES20Canvas_prepare(JNIEnv* env, jobject clazz,
OpenGLRenderer* renderer, jboolean opaque) {
renderer->prepare(opaque);
return renderer->prepare(opaque);
}
static void android_view_GLES20Canvas_prepareDirty(JNIEnv* env, jobject clazz,
static int android_view_GLES20Canvas_prepareDirty(JNIEnv* env, jobject clazz,
OpenGLRenderer* renderer, jint left, jint top, jint right, jint bottom,
jboolean opaque) {
renderer->prepareDirty(left, top, right, bottom, opaque);
return renderer->prepareDirty(left, top, right, bottom, opaque);
}
static void android_view_GLES20Canvas_finish(JNIEnv* env, jobject clazz,
@@ -868,8 +868,8 @@ static JNINativeMethod gMethods[] = {
{ "nCreateRenderer", "()I", (void*) android_view_GLES20Canvas_createRenderer },
{ "nDestroyRenderer", "(I)V", (void*) android_view_GLES20Canvas_destroyRenderer },
{ "nSetViewport", "(III)V", (void*) android_view_GLES20Canvas_setViewport },
{ "nPrepare", "(IZ)V", (void*) android_view_GLES20Canvas_prepare },
{ "nPrepareDirty", "(IIIIIZ)V", (void*) android_view_GLES20Canvas_prepareDirty },
{ "nPrepare", "(IZ)I", (void*) android_view_GLES20Canvas_prepare },
{ "nPrepareDirty", "(IIIIIZ)I", (void*) android_view_GLES20Canvas_prepareDirty },
{ "nFinish", "(I)V", (void*) android_view_GLES20Canvas_finish },
{ "nGetStencilSize", "()I", (void*) android_view_GLES20Canvas_getStencilSize },

3
libs/hwui/DisplayListRenderer.cpp
View File

@@ -1368,13 +1368,14 @@ void DisplayListRenderer::setViewport(int width, int height) {
mHeight = height;
}
void DisplayListRenderer::prepareDirty(float left, float top,
int DisplayListRenderer::prepareDirty(float left, float top,
float right, float bottom, bool opaque) {
mSnapshot = new Snapshot(mFirstSnapshot,
SkCanvas::kMatrix_SaveFlag | SkCanvas::kClip_SaveFlag);
mSaveCount = 1;
mSnapshot->setClip(0.0f, 0.0f, mWidth, mHeight);
mRestoreSaveCount = -1;
return DrawGlInfo::kStatusDone; // No invalidate needed at record-time
}
void DisplayListRenderer::finish() {

2
libs/hwui/DisplayListRenderer.h
View File

@@ -547,7 +547,7 @@ public:
virtual bool isDeferred();
virtual void setViewport(int width, int height);
virtual void prepareDirty(float left, float top, float right, float bottom, bool opaque);
virtual int prepareDirty(float left, float top, float right, float bottom, bool opaque);
virtual void finish();
virtual status_t callDrawGLFunction(Functor *functor, Rect& dirty);

6
libs/hwui/LayerRenderer.cpp
View File

@@ -37,7 +37,7 @@ LayerRenderer::LayerRenderer(Layer* layer): mLayer(layer) {
LayerRenderer::~LayerRenderer() {
}
void LayerRenderer::prepareDirty(float left, float top, float right, float bottom, bool opaque) {
int LayerRenderer::prepareDirty(float left, float top, float right, float bottom, bool opaque) {
LAYER_RENDERER_LOGD("Rendering into layer, fbo = %d", mLayer->getFbo());
glBindFramebuffer(GL_FRAMEBUFFER, mLayer->getFbo());
@@ -57,9 +57,9 @@ void LayerRenderer::prepareDirty(float left, float top, float right, float botto
mLayer->region.subtractSelf(r);
}
OpenGLRenderer::prepareDirty(dirty.left, dirty.top, dirty.right, dirty.bottom, opaque);
return OpenGLRenderer::prepareDirty(dirty.left, dirty.top, dirty.right, dirty.bottom, opaque);
#else
OpenGLRenderer::prepareDirty(0.0f, 0.0f, width, height, opaque);
return OpenGLRenderer::prepareDirty(0.0f, 0.0f, width, height, opaque);
#endif
}

2
libs/hwui/LayerRenderer.h
View File

@@ -47,7 +47,7 @@ public:
ANDROID_API LayerRenderer(Layer* layer);
virtual ~LayerRenderer();
virtual void prepareDirty(float left, float top, float right, float bottom, bool opaque);
virtual int prepareDirty(float left, float top, float right, float bottom, bool opaque);
virtual void finish();
virtual bool hasLayer();

9
libs/hwui/OpenGLRenderer.cpp
View File

@@ -164,11 +164,11 @@ void OpenGLRenderer::setViewport(int width, int height) {
glEnableVertexAttribArray(Program::kBindingPosition);
}
void OpenGLRenderer::prepare(bool opaque) {
prepareDirty(0.0f, 0.0f, mWidth, mHeight, opaque);
int OpenGLRenderer::prepare(bool opaque) {
return prepareDirty(0.0f, 0.0f, mWidth, mHeight, opaque);
}
void OpenGLRenderer::prepareDirty(float left, float top, float right, float bottom, bool opaque) {
int OpenGLRenderer::prepareDirty(float left, float top, float right, float bottom, bool opaque) {
mCaches.clearGarbage();
mSnapshot = new Snapshot(mFirstSnapshot,
@@ -184,9 +184,12 @@ void OpenGLRenderer::prepareDirty(float left, float top, float right, float bott
if (!opaque) {
mCaches.setScissor(left, mSnapshot->height - bottom, right - left, bottom - top);
glClear(GL_COLOR_BUFFER_BIT);
return DrawGlInfo::kStatusDrew;
} else {
mCaches.resetScissor();
}
return DrawGlInfo::kStatusDone;
}
void OpenGLRenderer::syncState() {

4
libs/hwui/OpenGLRenderer.h
View File

@@ -67,8 +67,8 @@ public:
virtual void setViewport(int width, int height);
ANDROID_API void prepare(bool opaque);
virtual void prepareDirty(float left, float top, float right, float bottom, bool opaque);
ANDROID_API int prepare(bool opaque);
virtual int prepareDirty(float left, float top, float right, float bottom, bool opaque);
virtual void finish();
// These two calls must not be recorded in display lists