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

Commit 32a95af0 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "libhwui: fix texture memory leak" 

am: 550d46d9

* commit '550d46d9':
  libhwui: fix texture memory leak
parents caf53acd 550d46d9

libs/hwui/OpenGLRenderer.cpp

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

+4 −0
Original line number Diff line number Diff line
@@ -306,6 +306,10 @@ void RenderState::render(const Glop& glop) { 
    // Shader uniforms

    SkiaShader::apply(*mCaches, fill.skiaShaderData);



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

            fill.skiaShaderData.bitmapData.bitmapTexture : nullptr;

    const AutoTexture autoCleanup(texture);



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

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

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