Merge pull request #1859 from heapo/lut_array_codegen

Convert high-frequency LUT arrays from constexpr to static constexpr

src/video_core/surface.h

@@ -125,17 +125,7 @@ enum class SurfaceTarget {
     TextureCubeArray,
 };
 
-/**
+constexpr std::array<u32, MaxPixelFormat> compression_factor_table = {{
- * Gets the compression factor for the specified PixelFormat. This applies to just the
- * "compressed width" and "compressed height", not the overall compression factor of a
- * compressed image. This is used for maintaining proper surface sizes for compressed
- * texture formats.
- */
-static constexpr u32 GetCompressionFactor(PixelFormat format) {
-    if (format == PixelFormat::Invalid)
-        return 0;
-
-    constexpr std::array<u32, MaxPixelFormat> compression_factor_table = {{
     1, // ABGR8U
     1, // ABGR8S
     1, // ABGR8UI
@@ -202,16 +192,23 @@ static constexpr u32 GetCompressionFactor(PixelFormat format) {
     1, // Z24S8
     1, // S8Z24
     1, // Z32FS8
-    }};
+}};
+
+/**
+ * Gets the compression factor for the specified PixelFormat. This applies to just the
+ * "compressed width" and "compressed height", not the overall compression factor of a
+ * compressed image. This is used for maintaining proper surface sizes for compressed
+ * texture formats.
+ */
+static constexpr u32 GetCompressionFactor(PixelFormat format) {
+    if (format == PixelFormat::Invalid)
+        return 0;
 
     ASSERT(static_cast<std::size_t>(format) < compression_factor_table.size());
     return compression_factor_table[static_cast<std::size_t>(format)];
 }
 
-static constexpr u32 GetDefaultBlockWidth(PixelFormat format) {
+constexpr std::array<u32, MaxPixelFormat> block_width_table = {{
-    if (format == PixelFormat::Invalid)
-        return 0;
-    constexpr std::array<u32, MaxPixelFormat> block_width_table = {{
     1,  // ABGR8U
     1,  // ABGR8S
     1,  // ABGR8UI
@@ -278,16 +275,17 @@ static constexpr u32 GetDefaultBlockWidth(PixelFormat format) {
     1,  // Z24S8
     1,  // S8Z24
     1,  // Z32FS8
-    }};
+}};
-    ASSERT(static_cast<std::size_t>(format) < block_width_table.size());
-    return block_width_table[static_cast<std::size_t>(format)];
-}
 
-static constexpr u32 GetDefaultBlockHeight(PixelFormat format) {
+static constexpr u32 GetDefaultBlockWidth(PixelFormat format) {
     if (format == PixelFormat::Invalid)
         return 0;
 
-    constexpr std::array<u32, MaxPixelFormat> block_height_table = {{
+    ASSERT(static_cast<std::size_t>(format) < block_width_table.size());
+    return block_width_table[static_cast<std::size_t>(format)];
+}
+
+constexpr std::array<u32, MaxPixelFormat> block_height_table = {{
     1, // ABGR8U
     1, // ABGR8S
     1, // ABGR8UI
@@ -354,17 +352,17 @@ static constexpr u32 GetDefaultBlockHeight(PixelFormat format) {
     1, // Z24S8
     1, // S8Z24
     1, // Z32FS8
-    }};
+}};
+
+static constexpr u32 GetDefaultBlockHeight(PixelFormat format) {
+    if (format == PixelFormat::Invalid)
+        return 0;
 
     ASSERT(static_cast<std::size_t>(format) < block_height_table.size());
     return block_height_table[static_cast<std::size_t>(format)];
 }
 
-static constexpr u32 GetFormatBpp(PixelFormat format) {
+constexpr std::array<u32, MaxPixelFormat> bpp_table = {{
-    if (format == PixelFormat::Invalid)
-        return 0;
-
-    constexpr std::array<u32, MaxPixelFormat> bpp_table = {{
     32,  // ABGR8U
     32,  // ABGR8S
     32,  // ABGR8UI
@@ -431,7 +429,11 @@ static constexpr u32 GetFormatBpp(PixelFormat format) {
     32,  // Z24S8
     32,  // S8Z24
     64,  // Z32FS8
-    }};
+}};
+
+static constexpr u32 GetFormatBpp(PixelFormat format) {
+    if (format == PixelFormat::Invalid)
+        return 0;
 
     ASSERT(static_cast<std::size_t>(format) < bpp_table.size());
     return bpp_table[static_cast<std::size_t>(format)];