diff options
author | John Reck <jreck@google.com> | 2018-04-30 14:43:22 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2018-04-30 14:43:22 -0700 |
commit | b5fc209b35b96bdf6a3cff97fa3bcbcd3c2bcb83 (patch) | |
tree | 201a44d1b23206d4e47e7d963a5e270b53aea157 /libs/hwui/renderthread/RenderThread.cpp | |
parent | 02995ec8a0de29a0ffa9ba377cbbb7e79009d274 (diff) |
Remove unneeded pipeline check
Test: none
Change-Id: I1123567c51efff3eef6c09f76c1624e48f71c802
Diffstat (limited to 'libs/hwui/renderthread/RenderThread.cpp')
-rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index 5dcfc3f579df..3eaf43b65f69 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()); - - 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); - } + 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); } void RenderThread::destroyGlContext() { |