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

Commit d501e10b authored by Fedor Kudasov's avatar Fedor Kudasov
Browse files

Move GL specific code away from header 

Bug: 117921091
Test: all tests should pass
Change-Id: I124a17ac6a378029fc6836ad234bf45095675aae
parent bd07d4d6

libs/hwui/DeferredLayerUpdater.cpp

+13 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
 */

#include "DeferredLayerUpdater.h"



#include <GLES2/gl2.h>

#include <GLES2/gl2ext.h>



#include "renderstate/RenderState.h"

#include "utils/PaintUtils.h"
@@ -38,6 +41,16 @@ DeferredLayerUpdater::~DeferredLayerUpdater() { 
    destroyLayer();

}



void DeferredLayerUpdater::setSurfaceTexture(const sp<SurfaceTexture>& consumer) {

    if (consumer.get() != mSurfaceTexture.get()) {

        mSurfaceTexture = consumer;



        GLenum target = consumer->getCurrentTextureTarget();

        LOG_ALWAYS_FATAL_IF(target != GL_TEXTURE_2D && target != GL_TEXTURE_EXTERNAL_OES,

                            "set unsupported SurfaceTexture with target %x", target);

    }

}



void DeferredLayerUpdater::onContextDestroyed() {

    destroyLayer();

}

libs/hwui/DeferredLayerUpdater.h

+1 −12
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
#include <system/graphics.h>

#include <utils/StrongPointer.h>



#include <GLES2/gl2.h>

#include <GLES2/gl2ext.h>



#include "renderstate/RenderState.h"

#include "surfacetexture/SurfaceTexture.h"

#include "Layer.h"
@@ -67,15 +64,7 @@ public: 
        return false;

    }



    ANDROID_API void setSurfaceTexture(const sp<SurfaceTexture>& consumer) {

        if (consumer.get() != mSurfaceTexture.get()) {

            mSurfaceTexture = consumer;



            GLenum target = consumer->getCurrentTextureTarget();

            LOG_ALWAYS_FATAL_IF(target != GL_TEXTURE_2D && target != GL_TEXTURE_EXTERNAL_OES,

                                "set unsupported SurfaceTexture with target %x", target);

        }

    }

    ANDROID_API void setSurfaceTexture(const sp<SurfaceTexture>& consumer);



    ANDROID_API void updateTexImage() { mUpdateTexImage = true; }