Merge branch 'main' into pf/android-render-val-add-info

Author: poweifeng

android/filament-utils-android/src/main/java/com/google/android/filament/utils/ModelViewer.kt

@@ -266,6 +266,35 @@ class ModelViewer(
         }
     }
 
+    /**
+     * Resets the model's transform, animation, and camera state to defaults.
+     * Call this when reusing the same model across multiple tests.
+     */
+    fun resetToDefaultState() {
+        // 1. Reset Camera parameters
+        cameraFocalLength = 28f
+        cameraNear = kNearPlane
+        cameraFar = kFarPlane
+        updateCameraProjection()
+
+        // 2. Reset the manipulator's look-at vectors to initial state
+        cameraManipulator?.let { cm ->
+            cm.jumpToBookmark(cm.homeBookmark)
+        }
+
+        // 3. Reset Animations
+        animator?.let {
+            if (it.animationCount > 0) {
+                it.applyAnimation(0, 0.0f)
+            }
+            it.updateBoneMatrices()
+        }
+
+        // 4. Re-apply the unit cube transform to clear custom scaling/translation
+        clearRootTransform()
+        transformToUnitCube()
+    }
+
     /**
      * Frees all entities associated with the most recently-loaded model.
      */

android/samples/sample-render-validation/src/main/java/com/google/android/filament/validation/MainActivity.kt

@@ -175,7 +175,7 @@ class MainActivity : Activity(), ValidationRunner.Callback {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
 
         choreographer = Choreographer.getInstance()
-        modelViewer = ModelViewer(surfaceView)
+        modelViewer = ModelViewer(surfaceView=surfaceView, manipulator=null)
         inputManager = ValidationInputManager(this)
 
         // Initialize IBL

android/samples/sample-render-validation/src/main/java/com/google/android/filament/validation/ValidationRunner.kt

@@ -83,6 +83,17 @@ class ValidationRunner(
     }
 
     private fun startModel(modelName: String) {
+        if (currentModelName == modelName) {
+            Log.i("ValidationRunner", "Reusing model $modelName")
+            callback?.onStatusChanged("Reusing $modelName for ${currentTestConfig?.name}")
+
+            modelViewer.resetToDefaultState()
+
+            frameCounter = 0
+            currentState = State.WARMUP
+            return
+        }
+
         currentModelName = modelName
         val modelPath = config.models[modelName]
         if (modelPath == null) {

filament/backend/include/backend/platforms/PlatformEGLAndroid.h

@@ -185,7 +185,7 @@ class PlatformEGLAndroid : public PlatformEGL, public AndroidNdk {
     };
 
     int mOSVersion;
-    ExternalStreamManagerAndroid& mExternalStreamManager;
+    ExternalStreamManagerAndroid* mExternalStreamManager = nullptr;
     AndroidDetails& mAndroidDetails;
     utils::PerformanceHintManager mPerformanceHintManager;
     utils::PerformanceHintManager::Session mPerformanceHintSession;

filament/backend/src/opengl/OpenGLContext.cpp

@@ -222,6 +222,15 @@ OpenGLContext::OpenGLContext(OpenGLPlatform& platform,
 #endif
 #endif
 
+#if defined(BACKEND_OPENGL_VERSION_GL) || defined(GL_EXT_disjoint_timer_query)
+    if (ext.EXT_disjoint_timer_query) {
+        mGpuTimeSupported = true;
+    } else
+#endif
+    if (platform.canCreateFence()) {
+        mGpuTimeSupported = true;
+    }
+
     // in practice KHR_Debug has never been useful, and actually is confusing. We keep this
     // only for our own debugging, in case we need it some day.
 #if false && !defined(NDEBUG) && defined(GL_KHR_debug)

filament/backend/src/opengl/OpenGLContext.h

@@ -158,8 +158,10 @@ class OpenGLContext final : public TimerQueryFactoryInterface {
     constexpr static inline size_t getIndexForBufferTarget(GLenum target) noexcept;
 
     ShaderModel getShaderModel() const noexcept { return mShaderModel; }
-
+    
     void resetState() noexcept;
+    
+    bool isGpuTimeSupported() const noexcept { return mGpuTimeSupported; }
 
     inline void useProgram(GLuint program) noexcept;
 
@@ -542,6 +544,8 @@ class OpenGLContext final : public TimerQueryFactoryInterface {
 
     Platform::DriverConfig const mDriverConfig;
 
+    bool mGpuTimeSupported = false;
+
     void bindFramebufferResolved(GLenum target, GLuint buffer) noexcept;
 
     const std::array<std::tuple<bool const&, char const*, char const*>, sizeof(bugs)> mBugDatabase{{

filament/backend/src/opengl/OpenGLDriver.cpp

@@ -2859,7 +2859,7 @@ bool OpenGLDriver::isFrameBufferFetchMultiSampleSupported() {
 }
 
 bool OpenGLDriver::isFrameTimeSupported() {
-    return TimerQueryFactory::isGpuTimeSupported();
+    return mContext.isGpuTimeSupported();
 }
 
 bool OpenGLDriver::isAutoDepthResolveSupported() {

filament/backend/src/opengl/OpenGLTimerQuery.cpp

@@ -48,7 +48,7 @@ class OpenGLDriver;
 
 // ------------------------------------------------------------------------------------------------
 
-bool TimerQueryFactory::mGpuTimeSupported = false;
+
 
 TimerQueryFactoryInterface* TimerQueryFactory::init(
         OpenGLPlatform& platform, OpenGLContext& context) {
@@ -65,17 +65,14 @@ TimerQueryFactoryInterface* TimerQueryFactory::init(
         } else {
             impl = new(std::nothrow) TimerQueryNativeFactory(context);
         }
-        mGpuTimeSupported = true;
     } else
 #endif
     if (platform.canCreateFence()) {
         // no timer queries, but we can use fences
         impl = new(std::nothrow) TimerQueryFenceFactory(platform);
-        mGpuTimeSupported = true;
     } else {
         // no queries, no fences -- that's a problem
         impl = new(std::nothrow) TimerQueryFallbackFactory();
-        mGpuTimeSupported = false;
     }
     assert_invariant(impl);
     return impl;

filament/backend/src/opengl/OpenGLTimerQuery.h

@@ -61,14 +61,9 @@ struct GLTimerQuery : public HwTimerQuery {
  */
 
 class TimerQueryFactory {
-    static bool mGpuTimeSupported;
 public:
     static TimerQueryFactoryInterface* init(
             OpenGLPlatform& platform, OpenGLContext& context);
-
-    static bool isGpuTimeSupported() noexcept {
-        return mGpuTimeSupported;
-    }
 };
 
 class TimerQueryFactoryInterface {

filament/backend/src/opengl/platforms/ExternalStreamManagerAndroid.cpp

@@ -80,6 +80,9 @@ JNIEnv* ExternalStreamManagerAndroid::getEnvironmentSlow() noexcept {
 
 Stream* ExternalStreamManagerAndroid::acquire(jobject surfaceTexture) noexcept {
     // note: This is called on the application thread (not the GL thread)
+    // The application thread *MUST* be attached to the JVM to pass the java 'surfaceTexture' down
+    // to filament natively, so we are guaranteed to get a valid JNIEnv from getThreadEnvironment()
+    // without needing AttachCurrentThread.
     JNIEnv* env = VirtualMachineEnv::getThreadEnvironment();
     if (!env) {
         return nullptr; // this should not happen