commit 321e9105a8c66098492396ab77613ef31a02ffcc
author android-build-team Robot <android-build-team-robot@google.com> Tue May 01 04:08:14 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 01 04:08:14 2018 +0000
tree eb8ae8971454469efc97aa9430b4631a118ae849
parent 4e606077cff82e87971565939b04f69a1eb89d70
parent b5fc209b35b96bdf6a3cff97fa3bcbcd3c2bcb83

Merge "Remove unneeded pipeline check"

libs/hwui/renderthread/RenderThread.cpp

diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 5dcfc3f..3eaf43b 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -180,22 +180,20 @@
     mEglManager->initialize();
     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());
+    debug::GlesDriver* driver = debug::GlesDriver::get();
+    sk_sp<const GrGLInterface> glInterface(driver->getSkiaInterface());
 #else
-        sk_sp<const GrGLInterface> glInterface(GrGLCreateNativeInterface());
+    sk_sp<const GrGLInterface> glInterface(GrGLCreateNativeInterface());
 #endif
-        LOG_ALWAYS_FATAL_IF(!glInterface.get());
+    LOG_ALWAYS_FATAL_IF(!glInterface.get());
 
-        GrContextOptions options;
-        options.fDisableDistanceFieldPaths = true;
-        cacheManager().configureContext(&options);
-        sk_sp<GrContext> grContext(GrContext::MakeGL(std::move(glInterface), options));
-        LOG_ALWAYS_FATAL_IF(!grContext.get());
-        setGrContext(grContext);
-    }
+    GrContextOptions options;
+    options.fDisableDistanceFieldPaths = true;
+    cacheManager().configureContext(&options);
+    sk_sp<GrContext> grContext(GrContext::MakeGL(std::move(glInterface), options));
+    LOG_ALWAYS_FATAL_IF(!grContext.get());
+    setGrContext(grContext);
 }
 
 void RenderThread::destroyGlContext() {