Delete VectorDrawableAtlas

Poking around in a few apps it doesn't appear that
the VectorDrawableAtlas is achieving sufficient
utilization to justify its existence. The potential for
draw call merging doesn't seem warranted for the
RAM cost of the atlas.

Bug: 137853925
Test: builds
Change-Id: Id2419bc6dccb6316636d50c568f8fac75a2d563f

2 files changed, 0 insertions, 196 deletions

diff --git a/libs/hwui/tests/unit/SkiaPipelineTests.cpp b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
index 958baa78deab..307d13606cb8 100644
--- a/libs/hwui/tests/unit/SkiaPipelineTests.cpp
+++ b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
@@ -61,39 +61,6 @@ RENDERTHREAD_SKIA_PIPELINE_TEST(SkiaPipeline, renderFrame) {
     ASSERT_EQ(TestUtils::getColor(surface, 0, 0), SK_ColorRED);
 }
 
-RENDERTHREAD_SKIA_PIPELINE_TEST(SkiaPipeline, testOnPrepareTree) {
-    auto redNode = TestUtils::createSkiaNode(
-            0, 0, 1, 1, [](RenderProperties& props, SkiaRecordingCanvas& redCanvas) {
-                redCanvas.drawColor(SK_ColorRED, SkBlendMode::kSrcOver);
-            });
-
-    LayerUpdateQueue layerUpdateQueue;
-    SkRect dirty = SkRectMakeLargest();
-    std::vector<sp<RenderNode>> renderNodes;
-    renderNodes.push_back(redNode);
-    bool opaque = true;
-    android::uirenderer::Rect contentDrawBounds(0, 0, 1, 1);
-    auto pipeline = std::make_unique<SkiaOpenGLPipeline>(renderThread);
-    {
-        // add a pointer to a deleted vector drawable object in the pipeline
-        sp<VectorDrawableRoot> dirtyVD(new VectorDrawableRoot(new VectorDrawable::Group()));
-        dirtyVD->mutateProperties()->setScaledSize(5, 5);
-        pipeline->getVectorDrawables()->push_back(dirtyVD.get());
-    }
-
-    // pipeline should clean list of dirty vector drawables before prepare tree
-    pipeline->onPrepareTree();
-
-    auto surface = SkSurface::MakeRasterN32Premul(1, 1);
-    surface->getCanvas()->drawColor(SK_ColorBLUE, SkBlendMode::kSrcOver);
-    ASSERT_EQ(TestUtils::getColor(surface, 0, 0), SK_ColorBLUE);
-
-    // drawFrame will crash if "SkiaPipeline::onPrepareTree" did not clean invalid VD pointer
-    pipeline->renderFrame(layerUpdateQueue, dirty, renderNodes, opaque, contentDrawBounds, surface,
-            SkMatrix::I());
-    ASSERT_EQ(TestUtils::getColor(surface, 0, 0), SK_ColorRED);
-}
-
 RENDERTHREAD_SKIA_PIPELINE_TEST(SkiaPipeline, renderFrameCheckOpaque) {
     auto halfGreenNode = TestUtils::createSkiaNode(
             0, 0, 2, 2, [](RenderProperties& props, SkiaRecordingCanvas& bottomHalfGreenCanvas) {
diff --git a/libs/hwui/tests/unit/VectorDrawableAtlasTests.cpp b/libs/hwui/tests/unit/VectorDrawableAtlasTests.cpp
deleted file mode 100644
index 0c95fdd42851..000000000000
--- a/libs/hwui/tests/unit/VectorDrawableAtlasTests.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include <GrRectanizer.h>
-#include "pipeline/skia/VectorDrawableAtlas.h"
-#include "tests/common/TestUtils.h"
-
-using namespace android;
-using namespace android::uirenderer;
-using namespace android::uirenderer::renderthread;
-using namespace android::uirenderer::skiapipeline;
-
-RENDERTHREAD_SKIA_PIPELINE_TEST(VectorDrawableAtlas, addGetRemove) {
-    VectorDrawableAtlas atlas(100 * 100);
-    atlas.prepareForDraw(renderThread.getGrContext());
-    // create 150 rects 10x10, which won't fit in the atlas (atlas can fit no more than 100 rects)
-    const int MAX_RECTS = 150;
-    AtlasEntry VDRects[MAX_RECTS];
-
-    sk_sp<SkSurface> atlasSurface;
-
-    // check we are able to allocate new rects
-    // check that rects in the atlas do not intersect
-    for (uint32_t i = 0; i < MAX_RECTS; i++) {
-        VDRects[i] = atlas.requestNewEntry(10, 10, renderThread.getGrContext());
-        if (0 == i) {
-            atlasSurface = VDRects[0].surface;
-        }
-        ASSERT_TRUE(VDRects[i].key != INVALID_ATLAS_KEY);
-        ASSERT_TRUE(VDRects[i].surface.get() != nullptr);
-        ASSERT_TRUE(VDRects[i].rect.width() == 10 && VDRects[i].rect.height() == 10);
-
-        // nothing in the atlas should intersect
-        if (atlasSurface.get() == VDRects[i].surface.get()) {
-            for (uint32_t j = 0; j < i; j++) {
-                if (atlasSurface.get() == VDRects[j].surface.get()) {
-                    ASSERT_FALSE(VDRects[i].rect.intersect(VDRects[j].rect));
-                }
-            }
-        }
-    }
-
-    // first 1/3 rects should all be in the same surface
-    for (uint32_t i = 1; i < MAX_RECTS / 3; i++) {
-        ASSERT_NE(VDRects[i].key, VDRects[0].key);
-        ASSERT_EQ(VDRects[i].surface.get(), atlasSurface.get());
-    }
-
-    // first rect is using atlas and last is a standalone surface
-    ASSERT_NE(VDRects[0].surface.get(), VDRects[MAX_RECTS - 1].surface.get());
-
-    // check getEntry returns the same surfaces that we had created
-    for (uint32_t i = 0; i < MAX_RECTS; i++) {
-        auto VDRect = atlas.getEntry(VDRects[i].key);
-        ASSERT_TRUE(VDRect.key != INVALID_ATLAS_KEY);
-        ASSERT_EQ(VDRects[i].key, VDRect.key);
-        ASSERT_EQ(VDRects[i].surface.get(), VDRect.surface.get());
-        ASSERT_EQ(VDRects[i].rect, VDRect.rect);
-        atlas.releaseEntry(VDRect.key);
-    }
-
-    // check that any new rects will be allocated in the atlas, even that rectanizer is full.
-    // rects in the atlas should not intersect.
-    for (uint32_t i = 0; i < MAX_RECTS / 3; i++) {
-        VDRects[i] = atlas.requestNewEntry(10, 10, renderThread.getGrContext());
-        ASSERT_TRUE(VDRects[i].key != INVALID_ATLAS_KEY);
-        ASSERT_EQ(VDRects[i].surface.get(), atlasSurface.get());
-        ASSERT_TRUE(VDRects[i].rect.width() == 10 && VDRects[i].rect.height() == 10);
-        for (uint32_t j = 0; j < i; j++) {
-            ASSERT_FALSE(VDRects[i].rect.intersect(VDRects[j].rect));
-        }
-    }
-}
-
-RENDERTHREAD_SKIA_PIPELINE_TEST(VectorDrawableAtlas, disallowSharedSurface) {
-    VectorDrawableAtlas atlas(100 * 100);
-    // don't allow to use a shared surface
-    atlas.setStorageMode(VectorDrawableAtlas::StorageMode::disallowSharedSurface);
-    atlas.prepareForDraw(renderThread.getGrContext());
-    // create 150 rects 10x10, which won't fit in the atlas (atlas can fit no more than 100 rects)
-    const int MAX_RECTS = 150;
-    AtlasEntry VDRects[MAX_RECTS];
-
-    // check we are able to allocate new rects
-    // check that rects in the atlas use unique surfaces
-    for (uint32_t i = 0; i < MAX_RECTS; i++) {
-        VDRects[i] = atlas.requestNewEntry(10, 10, renderThread.getGrContext());
-        ASSERT_TRUE(VDRects[i].key != INVALID_ATLAS_KEY);
-        ASSERT_TRUE(VDRects[i].surface.get() != nullptr);
-        ASSERT_TRUE(VDRects[i].rect.width() == 10 && VDRects[i].rect.height() == 10);
-
-        // nothing in the atlas should use the same surface
-        for (uint32_t j = 0; j < i; j++) {
-            ASSERT_NE(VDRects[i].surface.get(), VDRects[j].surface.get());
-        }
-    }
-}
-
-RENDERTHREAD_SKIA_PIPELINE_TEST(VectorDrawableAtlas, repack) {
-    VectorDrawableAtlas atlas(100 * 100);
-    ASSERT_FALSE(atlas.isFragmented());
-    atlas.prepareForDraw(renderThread.getGrContext());
-    ASSERT_FALSE(atlas.isFragmented());
-    // create 150 rects 10x10, which won't fit in the atlas (atlas can fit no more than 100 rects)
-    const int MAX_RECTS = 150;
-    AtlasEntry VDRects[MAX_RECTS];
-
-    sk_sp<SkSurface> atlasSurface;
-
-    // fill the atlas with check we are able to allocate new rects
-    for (uint32_t i = 0; i < MAX_RECTS; i++) {
-        VDRects[i] = atlas.requestNewEntry(10, 10, renderThread.getGrContext());
-        if (0 == i) {
-            atlasSurface = VDRects[0].surface;
-        }
-        ASSERT_TRUE(VDRects[i].key != INVALID_ATLAS_KEY);
-    }
-
-    ASSERT_FALSE(atlas.isFragmented());
-
-    // first 1/3 rects should all be in the same surface
-    for (uint32_t i = 1; i < MAX_RECTS / 3; i++) {
-        ASSERT_NE(VDRects[i].key, VDRects[0].key);
-        ASSERT_EQ(VDRects[i].surface.get(), atlasSurface.get());
-    }
-
-    // release all entries
-    for (uint32_t i = 0; i < MAX_RECTS; i++) {
-        auto VDRect = atlas.getEntry(VDRects[i].key);
-        ASSERT_TRUE(VDRect.key != INVALID_ATLAS_KEY);
-        atlas.releaseEntry(VDRect.key);
-    }
-
-    ASSERT_FALSE(atlas.isFragmented());
-
-    // allocate 4x4 rects, which will fragment the atlas badly, because each entry occupies a 10x10
-    // area
-    for (uint32_t i = 0; i < 4 * MAX_RECTS; i++) {
-        AtlasEntry entry = atlas.requestNewEntry(4, 4, renderThread.getGrContext());
-        ASSERT_TRUE(entry.key != INVALID_ATLAS_KEY);
-    }
-
-    ASSERT_TRUE(atlas.isFragmented());
-
-    atlas.repackIfNeeded(renderThread.getGrContext());
-
-    ASSERT_FALSE(atlas.isFragmented());
-}
\ No newline at end of file