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

am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197" into honeycomb

Browse Source 
* commit '7c53a0d6078620df3abc4997acfe267ef903f5c6':
  Don't draw the same triangles several times. Bug #3388197
This commit is contained in:
Romain Guy
2011-01-26 22:47:01 -08:00
committed by Android Git Automerger
parent a05a3e3ad7 7c53a0d607
commit 38f34ed20a
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/View.java
View File

@@ -8125,11 +8125,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
// TODO: We should pass the dirty rect
canvas.onPreDraw(null);
final int restoreCount = canvas.save();
computeScroll();
canvas.translate(-mScrollX, -mScrollY);
final int restoreCount = canvas.save();
mPrivateFlags |= DRAWN | DRAWING_CACHE_VALID;
// Fast path for layouts with no backgrounds

22
libs/hwui/LayerRenderer.cpp
View File

@@ -99,11 +99,13 @@ void LayerRenderer::generateMesh() {
mLayer->meshIndices = NULL;
}
bool rebuildIndices = false;
if (!mLayer->mesh) {
mLayer->mesh = new TextureVertex[count * 4];
mLayer->meshIndices = new uint16_t[elementCount];
mLayer->meshElementCount = elementCount;
rebuildIndices = true;
}
mLayer->meshElementCount = elementCount;
const float texX = 1.0f / float(mLayer->width);
const float texY = 1.0f / float(mLayer->height);
@@ -125,14 +127,16 @@ void LayerRenderer::generateMesh() {
TextureVertex::set(mesh++, r->left, r->bottom, u1, v2);
TextureVertex::set(mesh++, r->right, r->bottom, u2, v2);
uint16_t quad = i * 4;
int index = i * 6;
indices[index ] = quad; // top-left
indices[index + 1] = quad + 1; // top-right
indices[index + 2] = quad + 2; // bottom-left
indices[index + 3] = quad + 2; // bottom-left
indices[index + 4] = quad + 1; // top-right
indices[index + 5] = quad + 3; // bottom-right
if (rebuildIndices) {
uint16_t quad = i * 4;
int index = i * 6;
indices[index ] = quad; // top-left
indices[index + 1] = quad + 1; // top-right
indices[index + 2] = quad + 2; // bottom-left
indices[index + 3] = quad + 2; // bottom-left
indices[index + 4] = quad + 1; // top-right
indices[index + 5] = quad + 3; // bottom-right
}
}
#endif
}

4
libs/hwui/OpenGLRenderer.cpp
View File

@@ -1613,10 +1613,12 @@ void OpenGLRenderer::drawLayer(Layer* layer, float x, float y, SkPaint* paint) {
setupDrawColorFilter();
setupDrawBlending(layer->blend || layer->alpha < 255, layer->mode, false);
setupDrawProgram();
setupDrawDirtyRegionsDisabled();
setupDrawPureColorUniforms();
setupDrawColorFilterUniforms();
setupDrawTexture(layer->texture);
// TODO: The current layer, if any, will be dirtied with the bounding box
// of the layer we are drawing. Since the layer we are drawing has
// a mesh, we know the dirty region, we should use it instead
setupDrawModelViewTranslate(rect.left, rect.top, rect.right, rect.bottom);
setupDrawMesh(&layer->mesh[0].position[0], &layer->mesh[0].texture[0]);