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

Merge "Fix TextureLayer test" into nyc-dev

Browse Source 
am: fd39aa1

* commit 'fd39aa1426257654416cea4267c534050c447112':
  Fix TextureLayer test
This commit is contained in:
Chris Craik
2016-03-26 00:22:42 +00:00
committed by android-build-merger
parent b2f8c6f26c fd39aa1426
commit 716ae9c350
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,17 +42,20 @@ SkColor TestUtils::interpolateColor(float fraction, SkColor start, SkColor end)
sp<DeferredLayerUpdater> TestUtils::createTextureLayerUpdater(
renderthread::RenderThread& renderThread, uint32_t width, uint32_t height,
std::function<void(Matrix4*)> transformSetupCallback) {
const SkMatrix& transform) {
Layer* layer = LayerRenderer::createTextureLayer(renderThread.renderState());
sp<DeferredLayerUpdater> layerUpdater = new DeferredLayerUpdater(layer);
layerUpdater->setSize(width, height);
layerUpdater->setTransform(&transform);
// updateLayer so it's ready to draw
bool isOpaque = true;
bool forceFilter = true;
GLenum renderTarget = GL_TEXTURE_EXTERNAL_OES;
Layer* layer = LayerRenderer::createTextureLayer(renderThread.renderState());
LayerRenderer::updateTextureLayer(layer, width, height, isOpaque, forceFilter,
renderTarget, Matrix4::identity().data);
transformSetupCallback(&(layer->getTransform()));
renderTarget, Matrix4::identity().data);
sp<DeferredLayerUpdater> layerUpdater = new DeferredLayerUpdater(layer);
return layerUpdater;
}

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

@@ -122,7 +122,7 @@ public:
static sp<DeferredLayerUpdater> createTextureLayerUpdater(
renderthread::RenderThread& renderThread, uint32_t width, uint32_t height,
std::function<void(Matrix4*)> transformSetupCallback);
const SkMatrix& transform);
template<class CanvasType>
static std::unique_ptr<DisplayList> createDisplayList(int width, int height,

4
libs/hwui/tests/unit/FrameBuilderTests.cpp
View File

@@ -387,9 +387,7 @@ RENDERTHREAD_TEST(FrameBuilder, textureLayer) {
};
auto layerUpdater = TestUtils::createTextureLayerUpdater(renderThread, 100, 100,
[](Matrix4* transform) {
transform->loadTranslate(5, 5, 0);
});
SkMatrix::MakeTrans(5, 5));
auto node = TestUtils::createNode(0, 0, 200, 200,
[&layerUpdater](RenderProperties& props, RecordingCanvas& canvas) {