From b5fc209b35b96bdf6a3cff97fa3bcbcd3c2bcb83 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Mon, 30 Apr 2018 14:43:22 -0700
Subject: [PATCH] Remove unneeded pipeline check

Test: none
Change-Id: I1123567c51efff3eef6c09f76c1624e48f71c802
---
 libs/hwui/renderthread/RenderThread.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 5dcfc3f579df8..3eaf43b65f695 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -180,22 +180,20 @@ void RenderThread::requireGlContext() {
     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() {