Merge pull request #11699 from Pokechu22/gl-check-maximum-samples

OpenGL: Check the list of supported AA modes instead of hardcoding

19 files changed, 185 insertions, 62 deletions

diff --git a/Source/Core/VideoBackends/D3D/D3DMain.cpp b/Source/Core/VideoBackends/D3D/D3DMain.cpp
index 8256674ad5..4f797fcb26 100644
--- a/Source/Core/VideoBackends/D3D/D3DMain.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DMain.cpp
@@ -63,7 +63,7 @@ std::optional<std::string> VideoBackend::GetWarningMessage() const
   return result;
 }
 
-void VideoBackend::InitBackendInfo()
+void VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi)
 {
   if (!D3DCommon::LoadLibraries())
     return;
diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h
index 1349d13b2b..6a94f8c7a3 100644
--- a/Source/Core/VideoBackends/D3D/VideoBackend.h
+++ b/Source/Core/VideoBackends/D3D/VideoBackend.h
@@ -18,7 +18,7 @@ public:
   std::string GetDisplayName() const override;
   std::optional<std::string> GetWarningMessage() const override;
 
-  void InitBackendInfo() override;
+  void InitBackendInfo(const WindowSystemInfo& wsi) override;
 
   static constexpr const char* NAME = "D3D";
 
diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp
index afc5bb96e8..f82b7d961b 100644
--- a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp
+++ b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp
@@ -36,7 +36,7 @@ std::string VideoBackend::GetDisplayName() const
   return "Direct3D 12";
 }
 
-void VideoBackend::InitBackendInfo()
+void VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi)
 {
   if (!D3DCommon::LoadLibraries())
     return;
diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.h b/Source/Core/VideoBackends/D3D12/VideoBackend.h
index 7d3126b38c..db03b738d0 100644
--- a/Source/Core/VideoBackends/D3D12/VideoBackend.h
+++ b/Source/Core/VideoBackends/D3D12/VideoBackend.h
@@ -16,7 +16,7 @@ public:
 
   std::string GetName() const override;
   std::string GetDisplayName() const override;
-  void InitBackendInfo() override;
+  void InitBackendInfo(const WindowSystemInfo& wsi) override;
 
   static constexpr const char* NAME = "D3D12";
 
diff --git a/Source/Core/VideoBackends/Metal/MTLMain.mm b/Source/Core/VideoBackends/Metal/MTLMain.mm
index f799d5eea1..7042e091fd 100644
--- a/Source/Core/VideoBackends/Metal/MTLMain.mm
+++ b/Source/Core/VideoBackends/Metal/MTLMain.mm
@@ -119,7 +119,7 @@ void Metal::VideoBackend::Shutdown()
   ObjectCache::Shutdown();
 }
 
-void Metal::VideoBackend::InitBackendInfo()
+void Metal::VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi)
 {
   @autoreleasepool
   {
diff --git a/Source/Core/VideoBackends/Metal/VideoBackend.h b/Source/Core/VideoBackends/Metal/VideoBackend.h
index 3a567718e2..a6a24173e5 100644
--- a/Source/Core/VideoBackends/Metal/VideoBackend.h
+++ b/Source/Core/VideoBackends/Metal/VideoBackend.h
@@ -18,7 +18,7 @@ public:
   std::string GetDisplayName() const override;
   std::optional<std::string> GetWarningMessage() const override;
 
-  void InitBackendInfo() override;
+  void InitBackendInfo(const WindowSystemInfo& wsi) override;
 
   void PrepareWindow(WindowSystemInfo& wsi) override;
 
diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp
index 900a911699..28afcce4dc 100644
--- a/Source/Core/VideoBackends/Null/NullBackend.cpp
+++ b/Source/Core/VideoBackends/Null/NullBackend.cpp
@@ -25,7 +25,7 @@
 
 namespace Null
 {
-void VideoBackend::InitBackendInfo()
+void VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi)
 {
   g_Config.backend_info.api_type = APIType::Nothing;
   g_Config.backend_info.MaxTextureSize = 16384;
diff --git a/Source/Core/VideoBackends/Null/VideoBackend.h b/Source/Core/VideoBackends/Null/VideoBackend.h
index f08098cfd0..4437c0c48d 100644
--- a/Source/Core/VideoBackends/Null/VideoBackend.h
+++ b/Source/Core/VideoBackends/Null/VideoBackend.h
@@ -15,7 +15,7 @@ public:
 
   std::string GetName() const override { return NAME; }
   std::string GetDisplayName() const override;
-  void InitBackendInfo() override;
+  void InitBackendInfo(const WindowSystemInfo& wsi) override;
 
   static constexpr const char* NAME = "Null";
 };
diff --git a/Source/Core/VideoBackends/OGL/OGLConfig.cpp b/Source/Core/VideoBackends/OGL/OGLConfig.cpp
index 95998b836b..2695402b63 100644
--- a/Source/Core/VideoBackends/OGL/OGLConfig.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLConfig.cpp
@@ -3,6 +3,11 @@
 
 #include "VideoBackends/OGL/OGLConfig.h"
 
+#include <cstdio>
+#include <string>
+#include <string_view>
+
+#include "Common/Assert.h"
 #include "Common/GL/GLContext.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
 #include "Common/Logging/LogManager.h"
@@ -10,14 +15,13 @@
 
 #include "Core/Config/GraphicsSettings.h"
 
+#include "VideoBackends/OGL/OGLTexture.h"
+
 #include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/FramebufferManager.h"
 #include "VideoCommon/OnScreenDisplay.h"
 #include "VideoCommon/VideoConfig.h"
 
-#include <cstdio>
-#include <string>
-#include <string_view>
-
 namespace OGL
 {
 void InitDriverInfo()
@@ -537,9 +541,118 @@ bool PopulateConfig(GLContext* m_main_gl_context)
   g_Config.backend_info.bSupportsEarlyZ =
       g_ogl_config.bSupportsImageLoadStore || g_ogl_config.bSupportsConservativeDepth;
 
-  glGetIntegerv(GL_MAX_SAMPLES, &g_ogl_config.max_samples);
-  if (g_ogl_config.max_samples < 1 || !g_ogl_config.bSupportsMSAA)
-    g_ogl_config.max_samples = 1;
+  g_Config.backend_info.AAModes.clear();
+  if (g_ogl_config.bSupportsMSAA)
+  {
+    bool supportsGetInternalFormat =
+        GLExtensions::Supports("VERSION_4_2") || GLExtensions::Supports("VERSION_GLES_3");
+    if (supportsGetInternalFormat)
+    {
+      // Note: GL_TEXTURE_2D_MULTISAMPLE_ARRAY_OES should technically be used for
+      // GL_OES_texture_storage_multisample_2d_array, but both are 0x9102 so it does not matter.
+
+      std::vector<int> color_aa_modes;
+      {
+        GLenum colorInternalFormat = OGLTexture::GetGLInternalFormatForTextureFormat(
+            FramebufferManager::GetEFBColorFormat(), true);
+        GLint num_color_sample_counts = 0;
+        glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, colorInternalFormat,
+                              GL_NUM_SAMPLE_COUNTS, 1, &num_color_sample_counts);
+
+        ASSERT_MSG(VIDEO, num_color_sample_counts >= 0,
+                   "negative GL_NUM_SAMPLE_COUNTS for colors does not make sense: {}",
+                   num_color_sample_counts);
+        color_aa_modes.reserve(num_color_sample_counts + 1);
+        if (num_color_sample_counts > 0)
+        {
+          color_aa_modes.resize(num_color_sample_counts);
+
+          static_assert(sizeof(GLint) == sizeof(u32));
+          glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, colorInternalFormat, GL_SAMPLES,
+                                num_color_sample_counts,
+                                reinterpret_cast<GLint*>(color_aa_modes.data()));
+          ASSERT_MSG(VIDEO, std::is_sorted(color_aa_modes.rbegin(), color_aa_modes.rend()),
+                     "GPU driver didn't return sorted color AA modes: [{}]",
+                     fmt::join(color_aa_modes, ", "));
+        }
+
+        if (color_aa_modes.empty() || color_aa_modes.back() != 1)
+          color_aa_modes.push_back(1);
+      }
+
+      std::vector<int> depth_aa_modes;
+      {
+        GLenum depthInternalFormat = OGLTexture::GetGLInternalFormatForTextureFormat(
+            FramebufferManager::GetEFBColorFormat(), true);
+        GLint num_depth_sample_counts = 0;
+        glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, depthInternalFormat,
+                              GL_NUM_SAMPLE_COUNTS, 1, &num_depth_sample_counts);
+
+        ASSERT_MSG(VIDEO, num_depth_sample_counts >= 0,
+                   "negative GL_NUM_SAMPLE_COUNTS for depth does not make sense: {}",
+                   num_depth_sample_counts);
+        depth_aa_modes.reserve(num_depth_sample_counts + 1);
+        if (num_depth_sample_counts > 0)
+        {
+          depth_aa_modes.resize(num_depth_sample_counts);
+
+          static_assert(sizeof(GLint) == sizeof(u32));
+          glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, depthInternalFormat, GL_SAMPLES,
+                                num_depth_sample_counts,
+                                reinterpret_cast<GLint*>(depth_aa_modes.data()));
+          ASSERT_MSG(VIDEO, std::is_sorted(depth_aa_modes.rbegin(), depth_aa_modes.rend()),
+                     "GPU driver didn't return sorted depth AA modes: [{}]",
+                     fmt::join(depth_aa_modes, ", "));
+        }
+
+        if (depth_aa_modes.empty() || depth_aa_modes.back() != 1)
+          depth_aa_modes.push_back(1);
+      }
+
+      // The spec says supported sample formats are returned in descending numeric order.
+      // It also says "Only positive values are returned", but does not specify whether 1 is
+      // included or not; it seems like NVIDIA and Intel GPUs do not include it.
+      // We've inserted 1 at the back of both if not present to handle this.
+      g_Config.backend_info.AAModes.clear();
+      g_Config.backend_info.AAModes.reserve(std::min(color_aa_modes.size(), depth_aa_modes.size()));
+      // We only want AA modes that are supported for both the color and depth textures. Probably
+      // the support is the same, though. rbegin/rend are used to swap the order ahead of time.
+      std::set_intersection(color_aa_modes.rbegin(), color_aa_modes.rend(), depth_aa_modes.rbegin(),
+                            depth_aa_modes.rend(),
+                            std::back_inserter(g_Config.backend_info.AAModes));
+    }
+    else
+    {
+      // The documentation for glGetInternalformativ says its value is at least the minimum of
+      // GL_MAX_SAMPLES, GL_MAX_COLOR_TEXTURE_SAMPLES, and GL_MAX_DEPTH_TEXTURE_SAMPLES (and
+      // GL_MAX_INTEGER_SAMPLES for integer textures, assumed not applicable here).
+      GLint max_color_samples = 0;
+      glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &max_color_samples);
+      GLint max_depth_samples = 0;
+      glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &max_depth_samples);
+      // Note: The desktop OpenGL ref pages don't actually say that GL_MAX_SAMPLES is a valid
+      // parameter for glGetIntegerv (though the ES ones do). However, MAX_SAMPLES is
+      // referenced in the GL 3.1 spec and by GL_ARB_texture_multisample (which is written against
+      // the OpenGL 3.1 spec), so presumably it is valid.
+      GLint max_samples = 0;
+      glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
+      u32 supported_max_samples =
+          static_cast<u32>(std::min({max_samples, max_color_samples, max_depth_samples}));
+
+      while (supported_max_samples > 1)
+      {
+        g_Config.backend_info.AAModes.push_back(supported_max_samples);
+        supported_max_samples /= 2;
+      }
+      g_Config.backend_info.AAModes.push_back(1);
+      // The UI wants ascending order
+      std::reverse(g_Config.backend_info.AAModes.begin(), g_Config.backend_info.AAModes.end());
+    }
+  }
+  else
+  {
+    g_Config.backend_info.AAModes = {1};
+  }
 
   const bool bSupportsIsHelperInvocation = g_ogl_config.bIsES ?
                                                g_ogl_config.eSupportedGLSLVersion >= GlslEs320 :
diff --git a/Source/Core/VideoBackends/OGL/OGLConfig.h b/Source/Core/VideoBackends/OGL/OGLConfig.h
index 6a50269222..2b78c35c2b 100644
--- a/Source/Core/VideoBackends/OGL/OGLConfig.h
+++ b/Source/Core/VideoBackends/OGL/OGLConfig.h
@@ -82,8 +82,6 @@ struct VideoConfig
   const char* gl_vendor;
   const char* gl_renderer;
   const char* gl_version;
-
-  s32 max_samples;
 };
 
 void InitDriverInfo();
diff --git a/Source/Core/VideoBackends/OGL/OGLGfx.cpp b/Source/Core/VideoBackends/OGL/OGLGfx.cpp
index e83ff209ea..e545ed7f4b 100644
--- a/Source/Core/VideoBackends/OGL/OGLGfx.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLGfx.cpp
@@ -146,12 +146,6 @@ OGLGfx::OGLGfx(std::unique_ptr<GLContext> main_gl_context, float backbuffer_scal
     }
   }
 
-  if (!PopulateConfig(m_main_gl_context.get()))
-  {
-    // Not all needed extensions are supported, so we have to stop here.
-    // Else some of the next calls might crash.
-    return;
-  }
   InitDriverInfo();
 
   // Setup Debug logging
diff --git a/Source/Core/VideoBackends/OGL/OGLMain.cpp b/Source/Core/VideoBackends/OGL/OGLMain.cpp
index c47b94ceb8..13f47a054f 100644
--- a/Source/Core/VideoBackends/OGL/OGLMain.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLMain.cpp
@@ -74,8 +74,45 @@ std::string VideoBackend::GetDisplayName() const
     return _trans("OpenGL");
 }
 
-void VideoBackend::InitBackendInfo()
+void VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi)
 {
+  std::unique_ptr<GLContext> temp_gl_context =
+      GLContext::Create(wsi, g_Config.stereo_mode == StereoMode::QuadBuffer, true, false,
+                        Config::Get(Config::GFX_PREFER_GLES));
+
+  if (!temp_gl_context)
+    return;
+
+  FillBackendInfo(temp_gl_context.get());
+}
+
+bool VideoBackend::InitializeGLExtensions(GLContext* context)
+{
+  // Init extension support.
+  if (!GLExtensions::Init(context))
+  {
+    // OpenGL 2.0 is required for all shader based drawings. There is no way to get this by
+    // extensions
+    PanicAlertFmtT("GPU: OGL ERROR: Does your video card support OpenGL 2.0?");
+    return false;
+  }
+
+  if (GLExtensions::Version() < 300)
+  {
+    // integer vertex attributes require a gl3 only function
+    PanicAlertFmtT("GPU: OGL ERROR: Need OpenGL version 3.\n"
+                   "GPU: Does your video card support OpenGL 3?");
+    return false;
+  }
+
+  return true;
+}
+
+bool VideoBackend::FillBackendInfo(GLContext* context)
+{
+  if (!InitializeGLExtensions(context))
+    return false;
+
   g_Config.backend_info.api_type = APIType::OpenGL;
   g_Config.backend_info.MaxTextureSize = 16384;
   g_Config.backend_info.bUsesLowerLeftOrigin = true;
@@ -105,7 +142,7 @@ void VideoBackend::InitBackendInfo()
   g_Config.backend_info.bSupportsGPUTextureDecoding = true;
   g_Config.backend_info.bSupportsBBox = true;
 
-  // Overwritten in OGLRender.cpp later
+  // Overwritten in OGLConfig.cpp later
   g_Config.backend_info.bSupportsDualSourceBlend = true;
   g_Config.backend_info.bSupportsPrimitiveRestart = true;
   g_Config.backend_info.bSupportsPaletteConversion = true;
@@ -123,33 +160,6 @@ void VideoBackend::InitBackendInfo()
 
   // aamodes - 1 is to stay consistent with D3D (means no AA)
   g_Config.backend_info.AAModes = {1, 2, 4, 8};
-}
-
-bool VideoBackend::InitializeGLExtensions(GLContext* context)
-{
-  // Init extension support.
-  if (!GLExtensions::Init(context))
-  {
-    // OpenGL 2.0 is required for all shader based drawings. There is no way to get this by
-    // extensions
-    PanicAlertFmtT("GPU: OGL ERROR: Does your video card support OpenGL 2.0?");
-    return false;
-  }
-
-  if (GLExtensions::Version() < 300)
-  {
-    // integer vertex attributes require a gl3 only function
-    PanicAlertFmtT("GPU: OGL ERROR: Need OpenGL version 3.\n"
-                   "GPU: Does your video card support OpenGL 3?");
-    return false;
-  }
-
-  return true;
-}
-
-bool VideoBackend::FillBackendInfo()
-{
-  InitBackendInfo();
 
   // check for the max vertex attributes
   GLint numvertexattribs = 0;
@@ -172,6 +182,13 @@ bool VideoBackend::FillBackendInfo()
     return false;
   }
 
+  if (!PopulateConfig(context))
+  {
+    // Not all needed extensions are supported, so we have to stop here.
+    // Else some of the next calls might crash.
+    return false;
+  }
+
   // TODO: Move the remaining fields from the Renderer constructor here.
   return true;
 }
@@ -184,7 +201,7 @@ bool VideoBackend::Initialize(const WindowSystemInfo& wsi)
   if (!main_gl_context)
     return false;
 
-  if (!InitializeGLExtensions(main_gl_context.get()) || !FillBackendInfo())
+  if (!FillBackendInfo(main_gl_context.get()))
     return false;
 
   auto gfx = std::make_unique<OGLGfx>(std::move(main_gl_context), wsi.render_surface_scale);
diff --git a/Source/Core/VideoBackends/OGL/OGLTexture.cpp b/Source/Core/VideoBackends/OGL/OGLTexture.cpp
index 0e4e99f59b..f8894a365b 100644
--- a/Source/Core/VideoBackends/OGL/OGLTexture.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLTexture.cpp
@@ -15,9 +15,7 @@
 
 namespace OGL
 {
-namespace
-{
-GLenum GetGLInternalFormatForTextureFormat(AbstractTextureFormat format, bool storage)
+GLenum OGLTexture::GetGLInternalFormatForTextureFormat(AbstractTextureFormat format, bool storage)
 {
   switch (format)
   {
@@ -55,6 +53,8 @@ GLenum GetGLInternalFormatForTextureFormat(AbstractTextureFormat format, bool st
   }
 }
 
+namespace
+{
 GLenum GetGLFormatForTextureFormat(AbstractTextureFormat format)
 {
   switch (format)
diff --git a/Source/Core/VideoBackends/OGL/OGLTexture.h b/Source/Core/VideoBackends/OGL/OGLTexture.h
index ca08910eae..53d9d7f589 100644
--- a/Source/Core/VideoBackends/OGL/OGLTexture.h
+++ b/Source/Core/VideoBackends/OGL/OGLTexture.h
@@ -36,6 +36,7 @@ public:
   {
     return IsMultisampled() ? GL_TEXTURE_2D_MULTISAMPLE_ARRAY : GL_TEXTURE_2D_ARRAY;
   }
+  static GLenum GetGLInternalFormatForTextureFormat(AbstractTextureFormat format, bool storage);
   GLenum GetGLFormatForImageTexture() const;
 
 private:
diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h
index 4be861954e..53f7f940d5 100644
--- a/Source/Core/VideoBackends/OGL/VideoBackend.h
+++ b/Source/Core/VideoBackends/OGL/VideoBackend.h
@@ -19,12 +19,12 @@ public:
   std::string GetName() const override;
   std::string GetDisplayName() const override;
 
-  void InitBackendInfo() override;
+  void InitBackendInfo(const WindowSystemInfo& wsi) override;
 
   static constexpr const char* NAME = "OGL";
 
 private:
   bool InitializeGLExtensions(GLContext* context);
-  bool FillBackendInfo();
+  bool FillBackendInfo(GLContext* context);
 };
 }  // namespace OGL
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 8703ea4b4d..ccb040e8ad 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -62,7 +62,7 @@ std::optional<std::string> VideoSoftware::GetWarningMessage() const
                 "really want to enable software rendering? If unsure, select 'No'.");
 }
 
-void VideoSoftware::InitBackendInfo()
+void VideoSoftware::InitBackendInfo(const WindowSystemInfo& wsi)
 {
   g_Config.backend_info.api_type = APIType::Nothing;
   g_Config.backend_info.MaxTextureSize = 16384;
diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h
index 8c3cb081ef..35c3adb1a7 100644
--- a/Source/Core/VideoBackends/Software/VideoBackend.h
+++ b/Source/Core/VideoBackends/Software/VideoBackend.h
@@ -17,7 +17,7 @@ class VideoSoftware : public VideoBackendBase
   std::string GetDisplayName() const override;
   std::optional<std::string> GetWarningMessage() const override;
 
-  void InitBackendInfo() override;
+  void InitBackendInfo(const WindowSystemInfo& wsi) override;
 
   static constexpr const char* NAME = "Software Renderer";
 };
diff --git a/Source/Core/VideoBackends/Vulkan/VKMain.cpp b/Source/Core/VideoBackends/Vulkan/VKMain.cpp
index 053b592c14..2eb9b34106 100644
--- a/Source/Core/VideoBackends/Vulkan/VKMain.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKMain.cpp
@@ -30,7 +30,7 @@
 
 namespace Vulkan
 {
-void VideoBackend::InitBackendInfo()
+void VideoBackend::InitBackendInfo(const WindowSystemInfo& wsi)
 {
   VulkanContext::PopulateBackendInfo(&g_Config);
 
diff --git a/Source/Core/VideoBackends/Vulkan/VideoBackend.h b/Source/Core/VideoBackends/Vulkan/VideoBackend.h
index a16d149307..4e8c3a5471 100644
--- a/Source/Core/VideoBackends/Vulkan/VideoBackend.h
+++ b/Source/Core/VideoBackends/Vulkan/VideoBackend.h
@@ -16,7 +16,7 @@ public:
 
   std::string GetName() const override { return NAME; }
   std::string GetDisplayName() const override { return _trans("Vulkan"); }
-  void InitBackendInfo() override;
+  void InitBackendInfo(const WindowSystemInfo& wsi) override;
   void PrepareWindow(WindowSystemInfo& wsi) override;
 
   static constexpr const char* NAME = "Vulkan";