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

Commit 81b0aa69 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

get rid of an old hack to work around a bug around glDeleteTextures() in the adreno drivers

parent ef07dda4

libs/surfaceflinger/Layer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void Layer::destroy() 
        if (mTextures[i].name != -1U) {

            // FIXME: this was originally to work-around a bug in the

            // adreno driver. this should be fixed now.

            deletedTextures.add(mTextures[i].name);

            glDeleteTextures(1, &mTextures[i].name);

            mTextures[i].name = -1U;

        }

        if (mTextures[i].image != EGL_NO_IMAGE_KHR) {

libs/surfaceflinger/LayerBase.cpp

+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ const char* const LayerBaseClient::typeID = "LayerBaseClient"; 


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



Vector<GLuint> LayerBase::deletedTextures; 



int32_t LayerBase::sIdentity = 0;



LayerBase::LayerBase(SurfaceFlinger* flinger, DisplayID display)

libs/surfaceflinger/LayerBase.h

+0 −2
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ public: 
    }



    

    static Vector<GLuint> deletedTextures; 



    LayerBase(SurfaceFlinger* flinger, DisplayID display);

    

    DisplayID           dpy;

libs/surfaceflinger/LayerBlur.cpp

+1 −2
Original line number Diff line number Diff line
@@ -47,8 +47,7 @@ LayerBlur::LayerBlur(SurfaceFlinger* flinger, DisplayID display, 
LayerBlur::~LayerBlur()

{

    if (mTextureName != -1U) {

        //glDeleteTextures(1, &mTextureName);

        deletedTextures.add(mTextureName);

        glDeleteTextures(1, &mTextureName);

    }

}

libs/surfaceflinger/LayerBuffer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ LayerBuffer::BufferSource::BufferSource(LayerBuffer& layer, 
LayerBuffer::BufferSource::~BufferSource()

{    

    if (mTextureName != -1U) {

        LayerBase::deletedTextures.add(mTextureName);

        glDeleteTextures(1, &mTextureName);

    }

}