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

Commit 92432b65 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 2598a5c8: Merge "drop frame in case of error in updateTexImage" into jb-dev 

* commit '2598a5c8':
  drop frame in case of error in updateTexImage
parents f67f834a 2598a5c8

core/jni/android_view_GLES20Canvas.cpp

+5 −4
Original line number Original line Diff line number Diff line
@@ -774,12 +774,13 @@ static void android_view_GLES20Canvas_updateTextureLayer(JNIEnv* env, jobject cl 
    float transform[16];

    float transform[16];

    sp<SurfaceTexture> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, surface));

    sp<SurfaceTexture> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, surface));





    surfaceTexture->updateTexImage();

    if (surfaceTexture->updateTexImage() == NO_ERROR) {

        surfaceTexture->getTransformMatrix(transform);

        surfaceTexture->getTransformMatrix(transform);

        GLenum renderTarget = surfaceTexture->getCurrentTextureTarget();

        GLenum renderTarget = surfaceTexture->getCurrentTextureTarget();





        LayerRenderer::updateTextureLayer(layer, width, height, isOpaque, renderTarget, transform);

        LayerRenderer::updateTextureLayer(layer, width, height, isOpaque, renderTarget, transform);

    }

    }

}





static void android_view_GLES20Canvas_updateRenderLayer(JNIEnv* env, jobject clazz,

static void android_view_GLES20Canvas_updateRenderLayer(JNIEnv* env, jobject clazz,

        Layer* layer, OpenGLRenderer* renderer, DisplayList* displayList,

        Layer* layer, OpenGLRenderer* renderer, DisplayList* displayList,