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

Commit 867c43de authored by John Reck's avatar John Reck Committed by Stan Iliev
Browse files

Revert "TextureView Vulkan support and optimized OpenGL draw" 

This reverts commit c8e22a65.

Reason for revert: broke camera, b/113555199

Bug: 113555199
Change-Id: Iae9b462694d5de0cd99427afead63b567fb4d71d
parent c8e22a65

core/jni/android/graphics/ColorFilter.cpp

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

#include "SkColorMatrixFilter.h"



#include <Caches.h>



namespace android {



using namespace uirenderer;

core/jni/android/graphics/Matrix.cpp

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

#include "core_jni_helpers.h"



#include <Caches.h>

#include <jni.h>



namespace android {

core/jni/android/graphics/Shader.cpp

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

#include "core_jni_helpers.h"



#include <Caches.h>

#include <jni.h>



using namespace android::uirenderer;

core/jni/android/graphics/SurfaceTexture.cpp

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

#include <nativehelper/JNIHelp.h>

#include <nativehelper/ScopedLocalRef.h>

#include "surfacetexture/SurfaceTexture.h"



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



static void SurfaceTexture_setSurfaceTexture(JNIEnv* env, jobject thiz,

        const sp<SurfaceTexture>& surfaceTexture)

        const sp<GLConsumer>& surfaceTexture)

{

    SurfaceTexture* const p =

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

    GLConsumer* const p =

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

    if (surfaceTexture.get()) {

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

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



static void SurfaceTexture_setFrameAvailableListener(JNIEnv* env,

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

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

{

    SurfaceTexture::FrameAvailableListener* const p =

        (SurfaceTexture::FrameAvailableListener*)

    GLConsumer::FrameAvailableListener* const p =

        (GLConsumer::FrameAvailableListener*)

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

    if (listener.get()) {

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

}



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

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

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

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

}



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



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

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

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

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

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

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


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



class JNISurfaceTextureContext : public SurfaceTexture::FrameAvailableListener

class JNISurfaceTextureContext : public GLConsumer::FrameAvailableListener

{

public:

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

    }



    sp<SurfaceTexture> surfaceTexture;

    sp<GLConsumer> surfaceTexture;

    if (isDetached) {

        surfaceTexture = new SurfaceTexture(consumer, GL_TEXTURE_EXTERNAL_OES,

        surfaceTexture = new GLConsumer(consumer, GL_TEXTURE_EXTERNAL_OES,

                true, !singleBufferMode);

    } else {

        surfaceTexture = new SurfaceTexture(consumer, texName,

        surfaceTexture = new GLConsumer(consumer, texName,

                GL_TEXTURE_EXTERNAL_OES, true, !singleBufferMode);

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


static void SurfaceTexture_finalize(JNIEnv* env, jobject thiz)

{

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

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

    surfaceTexture->setFrameAvailableListener(0);

    SurfaceTexture_setFrameAvailableListener(env, thiz, 0);

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


static void SurfaceTexture_setDefaultBufferSize(

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

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

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

    surfaceTexture->setDefaultBufferSize(width, height);

}



static void SurfaceTexture_updateTexImage(JNIEnv* env, jobject thiz)

{

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

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

    status_t err = surfaceTexture->updateTexImage();

    if (err == INVALID_OPERATION) {

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


static void SurfaceTexture_releaseTexImage(JNIEnv* env, jobject thiz)

{

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

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

    status_t err = surfaceTexture->releaseTexImage();

    if (err == INVALID_OPERATION) {

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


static jint SurfaceTexture_detachFromGLContext(JNIEnv* env, jobject thiz)

{

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

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

    return surfaceTexture->detachFromContext();

}



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

{

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

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

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

}



static void SurfaceTexture_getTransformMatrix(JNIEnv* env, jobject thiz,

        jfloatArray jmtx)

{

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

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

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

    surfaceTexture->getTransformMatrix(mtx);

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


static jlong SurfaceTexture_getTimestamp(JNIEnv* env, jobject thiz)

{

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

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

    return surfaceTexture->getTimestamp();

}



static void SurfaceTexture_release(JNIEnv* env, jobject thiz)

{

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

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

    surfaceTexture->abandon();

}



static jboolean SurfaceTexture_isReleased(JNIEnv* env, jobject thiz)

{

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

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

    return surfaceTexture->isAbandoned();

}

core/jni/android_view_TextureLayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ 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);

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

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

    layer->setSurfaceTexture(surfaceTexture);

}



static void TextureLayer_updateSurfaceTexture(JNIEnv* env, jobject clazz,