feedback

Author: z3moon

filament/backend/include/backend/platforms/PlatformEGL.h

@@ -28,7 +28,6 @@
 #include <utils/Invocable.h>
 
 #include <initializer_list>
-#include <optional>
 #include <utility>
 #include <vector>
 
@@ -169,9 +168,7 @@ class PlatformEGL : public OpenGLPlatform {
     EGLConfig mEGLConfig = EGL_NO_CONFIG_KHR;
     Config mContextAttribs;
     std::vector<EGLContext> mAdditionalContexts;
-    // A cache for MSAA support queries. The index of the vector corresponds to the power of 2 of
-    // the sample count. For example, index 0 is for 2 samples, 1 is for 4 samples, etc.
-    mutable std::vector<std::optional<bool>> mMSAASupport{4}; // caches for 2x, 4x, 8x, 16x
+    bool mMSAA4XSupport;
 
     // supported extensions detected at runtime
     struct {
@@ -222,6 +219,8 @@ class PlatformEGL : public OpenGLPlatform {
             return makeCurrent(mCurrentContext, drawSurface, readSurface);
         }
     } egl{ mEGLDisplay };
+
+    bool checkIfMSAASwapChainSupported(uint32_t samples) const noexcept;
 };
 
 } // namespace filament::backend

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

@@ -32,7 +32,6 @@
 #endif
 #include <utils/compiler.h>
 
-#include <utils/algorithm.h>
 #include <utils/Invocable.h>
 #include <utils/Logger.h>
 #include <utils/debug.h>
@@ -108,7 +107,9 @@ void PlatformEGL::clearGlError() noexcept {
 
 // ---------------------------------------------------------------------------------------------
 
-PlatformEGL::PlatformEGL() noexcept = default;
+PlatformEGL::PlatformEGL() noexcept : OpenGLPlatform() {
+    mMSAA4XSupport = checkIfMSAASwapChainSupported(4);
+}
 
 int PlatformEGL::getOSVersion() const noexcept {
     return 0;
@@ -494,58 +495,17 @@ bool PlatformEGL::isMSAASwapChainSupported(uint32_t samples) const noexcept {
 
     // The number of samples must be a power-of-two > 1.
     if ((samples & (samples - 1)) != 0) {
-        LOG(INFO) << "The number of samples for MSAA is not a power of two: " << samples;
+        LOG(WARNING) << "The number of samples for MSAA is not a power of two: " << samples;
         return false;
     }
 
-    // `samples` is a power-of-two that is greater than 1 (e.g., 2, 4, 8, ...).
-    // We use this to compute an index into our cache.
-    const uint32_t power = utils::ctz(samples); // `power` is 3 if the number of samples is 8x.
-    const uint32_t index = power - 1; // The index 0 originally means 1x, which we don't count.
-                                      // So make the index 0 to indicate 2x.
-    if (mMSAASupport.size() <= index) {
-        mMSAASupport.resize(index + 1);
-    }
-
-    // Return the cached value if we have one.
-    if (mMSAASupport[index]) {
-        return *mMSAASupport[index];
-    }
-
-    // Retrieve the config to see if the given number of samples is supported. The result is cached.
-    Config configAttribs = {
-            { EGL_SURFACE_TYPE,    EGL_WINDOW_BIT | EGL_PBUFFER_BIT },
-            { EGL_RED_SIZE,        8 },
-            { EGL_GREEN_SIZE,      8 },
-            { EGL_BLUE_SIZE,       8 },
-            { EGL_DEPTH_SIZE,      24 },
-            { EGL_SAMPLE_BUFFERS,  1 },
-            { EGL_SAMPLES,         (EGLint)samples },
-    };
-
-    if (!ext.egl.KHR_no_config_context) {
-        if (isOpenGL()) {
-            configAttribs[EGL_RENDERABLE_TYPE] = EGL_OPENGL_BIT;
-        } else {
-            configAttribs[EGL_RENDERABLE_TYPE] = EGL_OPENGL_ES2_BIT;
-            if (ext.egl.KHR_create_context) {
-                configAttribs[EGL_RENDERABLE_TYPE] |= EGL_OPENGL_ES3_BIT_KHR;
-            }
-        }
-    }
-
-    EGLConfig config = EGL_NO_CONFIG_KHR;
-    EGLint configsCount;
-    bool supported = false;
-    if (!eglChooseConfig(mEGLDisplay, configAttribs.data(), &config, 1, &configsCount)) {
-        supported = false;
-    } else {
-        supported = configsCount > 0;
+    if (samples == 4) {
+        return mMSAA4XSupport;
     }
 
-    mMSAASupport[index] = supported;
-
-    return supported;
+    // Other sample counts are not cached, retrieve it.
+    LOG(INFO) << "MSAA sample count " << samples << " is queried, consider caching it.";
+    return checkIfMSAASwapChainSupported(samples);
 }
 
 Platform::SwapChain* PlatformEGL::createSwapChain(
@@ -865,6 +825,38 @@ EGLContext PlatformEGL::getContextForType(ContextType type) const noexcept {
     }
 }
 
+bool PlatformEGL::checkIfMSAASwapChainSupported(uint32_t samples) const noexcept {
+    // Retrieve the config to see if the given number of samples is supported. The result is cached.
+    Config configAttribs = {
+            { EGL_SURFACE_TYPE,    EGL_WINDOW_BIT | EGL_PBUFFER_BIT },
+            { EGL_RED_SIZE,        8 },
+            { EGL_GREEN_SIZE,      8 },
+            { EGL_BLUE_SIZE,       8 },
+            { EGL_DEPTH_SIZE,      24 },
+            { EGL_SAMPLE_BUFFERS,  1 },
+            { EGL_SAMPLES,         (EGLint)samples },
+    };
+
+    if (!ext.egl.KHR_no_config_context) {
+        if (isOpenGL()) {
+            configAttribs[EGL_RENDERABLE_TYPE] = EGL_OPENGL_BIT;
+        } else {
+            configAttribs[EGL_RENDERABLE_TYPE] = EGL_OPENGL_ES2_BIT;
+            if (ext.egl.KHR_create_context) {
+                configAttribs[EGL_RENDERABLE_TYPE] |= EGL_OPENGL_ES3_BIT_KHR;
+            }
+        }
+    }
+
+    EGLConfig config = EGL_NO_CONFIG_KHR;
+    EGLint configsCount;
+    if (!eglChooseConfig(mEGLDisplay, configAttribs.data(), &config, 1, &configsCount)) {
+        return false;
+    }
+
+    return configsCount > 0;
+}
+
 // ---------------------------------------------------------------------------------------------
 
 PlatformEGL::Config::Config() = default;