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

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

Merge "Fix testWindowProducerCopyToRGBA16F test on x86 emulator"

parents d23881e2 7475d0f8

libs/hwui/Extensions.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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);

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 &&

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

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

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

        return CopyResult::DestinationInvalid;

    }