commit c6a73641879a4d23403ec007ffc1c3d634bc46e6
author rnlee <rnlee@google.com> Fri Jun 04 14:16:42 2021 -0700
committer Rachel Lee <rnlee@google.com> Thu Jun 10 18:28:48 2021 +0000
tree 9dc2c86b963056cd3dc696240f97604b67c546ec
parent 4c44be8cc60cd3bc4a8b3ba7a99ce55d6b1dcef6

Add detailed Skia traces sysprop to RenderEngine.

BUG:180767647
Test: setprop, force client composition, perfetto trace

1. `adb shell setprop debug.renderengine.skia_atrace_enabled 1`
2. `adb shell stop && adb shell start`
3. Force client composition:
   `adb shell service call SurfaceFlinger 1008 i32 1`
   (`adb shell dumpsys SurfaceFlinger | grep -A 30 "HWC layers"` can
   be used to check layers are "CLIENT" instead of "DEVICE".)
4. Perfetto script to trace.
5. See skia traces e.g. `grsurfacedrawcontext` in surfaceflinger
RenderEngine process.

Change-Id: I0612e3df82de08ab6a754b4f60d09057d335b1b1

libs/renderengine/skia/SkiaRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaRenderEngine.cpp b/libs/renderengine/skia/SkiaRenderEngine.cpp
index 81f0b6f..29175a2 100644
--- a/libs/renderengine/skia/SkiaRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaRenderEngine.cpp
@@ -14,13 +14,22 @@
  * limitations under the License.
  */
 
-//#define LOG_NDEBUG 0
 #undef LOG_TAG
 #define LOG_TAG "RenderEngine"
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 
+#include "SkiaRenderEngine.h"
+
+#include <android-base/properties.h>
+#include <src/core/SkTraceEventCommon.h>
+
 namespace android {
 namespace renderengine {
-namespace skia {} // namespace skia
+namespace skia {
+SkiaRenderEngine::SkiaRenderEngine(RenderEngineType type) : RenderEngine(type) {
+    SkAndroidFrameworkTraceUtil::setEnableTracing(
+            base::GetBoolProperty(PROPERTY_SKIA_ATRACE_ENABLED, false));
+}
+} // namespace skia
 } // namespace renderengine
-} // namespace android
\ No newline at end of file
+} // namespace android

libs/renderengine/skia/SkiaRenderEngine.h

diff --git a/libs/renderengine/skia/SkiaRenderEngine.h b/libs/renderengine/skia/SkiaRenderEngine.h
index 308c5ff..7bb6d6d 100644
--- a/libs/renderengine/skia/SkiaRenderEngine.h
+++ b/libs/renderengine/skia/SkiaRenderEngine.h
@@ -36,7 +36,7 @@
 class SkiaRenderEngine : public RenderEngine {
 public:
     static std::unique_ptr<SkiaRenderEngine> create(const RenderEngineCreationArgs& args);
-    SkiaRenderEngine(RenderEngineType type) : RenderEngine(type) {}
+    SkiaRenderEngine(RenderEngineType type);
     ~SkiaRenderEngine() override {}
 
     virtual void primeCache() override{};
@@ -60,8 +60,8 @@
 
 protected:
     virtual void mapExternalTextureBuffer(const sp<GraphicBuffer>& /*buffer*/,
-                                          bool /*isRenderable*/) override;
-    virtual void unmapExternalTextureBuffer(const sp<GraphicBuffer>& /*buffer*/) override;
+                                          bool /*isRenderable*/) override = 0;
+    virtual void unmapExternalTextureBuffer(const sp<GraphicBuffer>& /*buffer*/) override = 0;
 };
 
 } // namespace skia