split passthrough stuff into separate file, made variables camelCase

Author: Dominik Wetzel

code/mobile/android/PhoneVR/app/CMakeLists.txt

@@ -20,6 +20,7 @@ file(GLOB_RECURSE  MY_SRC
 add_library(native-lib SHARED
     src/main/cpp/native-lib.cpp
     src/main/cpp/alvr_main.cpp
+    src/main/cpp/passthrough.cpp
     ${MY_SRC}
 )
 

code/mobile/android/PhoneVR/app/src/main/cpp/alvr_main.cpp

@@ -1,7 +1,6 @@
 #include "alvr_client_core.h"
 #include "cardboard.h"
 #include <GLES3/gl3.h>
-#include <GLES2/gl2ext.h>
 #include <algorithm>
 #include <deque>
 #include <jni.h>
@@ -11,6 +10,7 @@
 #include <vector>
 
 #include "common.h"
+#include "passthrough.h"
 
 void log(AlvrLogLevel level, const char *format, ...) {
     va_list args;
@@ -44,65 +44,6 @@ struct Pose {
     AlvrQuat orientation;
 };
 
-GLuint LoadGLShader(GLenum type, const char *shader_source) {
-    GLuint shader = glCreateShader(type);
-    glShaderSource(shader, 1, &shader_source, nullptr);
-    glCompileShader(shader);
-
-    // Get the compilation status.
-    GLint compile_status;
-    glGetShaderiv(shader, GL_COMPILE_STATUS, &compile_status);
-
-    // If the compilation failed, delete the shader and show an error.
-    if (compile_status == 0) {
-        GLint info_len = 0;
-        glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &info_len);
-        if (info_len == 0) {
-            return 0;
-        }
-
-        std::vector<char> info_string(info_len);
-        glGetShaderInfoLog(shader, info_string.size(), nullptr, info_string.data());
-        // LOGE("Could not compile shader of type %d: %s", type, info_string.data());
-        glDeleteShader(shader);
-        return 0;
-    } else {
-        return shader;
-    }
-}
-
-namespace {
-    // Simple shaders to render camera Texture files without any lighting.
-    constexpr const char *camVertexShader =
-        R"glsl(
-    uniform mat4 u_MVP;
-    attribute vec4 a_Position;
-    attribute vec2 a_UV;
-    varying vec2 v_UV;
-
-    void main() {
-      v_UV = a_UV;
-      gl_Position = a_Position;
-    })glsl";
-
-    constexpr const char *camFragmentShader =
-        R"glsl(
-    #extension GL_OES_EGL_image_external : require
-    precision mediump float;
-    varying vec2 v_UV;
-    uniform samplerExternalOES sTexture;
-    void main() {
-        gl_FragColor = texture2D(sTexture, v_UV);
-    })glsl";
-
-    static int passthrough_program_ = 0;
-    static int texture_position_param_ = 0;
-    static int texture_uv_param_ = 0;
-    static int texture_mvp_param_ = 0;
-
-    float passthrough_tex_coords[] = {0.0, 1.0, 1.0, 1.0, 0.0, 0.0, 1.0, 0.0};
-}   // namespace
-
 struct NativeContext {
     JavaVM *javaVm = nullptr;
     jobject javaContext = nullptr;
@@ -119,24 +60,13 @@ struct NativeContext {
 
     bool running = false;
     bool streaming = false;
-    bool passthrough = false;
+    PassthroughInfo passthroughInfo = {};
     std::thread inputThread;
 
     // Une one texture per eye, no need for swapchains.
     GLuint lobbyTextures[2] = {};
     GLuint streamTextures[2] = {};
 
-    GLuint cameraTexture = 0;
-    GLuint passthroughTexture = 0;
-    CardboardEyeTextureDescription passthrough_left_eye;
-    CardboardEyeTextureDescription passthrough_right_eye;
-
-    GLuint passthroughDepthRenderBuffer = 0;
-    GLuint passthroughFramebuffer = 0;
-
-    float passthrough_vertices[8];
-    float passthrough_size = 1.0;
-
     float eyeOffsets[2] = {};
 };
 
@@ -210,23 +140,6 @@ Pose getPose(uint64_t timestampNs) {
     return pose;
 }
 
-void createPassthroughPlane(NativeContext *ctx) {
-    float size = ctx->passthrough_size;
-    float x0 = -size, y0 = size;    // Top left
-    float x1 = size, y1 = size;     // Top right
-    float x2 = size, y2 = -size;    // Bottom right
-    float x3 = -size, y3 = -size;   // Bottom left
-
-    ctx->passthrough_vertices[0] = x3;
-    ctx->passthrough_vertices[1] = y3;
-    ctx->passthrough_vertices[2] = x2;
-    ctx->passthrough_vertices[3] = y2;
-    ctx->passthrough_vertices[4] = x0;
-    ctx->passthrough_vertices[5] = y0;
-    ctx->passthrough_vertices[6] = x1;
-    ctx->passthrough_vertices[7] = y1;
-}
-
 void inputThread() {
     auto deadline = std::chrono::steady_clock::now();
 
@@ -276,7 +189,10 @@ extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_ALVRActivity_initia
 
     Cardboard_initializeAndroid(CTX.javaVm, CTX.javaContext);
     CTX.headTracker = CardboardHeadTracker_create();
-    createPassthroughPlane(&CTX);
+
+    CTX.passthroughInfo.screenWidth = &(CTX.screenWidth);
+    CTX.passthroughInfo.screenHeight = &(CTX.screenHeight);
+    passthrough_createPlane(&(CTX.passthroughInfo));
 }
 
 extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_ALVRActivity_destroyNative(JNIEnv *,
@@ -323,45 +239,22 @@ extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_ALVRActivity_pauseN
 
 extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_Passthrough_setPassthroughActiveNative(
     JNIEnv *, jobject, jboolean activate) {
-    CTX.passthrough = activate;
+    CTX.passthroughInfo.enabled = activate;
     CTX.renderingParamsChanged = true;
 }
 
 extern "C" JNIEXPORT void JNICALL
 Java_viritualisres_phonevr_Passthrough_setPassthroughSizeNative(JNIEnv *, jobject, jfloat size) {
-    CTX.passthrough_size = size;
-    createPassthroughPlane(&CTX);
+    CTX.passthroughInfo.passthroughSize = size;
+    passthrough_createPlane(&(CTX.passthroughInfo));
 }
 
 extern "C" JNIEXPORT jint JNICALL
 Java_viritualisres_phonevr_ALVRActivity_surfaceCreatedNative(JNIEnv *, jobject) {
     alvr_initialize_opengl();
-
-    const int obj_vertex_shader = LoadGLShader(GL_VERTEX_SHADER, camVertexShader);
-    const int obj_fragment_shader = LoadGLShader(GL_FRAGMENT_SHADER, camFragmentShader);
-
-    passthrough_program_ = glCreateProgram();
-    glAttachShader(passthrough_program_, obj_vertex_shader);
-    glAttachShader(passthrough_program_, obj_fragment_shader);
-    glLinkProgram(passthrough_program_);
-
-    glUseProgram(passthrough_program_);
-    texture_position_param_ = glGetAttribLocation(passthrough_program_, "a_Position");
-    texture_uv_param_ = glGetAttribLocation(passthrough_program_, "a_UV");
-    texture_mvp_param_ = glGetUniformLocation(passthrough_program_, "u_MVP");
-
-    // TODO initialize plane mesh and texture
-    glGenTextures(1, &CTX.cameraTexture);
-    glActiveTexture(GL_TEXTURE0);
-
-    glBindTexture(GL_TEXTURE_EXTERNAL_OES, CTX.cameraTexture);
-    glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameterf(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
+    GLuint camTex = passthrough_init(&(CTX.passthroughInfo));
     CTX.glContextRecreated = true;
-    return CTX.cameraTexture;
+    return camTex;
 }
 
 extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_ALVRActivity_setScreenResolutionNative(
@@ -377,54 +270,6 @@ extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_ALVRActivity_sendBa
     alvr_send_battery(HEAD_ID, level, plugged);
 }
 
-void cleanupPassthrough() {
-    if (CTX.passthroughDepthRenderBuffer != 0) {
-        glDeleteRenderbuffers(1, &CTX.passthroughDepthRenderBuffer);
-        CTX.passthroughDepthRenderBuffer = 0;
-    }
-    if (CTX.passthroughFramebuffer != 0) {
-        glDeleteFramebuffers(1, &CTX.passthroughFramebuffer);
-        CTX.passthroughFramebuffer = 0;
-    }
-    if (CTX.passthroughTexture != 0) {
-        glDeleteTextures(1, &CTX.passthroughTexture);
-        CTX.passthroughTexture = 0;
-    }
-}
-
-void passthroughSetup() {
-    // Create render texture.
-    glGenTextures(1, &CTX.passthroughTexture);
-    glBindTexture(GL_TEXTURE_2D, CTX.passthroughTexture);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-    glTexImage2D(GL_TEXTURE_2D,
-                 0,
-                 GL_RGB,
-                 CTX.screenWidth,
-                 CTX.screenHeight,
-                 0,
-                 GL_RGB,
-                 GL_UNSIGNED_BYTE,
-                 0);
-
-    // Generate depth buffer to perform depth test.
-    glGenRenderbuffers(1, &CTX.passthroughDepthRenderBuffer);
-    glBindRenderbuffer(GL_RENDERBUFFER, CTX.passthroughDepthRenderBuffer);
-    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, CTX.screenWidth, CTX.screenHeight);
-
-    // Create render target.
-    glGenFramebuffers(1, &CTX.passthroughFramebuffer);
-    glBindFramebuffer(GL_FRAMEBUFFER, CTX.passthroughFramebuffer);
-    glFramebufferTexture2D(
-        GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, CTX.passthroughTexture, 0);
-    glFramebufferRenderbuffer(
-        GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, CTX.passthroughDepthRenderBuffer);
-}
-
 extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_ALVRActivity_renderNative(JNIEnv *,
                                                                                        jobject) {
     if (CTX.renderingParamsChanged) {
@@ -449,11 +294,6 @@ extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_ALVRActivity_render
         CardboardQrCode_destroy(buffer);
         *buffer = 0;
 
-        // cleanupPassthrough();
-        // if (CTX.passthrough){
-        //     passthroughSetup();
-        // }
-
         if (CTX.distortionRenderer) {
             CardboardDistortionRenderer_destroy(CTX.distortionRenderer);
             CTX.distortionRenderer = nullptr;
@@ -481,13 +321,13 @@ extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_ALVRActivity_render
     if (CTX.renderingParamsChanged && !CTX.glContextRecreated) {
         info("Pausing ALVR since glContext is not recreated, deleting textures");
         alvr_pause_opengl();
-        cleanupPassthrough();
+        passthrough_cleanup(&(CTX.passthroughInfo));
         glDeleteTextures(2, CTX.lobbyTextures);
     }
 
     if (CTX.renderingParamsChanged || CTX.glContextRecreated) {
-        if (CTX.passthrough) {
-            passthroughSetup();
+        if (CTX.passthroughInfo.enabled) {
+            passthrough_setup(&(CTX.passthroughInfo));
         } else {
             info("Rebuilding, binding textures, Resuming ALVR since glContextRecreated %b, "
                  "renderingParamsChanged %b",
@@ -600,39 +440,8 @@ extern "C" JNIEXPORT void JNICALL Java_viritualisres_phonevr_ALVRActivity_render
         viewsDesc.bottom_v = 0.0;
     }
 
-    if (CTX.passthrough) {
-        glBindFramebuffer(GL_FRAMEBUFFER, CTX.passthroughFramebuffer);
-
-        glEnable(GL_DEPTH_TEST);
-        glEnable(GL_CULL_FACE);
-        glDisable(GL_SCISSOR_TEST);
-        glEnable(GL_BLEND);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-        // Draw Passthrough video for each eye
-        for (int eye = 0; eye < 2; ++eye) {
-            glViewport(
-                eye == kLeft ? 0 : CTX.screenWidth / 2, 0, CTX.screenWidth / 2, CTX.screenHeight);
-
-            glUseProgram(passthrough_program_);
-            glActiveTexture(GL_TEXTURE0);
-            glBindTexture(GL_TEXTURE_EXTERNAL_OES, CTX.cameraTexture);
-
-            // Draw Mesh
-            glEnableVertexAttribArray(texture_position_param_);
-            glVertexAttribPointer(
-                texture_position_param_, 2, GL_FLOAT, false, 0, CTX.passthrough_vertices);
-            glEnableVertexAttribArray(texture_uv_param_);
-            glVertexAttribPointer(texture_uv_param_, 2, GL_FLOAT, false, 0, passthrough_tex_coords);
-
-            glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
-            viewsDescs[eye].left_u = 0.5 * eye;          // 0 for left, 0.5 for right
-            viewsDescs[eye].right_u = 0.5 + 0.5 * eye;   // 0.5 for left, 1.0 for right
-        }
-        viewsDescs[0].texture = CTX.passthroughTexture;
-        viewsDescs[1].texture = CTX.passthroughTexture;
+    if (CTX.passthroughInfo.enabled) {
+        passthrough_render(&(CTX.passthroughInfo), viewsDescs);
     } else if (CTX.streaming) {
         void *streamHardwareBuffer = nullptr;
         auto timestampNs = alvr_get_frame(&streamHardwareBuffer);