diff options
| author | Derek Sollenberger <djsollen@google.com> | 2016-11-07 10:57:59 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2016-11-07 10:59:20 -0500 |
| commit | 7e044fef628c7deb25189958714cb93a714a3617 (patch) | |
| tree | c51e0729851a5d511290a43029e50225500ccd35 /libs/hwui/renderthread/EglManager.cpp | |
| parent | 3d36fac2350cbce6dbdcd7502dc9adb0210d3d8b (diff) | |
Enable SkiaPipelines to interoperate with existing GlesDriver configs.
Test: hwui unit tests
Change-Id: Icd94d0e21130d86fb5514801f999d0018a69e151
Diffstat (limited to 'libs/hwui/renderthread/EglManager.cpp')
| -rw-r--r-- | libs/hwui/renderthread/EglManager.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp index beaa85e1e2ad..de95bee39763 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -30,6 +30,10 @@ #include <gl/GrGLInterface.h> #include <string> +#ifdef HWUI_GLES_WRAP_ENABLED +#include "debug/GlesDriver.h" +#endif + #define GLES_VERSION 2 // Android-specific addition that is used to show when frames began in systrace @@ -131,7 +135,12 @@ void EglManager::initialize() { mRenderThread.renderState().onGLContextCreated(); if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL) { +#ifdef HWUI_GLES_WRAP_ENABLED + debug::GlesDriver* driver = debug::GlesDriver::get(); + sk_sp<const GrGLInterface> glInterface(driver->getSkiaInterface()); +#else sk_sp<const GrGLInterface> glInterface(GrGLCreateNativeInterface()); +#endif LOG_ALWAYS_FATAL_IF(!glInterface.get()); GrContextOptions options; |