diff options
| author | John Reck <jreck@google.com> | 2018-08-30 16:47:59 +0000 |
|---|---|---|
| committer | Stan Iliev <stani@google.com> | 2018-08-30 18:42:08 +0000 |
| commit | 867c43de0544217d26c3ee18f4d6603bb2ea97ce (patch) | |
| tree | d780e25edaa90578c80309a105d6fe2e9eea71c8 /libs/hwui/renderthread/CacheManager.cpp | |
| parent | c8e22a653297837da9a80b0ba65f6854c8986c96 (diff) | |
Revert "TextureView Vulkan support and optimized OpenGL draw"
This reverts commit c8e22a653297837da9a80b0ba65f6854c8986c96.
Reason for revert: broke camera, b/113555199
Bug: 113555199
Change-Id: Iae9b462694d5de0cd99427afead63b567fb4d71d
Diffstat (limited to 'libs/hwui/renderthread/CacheManager.cpp')
| -rw-r--r-- | libs/hwui/renderthread/CacheManager.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/hwui/renderthread/CacheManager.cpp b/libs/hwui/renderthread/CacheManager.cpp index c45eedad775c..bec80b1e6011 100644 --- a/libs/hwui/renderthread/CacheManager.cpp +++ b/libs/hwui/renderthread/CacheManager.cpp @@ -21,7 +21,6 @@ #include "RenderThread.h" #include "pipeline/skia/ShaderCache.h" #include "pipeline/skia/SkiaMemoryTracer.h" -#include "Properties.h" #include "renderstate/RenderState.h" #include <GrContextOptions.h> @@ -215,12 +214,11 @@ void CacheManager::dumpMemoryUsage(String8& log, const RenderState* renderState) log.appendFormat(" Layer Info:\n"); } - const char* layerType = Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL - ? "GlLayer" : "VkLayer"; size_t layerMemoryTotal = 0; for (std::set<Layer*>::iterator it = renderState->mActiveLayers.begin(); it != renderState->mActiveLayers.end(); it++) { const Layer* layer = *it; + const char* layerType = layer->getApi() == Layer::Api::OpenGL ? "GlLayer" : "VkLayer"; log.appendFormat(" %s size %dx%d\n", layerType, layer->getWidth(), layer->getHeight()); layerMemoryTotal += layer->getWidth() * layer->getHeight() * 4; |