summaryrefslogtreecommitdiff
path: root/libs/hwui/Extensions.cpp
diff options
context:
space:
mode:
author Stan Iliev <stani@google.com> 2017-10-18 13:12:32 -0400
committer Stan Iliev <stani@google.com> 2017-10-18 13:12:32 -0400
commitd56d2188fc7fbc646516a5d3da99bc95b2480319 (patch)
tree7b2d68b77209e57a013260b68ed9b9ca3d735ee9 /libs/hwui/Extensions.cpp
parent3cf1a9452457f5e2165d18eba4daf9fab57af746 (diff)
Fix crash in Vulkan pipeline at boot time
Fix a crash caused by calling OpenGL APIs with Vulkan pipeline (likely a regression from ag/2706458). Test: Ran CtsViewTestCases tests with SkiaGL pipeline. Change-Id: Ibabeb4229ef88de57c99f2961a10a68ca71b25ab
Diffstat (limited to 'libs/hwui/Extensions.cpp')
-rw-r--r--libs/hwui/Extensions.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/hwui/Extensions.cpp b/libs/hwui/Extensions.cpp
index 1e71cb081b39..6b8006cc5a33 100644
--- a/libs/hwui/Extensions.cpp
+++ b/libs/hwui/Extensions.cpp
@@ -31,6 +31,12 @@ namespace android {
namespace uirenderer {
Extensions::Extensions() {
+ if (Properties::getRenderPipelineType() != RenderPipelineType::OpenGL) {
+ //Extensions class is used only by OpenGL pipeline
+ //The code below will crash for SkiaVulkan, because OpenGL is not initialized
+ //TODO: instantiate Extensions class only for OpenGL pipeline
+ return;
+ }
const char* version = (const char*) glGetString(GL_VERSION);
// Section 6.1.5 of the OpenGL ES specification indicates the GL version