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

Commit 85f9096b authored by Stan Iliev's avatar Stan Iliev
Browse files

Revert "Revert "TextureView Vulkan support and optimized OpenGL draw"" 

This reverts commit 867c43de.

Reason for revert: Fixed issue with unsupported hardware buffer formats by landing https://skia-review.googlesource.com/c/skia/+/150470 "Support more hardware buffer formats"

Bug: 113673613
Change-Id: I1f7c528f138e290160e75833c8d989d9535002ee
parent f5121c96

core/jni/android/graphics/ColorFilter.cpp

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include "SkColorFilter.h"

#include "SkColorMatrixFilter.h"



#include <Caches.h>



namespace android {



using namespace uirenderer;

core/jni/android/graphics/Matrix.cpp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include "SkMatrix.h"

#include "core_jni_helpers.h"



#include <Caches.h>

#include <jni.h>



namespace android {

core/jni/android/graphics/Shader.cpp

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include "SkBlendMode.h"

#include "core_jni_helpers.h"



#include <Caches.h>

#include <jni.h>



using namespace android::uirenderer;

core/jni/android/graphics/SurfaceTexture.cpp

+24 −23
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "jni.h"

#include <nativehelper/JNIHelp.h>

#include <nativehelper/ScopedLocalRef.h>

#include "surfacetexture/SurfaceTexture.h"



// ----------------------------------------------------------------------------
@@ -80,10 +81,10 @@ static bool isProtectedContext() { 
// ----------------------------------------------------------------------------



static void SurfaceTexture_setSurfaceTexture(JNIEnv* env, jobject thiz,

        const sp<GLConsumer>& surfaceTexture)

        const sp<SurfaceTexture>& surfaceTexture)

{

    GLConsumer* const p =

        (GLConsumer*)env->GetLongField(thiz, fields.surfaceTexture);

    SurfaceTexture* const p =

        (SurfaceTexture*)env->GetLongField(thiz, fields.surfaceTexture);

    if (surfaceTexture.get()) {

        surfaceTexture->incStrong((void*)SurfaceTexture_setSurfaceTexture);

    }
@@ -108,10 +109,10 @@ static void SurfaceTexture_setProducer(JNIEnv* env, jobject thiz, 
}



static void SurfaceTexture_setFrameAvailableListener(JNIEnv* env,

        jobject thiz, sp<GLConsumer::FrameAvailableListener> listener)

        jobject thiz, sp<SurfaceTexture::FrameAvailableListener> listener)

{

    GLConsumer::FrameAvailableListener* const p =

        (GLConsumer::FrameAvailableListener*)

    SurfaceTexture::FrameAvailableListener* const p =

        (SurfaceTexture::FrameAvailableListener*)

            env->GetLongField(thiz, fields.frameAvailableListener);

    if (listener.get()) {

        listener->incStrong((void*)SurfaceTexture_setSurfaceTexture);
@@ -122,8 +123,8 @@ static void SurfaceTexture_setFrameAvailableListener(JNIEnv* env, 
    env->SetLongField(thiz, fields.frameAvailableListener, (jlong)listener.get());

}



sp<GLConsumer> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz) {

    return (GLConsumer*)env->GetLongField(thiz, fields.surfaceTexture);

sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz) {

    return (SurfaceTexture*)env->GetLongField(thiz, fields.surfaceTexture);

}



sp<IGraphicBufferProducer> SurfaceTexture_getProducer(JNIEnv* env, jobject thiz) {
@@ -131,7 +132,7 @@ sp<IGraphicBufferProducer> SurfaceTexture_getProducer(JNIEnv* env, jobject thiz) 
}



sp<ANativeWindow> android_SurfaceTexture_getNativeWindow(JNIEnv* env, jobject thiz) {

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    sp<IGraphicBufferProducer> producer(SurfaceTexture_getProducer(env, thiz));

    sp<Surface> surfaceTextureClient(surfaceTexture != NULL ? new Surface(producer) : NULL);

    return surfaceTextureClient;
@@ -144,7 +145,7 @@ bool android_SurfaceTexture_isInstanceOf(JNIEnv* env, jobject thiz) { 


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



class JNISurfaceTextureContext : public GLConsumer::FrameAvailableListener

class JNISurfaceTextureContext : public SurfaceTexture::FrameAvailableListener

{

public:

    JNISurfaceTextureContext(JNIEnv* env, jobject weakThiz, jclass clazz);
@@ -266,12 +267,12 @@ static void SurfaceTexture_init(JNIEnv* env, jobject thiz, jboolean isDetached, 
        consumer->setMaxBufferCount(1);

    }



    sp<GLConsumer> surfaceTexture;

    sp<SurfaceTexture> surfaceTexture;

    if (isDetached) {

        surfaceTexture = new GLConsumer(consumer, GL_TEXTURE_EXTERNAL_OES,

        surfaceTexture = new SurfaceTexture(consumer, GL_TEXTURE_EXTERNAL_OES,

                true, !singleBufferMode);

    } else {

        surfaceTexture = new GLConsumer(consumer, texName,

        surfaceTexture = new SurfaceTexture(consumer, texName,

                GL_TEXTURE_EXTERNAL_OES, true, !singleBufferMode);

    }
@@ -306,7 +307,7 @@ static void SurfaceTexture_init(JNIEnv* env, jobject thiz, jboolean isDetached, 


static void SurfaceTexture_finalize(JNIEnv* env, jobject thiz)

{

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    surfaceTexture->setFrameAvailableListener(0);

    SurfaceTexture_setFrameAvailableListener(env, thiz, 0);

    SurfaceTexture_setSurfaceTexture(env, thiz, 0);
@@ -315,13 +316,13 @@ static void SurfaceTexture_finalize(JNIEnv* env, jobject thiz) 


static void SurfaceTexture_setDefaultBufferSize(

        JNIEnv* env, jobject thiz, jint width, jint height) {

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    surfaceTexture->setDefaultBufferSize(width, height);

}



static void SurfaceTexture_updateTexImage(JNIEnv* env, jobject thiz)

{

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    status_t err = surfaceTexture->updateTexImage();

    if (err == INVALID_OPERATION) {

        jniThrowException(env, IllegalStateException, "Unable to update texture contents (see "
@@ -333,7 +334,7 @@ static void SurfaceTexture_updateTexImage(JNIEnv* env, jobject thiz) 


static void SurfaceTexture_releaseTexImage(JNIEnv* env, jobject thiz)

{

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    status_t err = surfaceTexture->releaseTexImage();

    if (err == INVALID_OPERATION) {

        jniThrowException(env, IllegalStateException, "Unable to release texture contents (see "
@@ -345,20 +346,20 @@ static void SurfaceTexture_releaseTexImage(JNIEnv* env, jobject thiz) 


static jint SurfaceTexture_detachFromGLContext(JNIEnv* env, jobject thiz)

{

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    return surfaceTexture->detachFromContext();

}



static jint SurfaceTexture_attachToGLContext(JNIEnv* env, jobject thiz, jint tex)

{

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    return surfaceTexture->attachToContext((GLuint)tex);

}



static void SurfaceTexture_getTransformMatrix(JNIEnv* env, jobject thiz,

        jfloatArray jmtx)

{

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    float* mtx = env->GetFloatArrayElements(jmtx, NULL);

    surfaceTexture->getTransformMatrix(mtx);

    env->ReleaseFloatArrayElements(jmtx, mtx, 0);
@@ -366,19 +367,19 @@ static void SurfaceTexture_getTransformMatrix(JNIEnv* env, jobject thiz, 


static jlong SurfaceTexture_getTimestamp(JNIEnv* env, jobject thiz)

{

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    return surfaceTexture->getTimestamp();

}



static void SurfaceTexture_release(JNIEnv* env, jobject thiz)

{

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    surfaceTexture->abandon();

}



static jboolean SurfaceTexture_isReleased(JNIEnv* env, jobject thiz)

{

    sp<GLConsumer> surfaceTexture(SurfaceTexture_getSurfaceTexture(env, thiz));

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

    return surfaceTexture->isAbandoned();

}

core/jni/android_view_TextureLayer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -67,8 +67,7 @@ static void TextureLayer_setTransform(JNIEnv* env, jobject clazz, 
static void TextureLayer_setSurfaceTexture(JNIEnv* env, jobject clazz,

        jlong layerUpdaterPtr, jobject surface) {

    DeferredLayerUpdater* layer = reinterpret_cast<DeferredLayerUpdater*>(layerUpdaterPtr);

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

    layer->setSurfaceTexture(surfaceTexture);

    layer->setSurfaceTexture(SurfaceTexture_getSurfaceTexture(env, surface));

}



static void TextureLayer_updateSurfaceTexture(JNIEnv* env, jobject clazz,