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

Merge "Fix rendering issues with animated layers. Bug #3385247" into honeycomb

Browse Source
This commit is contained in:
Romain Guy
2011-01-24 20:38:52 -08:00
committed by Android (Google) Code Review
parent 92dcf629e1 8168396d1a
commit 169fafe679
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/ViewGroup.java
View File

@ -2395,8 +2395,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
canvas.scale(scale, scale); canvas.scale(scale, scale);
} }
} }
boolean layerSaved = false;
if (transformToApply != null || alpha < 1.0f || !child.hasIdentityMatrix()) { if (transformToApply != null || alpha < 1.0f || !child.hasIdentityMatrix()) {
if (transformToApply != null || !childHasIdentityMatrix) { if (transformToApply != null || !childHasIdentityMatrix) {

7
libs/hwui/OpenGLRenderer.cpp
View File

@ -1213,8 +1213,7 @@ void OpenGLRenderer::drawPatch(SkBitmap* bitmap, const int32_t* xDivs, const int
const bool pureTranslate = mSnapshot->transform->isPureTranslate(); const bool pureTranslate = mSnapshot->transform->isPureTranslate();
#if RENDER_LAYERS_AS_REGIONS #if RENDER_LAYERS_AS_REGIONS
// Mark the current layer dirty where we are going to draw the patch // Mark the current layer dirty where we are going to draw the patch
if ((mSnapshot->flags & Snapshot::kFlagFboTarget) && if (hasLayer() && mesh->hasEmptyQuads) {
mSnapshot->region && mesh->hasEmptyQuads) {
const size_t count = mesh->quads.size(); const size_t count = mesh->quads.size();
for (size_t i = 0; i < count; i++) { for (size_t i = 0; i < count; i++) {
const Rect& bounds = mesh->quads.itemAt(i); const Rect& bounds = mesh->quads.itemAt(i);
@ -1610,6 +1609,7 @@ void OpenGLRenderer::drawLayer(Layer* layer, float x, float y, SkPaint* paint) {
layer->alpha = alpha; layer->alpha = alpha;
layer->mode = mode; layer->mode = mode;
LOGD("Drawing layer with alpha = %d", alpha);
#if RENDER_LAYERS_AS_REGIONS #if RENDER_LAYERS_AS_REGIONS
if (!layer->region.isEmpty()) { if (!layer->region.isEmpty()) {
@ -1617,11 +1617,12 @@ void OpenGLRenderer::drawLayer(Layer* layer, float x, float y, SkPaint* paint) {
const Rect r(x, y, x + layer->layer.getWidth(), y + layer->layer.getHeight()); const Rect r(x, y, x + layer->layer.getWidth(), y + layer->layer.getHeight());
composeLayerRect(layer, r); composeLayerRect(layer, r);
} else if (layer->mesh) { } else if (layer->mesh) {
const float a = alpha / 255.0f;
const Rect& rect = layer->layer; const Rect& rect = layer->layer;
setupDraw(); setupDraw();
setupDrawWithTexture(); setupDrawWithTexture();
setupDrawColor(alpha, alpha, alpha, alpha); setupDrawColor(a, a, a, a);
setupDrawColorFilter(); setupDrawColorFilter();
setupDrawBlending(layer->blend || layer->alpha < 255, layer->mode, false); setupDrawBlending(layer->blend || layer->alpha < 255, layer->mode, false);
setupDrawProgram(); setupDrawProgram();