summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-11-07 21:32:25 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-11-07 21:32:28 +0000
commit9310f59cac8b63ca792a8e2d3f9dbbaba477fc61 (patch)
tree5beb4a49d3c074ad2017259e6c757589ed4a9d1c /libs
parent3e62009709d9e329b7a309b78cce43943f7c2da6 (diff)
parent4c9bbf4eef4c8eef44c16d908cb84c343d4a1a81 (diff)
Merge "Fix bug with displaying visual profile bars"
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp2
-rw-r--r--libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
index 494f14d2a75b..ca7ee8b7078e 100644
--- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp
@@ -88,7 +88,7 @@ bool SkiaOpenGLPipeline::draw(const Frame& frame, const SkRect& screenDirty,
// Draw visual debugging features
if (CC_UNLIKELY(Properties::showDirtyRegions
- || ProfileType::None == Properties::getProfileType())) {
+ || ProfileType::None != Properties::getProfileType())) {
SkCanvas* profileCanvas = surface->getCanvas();
SkiaProfileRenderer profileRenderer(profileCanvas);
profiler->draw(profileRenderer);
diff --git a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
index 8fffe91cfe39..21f348892ccb 100644
--- a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
@@ -74,7 +74,7 @@ bool SkiaVulkanPipeline::draw(const Frame& frame, const SkRect& screenDirty,
// Draw visual debugging features
if (CC_UNLIKELY(Properties::showDirtyRegions
- || ProfileType::None == Properties::getProfileType())) {
+ || ProfileType::None != Properties::getProfileType())) {
SkCanvas* profileCanvas = mBackbuffer->getCanvas();
SkiaProfileRenderer profileRenderer(profileCanvas);
profiler->draw(profileRenderer);