From 7475d0f8dba8040dfeaf5278dbf83d4f964f8a65 Mon Sep 17 00:00:00 2001 From: Stan Iliev Date: Tue, 31 Oct 2017 11:47:54 -0400 Subject: Fix testWindowProducerCopyToRGBA16F test on x86 emulator Fix readback to return correct error code on X86 emulator, when half float pixel format is not supported. Test: Ran and passed all CtsViewTestCases tests on x86 emulator Bug: 68383159 Change-Id: Id66484b73488e2c8d29fbecbd45a97af285a0710 --- libs/hwui/Extensions.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libs/hwui/Extensions.cpp') diff --git a/libs/hwui/Extensions.cpp b/libs/hwui/Extensions.cpp index 6b8006cc5a33..115dcb656f66 100644 --- a/libs/hwui/Extensions.cpp +++ b/libs/hwui/Extensions.cpp @@ -31,10 +31,11 @@ namespace android { namespace uirenderer { Extensions::Extensions() { - if (Properties::getRenderPipelineType() != RenderPipelineType::OpenGL) { - //Extensions class is used only by OpenGL pipeline + if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaVulkan) { + //Extensions class is used only by OpenGL and SkiaGL pipelines //The code below will crash for SkiaVulkan, because OpenGL is not initialized //TODO: instantiate Extensions class only for OpenGL pipeline + //TODO: remove the only usage of Extensions by SkiaGL in SkiaOpenGLReadback::copyImageInto return; } const char* version = (const char*) glGetString(GL_VERSION); -- cgit v1.2.3-59-g8ed1b