Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0f21094 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix crash in Vulkan pipeline at boot time"

parents ef511a87 d56d2188

libs/hwui/Extensions.cpp

+6 −0
Original line number Diff line number Diff line
@@ -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

libs/hwui/pipeline/skia/SkiaOpenGLReadback.cpp

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ CopyResult SkiaOpenGLReadback::copyImageInto(EGLImageKHR eglImage, const Matrix4 
     * for reading back float buffers (skbug.com/6945).

     */

    if (pixelConfig == kRGBA_half_GrPixelConfig &&

            !DeviceInfo::get()->extensions().hasFloatTextures()) {

            !grContext->caps()->isConfigTexturable(kRGBA_half_GrPixelConfig)) {

        ALOGW("Can't copy surface into bitmap, RGBA_F16 config is not supported");

        return CopyResult::DestinationInvalid;

    }