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

Revert "Added crop rect to LayerDrawable to not crop TextureView..."

Browse Source 
Revert "Adds out parameters for crop rectangle and transform"

Revert "Add test to crop TextureView and verify if outer edge ha..."

Revert submission 15339442-1texelcrop

Reason for revert: Bisection identified these CLs as the likely cause of Droidfood blocking bugs b/195620803 and b/195637414

Bug: 195637414
Bug: 195620803

Reverted Changes:
If1f448a94:Added crop rect to LayerDrawable to not crop Textu...
Iefde6bdf7:Add test to crop TextureView and verify if outer e...
Icf0ee20e8:Adds out parameters for crop rectangle and transfo...

Change-Id: I3448ebe193f25de79d186ae705911d99da2cef2b
This commit is contained in:
bsears
2021-08-06 15:18:26 +00:00
parent ef54c038e1
commit 9df09ccff9
8 changed files with 63 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/hwui/DeferredLayerUpdater.cpp
View File

@@ -21,6 +21,7 @@
// TODO: Use public SurfaceTexture APIs once available and include public NDK header file instead.
#include <surfacetexture/surface_texture_platform.h>
#include "AutoBackendTextureRelease.h"
#include "Matrix.h"
#include "Properties.h"
#include "renderstate/RenderState.h"
#include "renderthread/EglManager.h"
@@ -144,17 +145,16 @@ void DeferredLayerUpdater::apply() {
}
if (mUpdateTexImage) {
mUpdateTexImage = false;
float transformMatrix[16];
android_dataspace dataspace;
int slot;
bool newContent = false;
ARect rect;
uint32_t textureTransform;
// Note: ASurfaceTexture_dequeueBuffer discards all but the last frame. This
// is necessary if the SurfaceTexture queue is in synchronous mode, and we
// cannot tell which mode it is in.
AHardwareBuffer* hardwareBuffer = ASurfaceTexture_dequeueBuffer(
mSurfaceTexture.get(), &slot, &dataspace, &newContent, createReleaseFence,
fenceWait, this, &rect, &textureTransform);
mSurfaceTexture.get(), &slot, &dataspace, transformMatrix, &newContent,
createReleaseFence, fenceWait, this);
if (hardwareBuffer) {
mCurrentSlot = slot;
@@ -165,12 +165,12 @@ void DeferredLayerUpdater::apply() {
// (invoked by createIfNeeded) will add a ref to the AHardwareBuffer.
AHardwareBuffer_release(hardwareBuffer);
if (layerImage.get()) {
SkMatrix textureTransform;
mat4(transformMatrix).copyTo(textureTransform);
// force filtration if buffer size != layer size
bool forceFilter =
mWidth != layerImage->width() || mHeight != layerImage->height();
SkRect cropRect =
SkRect::MakeLTRB(rect.left, rect.top, rect.right, rect.bottom);
updateLayer(forceFilter, textureTransform, cropRect, layerImage);
updateLayer(forceFilter, textureTransform, layerImage);
}
}
}
@@ -182,13 +182,12 @@ void DeferredLayerUpdater::apply() {
}
}
void DeferredLayerUpdater::updateLayer(bool forceFilter, const uint32_t textureTransform,
const SkRect cropRect, const sk_sp<SkImage>& layerImage) {
void DeferredLayerUpdater::updateLayer(bool forceFilter, const SkMatrix& textureTransform,
const sk_sp<SkImage>& layerImage) {
mLayer->setBlend(mBlend);
mLayer->setForceFilter(forceFilter);
mLayer->setSize(mWidth, mHeight);
mLayer->setTextureTransform(textureTransform);
mLayer->setCropRect(cropRect);
mLayer->getTexTransform() = textureTransform;
mLayer->setImage(layerImage);
}

2
libs/hwui/DeferredLayerUpdater.h
View File

@@ -90,7 +90,7 @@ public:
void detachSurfaceTexture();
void updateLayer(bool forceFilter, const uint32_t textureTransform, const SkRect cropRect,
void updateLayer(bool forceFilter, const SkMatrix& textureTransform,
const sk_sp<SkImage>& layerImage);
void destroyLayer();

2
libs/hwui/Layer.cpp
View File

@@ -35,6 +35,7 @@ Layer::Layer(RenderState& renderState, sk_sp<SkColorFilter> colorFilter, int alp
// preserves the old inc/dec ref locations. This should be changed...
incStrong(nullptr);
renderState.registerLayer(this);
texTransform.setIdentity();
transform.setIdentity();
}
@@ -100,6 +101,7 @@ void Layer::draw(SkCanvas* canvas) {
const int layerHeight = getHeight();
if (layerImage) {
SkMatrix textureMatrixInv;
textureMatrixInv = getTexTransform();
// TODO: after skia bug https://bugs.chromium.org/p/skia/issues/detail?id=7075 is fixed
// use bottom left origin and remove flipV and invert transformations.
SkMatrix flipV;

27
libs/hwui/Layer.h
View File

@@ -74,18 +74,10 @@ public:
void setColorFilter(sk_sp<SkColorFilter> filter) { mColorFilter = filter; };
inline SkMatrix& getTexTransform() { return texTransform; }
inline SkMatrix& getTransform() { return transform; }
inline SkRect getCropRect() { return mCropRect; }
inline void setCropRect(const SkRect cropRect) { mCropRect = cropRect; }
inline void setTextureTransform(uint32_t textureTransform) {
mTextureTransform = textureTransform;
}
inline uint32_t getTextureTransform() { return mTextureTransform; }
/**
* Posts a decStrong call to the appropriate thread.
* Thread-safe.
@@ -123,21 +115,16 @@ private:
*/
SkBlendMode mode;
/**
* Optional texture coordinates transform.
*/
SkMatrix texTransform;
/**
* Optional transform.
*/
SkMatrix transform;
/**
* Optional crop
*/
SkRect mCropRect;
/**
* Optional transform
*/
uint32_t mTextureTransform;
/**
* An image backing the layer.
*/

5
libs/hwui/Readback.cpp
View File

@@ -251,6 +251,8 @@ CopyResult Readback::copyHWBitmapInto(Bitmap* hwBitmap, SkBitmap* bitmap) {
Rect srcRect;
Matrix4 transform;
transform.loadScale(1, -1, 1);
transform.translate(0, -1);
return copyImageInto(hwBitmap->makeImage(), transform, srcRect, bitmap);
}
@@ -278,6 +280,8 @@ CopyResult Readback::copyLayerInto(DeferredLayerUpdater* deferredLayer, SkBitmap
CopyResult Readback::copyImageInto(const sk_sp<SkImage>& image, SkBitmap* bitmap) {
Rect srcRect;
Matrix4 transform;
transform.loadScale(1, -1, 1);
transform.translate(0, -1);
return copyImageInto(image, transform, srcRect, bitmap);
}
@@ -316,6 +320,7 @@ CopyResult Readback::copyImageInto(const sk_sp<SkImage>& image, Matrix4& texTran
Layer layer(mRenderThread.renderState(), nullptr, 255, SkBlendMode::kSrc);
layer.setSize(displayedWidth, displayedHeight);
texTransform.copyTo(layer.getTexTransform());
layer.setImage(image);
// Scaling filter is not explicitly set here, because it is done inside copyLayerInfo
// after checking the necessity based on the src/dest rect size and the transformation.

66
libs/hwui/pipeline/skia/LayerDrawable.cpp
View File

@@ -18,11 +18,9 @@
#include <utils/MathUtils.h>
#include "GrBackendSurface.h"
#include "Matrix.h"
#include "SkColorFilter.h"
#include "SkSurface.h"
#include "gl/GrGLTypes.h"
#include "system/window.h"
namespace android {
namespace uirenderer {
@@ -31,8 +29,7 @@ namespace skiapipeline {
void LayerDrawable::onDraw(SkCanvas* canvas) {
Layer* layer = mLayerUpdater->backingLayer();
if (layer) {
SkRect srcRect = layer->getCropRect();
DrawLayer(canvas->recordingContext(), canvas, layer, &srcRect, nullptr, true);
DrawLayer(canvas->recordingContext(), canvas, layer, nullptr, nullptr, true);
}
}
@@ -82,16 +79,33 @@ bool LayerDrawable::DrawLayer(GrRecordingContext* context,
return false;
}
// transform the matrix based on the layer
const uint32_t transform = layer->getTextureTransform();
SkMatrix layerTransform = layer->getTransform();
sk_sp<SkImage> layerImage = layer->getImage();
const int layerWidth = layer->getWidth();
const int layerHeight = layer->getHeight();
SkMatrix layerTransform = layer->getTransform();
if (layerImage) {
SkMatrix textureMatrixInv;
textureMatrixInv = layer->getTexTransform();
// TODO: after skia bug https://bugs.chromium.org/p/skia/issues/detail?id=7075 is fixed
// use bottom left origin and remove flipV and invert transformations.
SkMatrix flipV;
flipV.setAll(1, 0, 0, 0, -1, 1, 0, 0, 1);
textureMatrixInv.preConcat(flipV);
textureMatrixInv.preScale(1.0f / layerWidth, 1.0f / layerHeight);
textureMatrixInv.postScale(layerImage->width(), layerImage->height());
SkMatrix textureMatrix;
if (!textureMatrixInv.invert(&textureMatrix)) {
textureMatrix = textureMatrixInv;
}
SkMatrix matrix;
if (useLayerTransform) {
matrix = layerTransform;
matrix = SkMatrix::Concat(layerTransform, textureMatrix);
} else {
matrix = textureMatrix;
}
SkPaint paint;
paint.setAlpha(layer->getAlpha());
paint.setBlendMode(layer->getMode());
@@ -101,54 +115,39 @@ bool LayerDrawable::DrawLayer(GrRecordingContext* context,
canvas->save();
canvas->concat(matrix);
}
const SkMatrix totalMatrix = canvas->getTotalMatrix();
const SkMatrix& totalMatrix = canvas->getTotalMatrix();
if (dstRect || srcRect) {
SkMatrix matrixInv;
if (!matrix.invert(&matrixInv)) {
matrixInv = matrix;
}
SkRect skiaSrcRect;
if (srcRect && !srcRect->isEmpty()) {
if (srcRect) {
skiaSrcRect = *srcRect;
} else {
skiaSrcRect = (transform & NATIVE_WINDOW_TRANSFORM_ROT_90)
? SkRect::MakeIWH(layerHeight, layerWidth)
: SkRect::MakeIWH(layerWidth, layerHeight);
skiaSrcRect = SkRect::MakeIWH(layerWidth, layerHeight);
}
matrixInv.mapRect(&skiaSrcRect);
SkRect skiaDestRect;
if (dstRect && !dstRect->isEmpty()) {
if (dstRect) {
skiaDestRect = *dstRect;
} else {
skiaDestRect = SkRect::MakeIWH(layerWidth, layerHeight);
}
matrixInv.mapRect(&skiaDestRect);
// If (matrix is a rect-to-rect transform)
// and (src/dst buffers size match in screen coordinates)
// and (src/dst corners align fractionally),
// then use nearest neighbor, otherwise use bilerp sampling.
// Skia TextureOp has the above logic build-in, but not NonAAFillRectOp. TextureOp works
// only for SrcOver blending and without color filter (readback uses Src blending).
SkSamplingOptions sampling(SkFilterMode::kNearest);
if (layer->getForceFilter() ||
shouldFilterRect(totalMatrix, skiaSrcRect, skiaDestRect)) {
sampling = SkSamplingOptions(SkFilterMode::kLinear);
}
const float px = skiaDestRect.centerX();
const float py = skiaDestRect.centerY();
if (transform & NATIVE_WINDOW_TRANSFORM_FLIP_H) {
matrix.postScale(-1.f, 1.f, px, py);
}
if (transform & NATIVE_WINDOW_TRANSFORM_FLIP_V) {
matrix.postScale(1.f, -1.f, px, py);
}
if (transform & NATIVE_WINDOW_TRANSFORM_ROT_90) {
matrix.postRotate(90, 0, 0);
matrix.postTranslate(skiaDestRect.height(), 0);
}
auto constraint = SkCanvas::kFast_SrcRectConstraint;
if (srcRect && srcRect->isEmpty()) {
constraint = SkCanvas::kStrict_SrcRectConstraint;
}
matrix.postConcat(SkMatrix::MakeRectToRect(skiaSrcRect, skiaDestRect,
SkMatrix::kFill_ScaleToFit));
canvas->drawImageRect(layerImage.get(), skiaSrcRect, skiaDestRect, sampling, &paint,
constraint);
SkCanvas::kFast_SrcRectConstraint);
} else {
SkRect imageRect = SkRect::MakeIWH(layerImage->width(), layerImage->height());
SkSamplingOptions sampling(SkFilterMode::kNearest);
@@ -162,6 +161,7 @@ bool LayerDrawable::DrawLayer(GrRecordingContext* context,
canvas->restore();
}
}
return layerImage != nullptr;
}

2
libs/hwui/tests/common/TestUtils.cpp
View File

@@ -74,7 +74,7 @@ sp<DeferredLayerUpdater> TestUtils::createTextureLayerUpdater(
layerUpdater->setTransform(&transform);
// updateLayer so it's ready to draw
layerUpdater->updateLayer(true, 0, SkRect::MakeEmpty(), nullptr);
layerUpdater->updateLayer(true, SkMatrix::I(), nullptr);
return layerUpdater;
}

9
libs/hwui/tests/unit/DeferredLayerUpdaterTests.cpp
View File

@@ -36,20 +36,19 @@ RENDERTHREAD_TEST(DeferredLayerUpdater, updateLayer) {
EXPECT_EQ(0u, layerUpdater->backingLayer()->getHeight());
EXPECT_FALSE(layerUpdater->backingLayer()->getForceFilter());
EXPECT_FALSE(layerUpdater->backingLayer()->isBlend());
EXPECT_EQ(Matrix4::identity(), layerUpdater->backingLayer()->getTexTransform());
// push the deferred updates to the layer
uint32_t textureTransform = 1;
SkMatrix scaledMatrix = SkMatrix::Scale(0.5, 0.5);
SkBitmap bitmap;
bitmap.allocN32Pixels(16, 16);
SkRect cropRect = SkRect::MakeIWH(10, 10);
sk_sp<SkImage> layerImage = SkImage::MakeFromBitmap(bitmap);
layerUpdater->updateLayer(true, textureTransform, cropRect, layerImage);
layerUpdater->updateLayer(true, scaledMatrix, layerImage);
// the backing layer should now have all the properties applied.
EXPECT_EQ(100u, layerUpdater->backingLayer()->getWidth());
EXPECT_EQ(100u, layerUpdater->backingLayer()->getHeight());
EXPECT_TRUE(layerUpdater->backingLayer()->getForceFilter());
EXPECT_TRUE(layerUpdater->backingLayer()->isBlend());
EXPECT_EQ(textureTransform, layerUpdater->backingLayer()->getTextureTransform());
EXPECT_EQ(cropRect, layerUpdater->backingLayer()->getCropRect());
EXPECT_EQ(scaledMatrix, layerUpdater->backingLayer()->getTexTransform());
}