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

Commit c080f112 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 32a95af0 to master."

parents 829ab6da e5530ec0

libs/hwui/OpenGLRenderer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1630,6 +1630,7 @@ void OpenGLRenderer::drawPatch(const SkBitmap* bitmap, const Patch* mesh, 


    Texture* texture = entry ? entry->texture : mCaches.textureCache.get(bitmap);

    if (!texture) return;

    const AutoTexture autoCleanup(texture);



    // 9 patches are built for stretching - always filter

    int textureFillFlags = TextureFillFlags::ForceFilter;

libs/hwui/renderstate/RenderState.cpp

+3 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ void RenderState::render(const Glop& glop, const Matrix4& orthoMatrix) { 
    SkiaShader::apply(*mCaches, fill.skiaShaderData);



    GL_CHECKPOINT();

    Texture* texture = (fill.skiaShaderData.skiaShaderType & kBitmap_SkiaShaderType) ?

            fill.skiaShaderData.bitmapData.bitmapTexture : nullptr;

    const AutoTexture autoCleanup(texture);



    // ------------------------------------

    // ---------- GL state setup ----------