Test Do not use D24

This change is intended to fix two regressions:

1. Fixes the issue where `EDS3` + `Vertex Input Dynamic State` being enabled prevented some games from launching correctly.

2. Fixes the issue with broken water in `Super Mario Party Jamboree`.

This complements #3042.

Co-authored-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3068
Co-authored-by: MaranBr <maranbr@outlook.com>
Co-committed-by: MaranBr <maranbr@outlook.com>

src/android/app/build.gradle.kts

@@ -61,7 +61,6 @@ android {
         minSdk = 24
         targetSdk = 36
         versionName = getGitVersion()
-
         versionCode = autoVersion
 
         ndk {
@@ -69,9 +68,6 @@ android {
             abiFilters += listOf("arm64-v8a")
         }
 
-        buildConfigField("String", "GIT_HASH", "\"${getGitHash()}\"")
-        buildConfigField("String", "BRANCH", "\"${getBranch()}\"")
-
         externalNativeBuild {
             cmake {
                 val extraCMakeArgs =
@@ -92,14 +88,14 @@ android {
                         "-DYUZU_TESTS=OFF",
                         "-DDYNARMIC_TESTS=OFF",
                         *extraCMakeArgs.toTypedArray()
-                ))
+                    )
+                )
 
                 abiFilters("arm64-v8a")
             }
         }
     }
 
-
     val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
     signingConfigs {
         if (keystoreFile != null) {
@@ -162,7 +158,39 @@ android {
         }
     }
 
-        // this is really annoying but idk any other ways to fix this behavior
+    flavorDimensions.add("version")
+    productFlavors {
+        create("mainline") {
+            dimension = "version"
+            resValue("string", "app_name_suffixed", "Eden")
+        }
+
+        create("genshinSpoof") {
+            dimension = "version"
+            resValue("string", "app_name_suffixed", "Eden Optimized")
+            applicationId = "com.miHoYo.Yuanshen"
+        }
+
+        create("legacy") {
+            dimension = "version"
+            resValue("string", "app_name_suffixed", "Eden Legacy")
+            applicationId = "dev.legacy.eden_emulator"
+
+            externalNativeBuild {
+                cmake {
+                    arguments.add("-DYUZU_LEGACY=ON")
+                }
+            }
+
+            sourceSets {
+                getByName("legacy") {
+                    res.srcDirs("src/main/legacy")
+                }
+            }
+        }
+    }
+
+    // this is really annoying but idk any other ways to fix this behavior
     applicationVariants.all {
         val variant = this
         when {
@@ -187,40 +215,6 @@ android {
         }
     }
 
-    android {
-        flavorDimensions.add("version")
-        productFlavors {
-            create("mainline") {
-                dimension = "version"
-                resValue("string", "app_name_suffixed", "Eden")
-            }
-
-            create("genshinSpoof") {
-                dimension = "version"
-                resValue("string", "app_name_suffixed", "Eden Optimized")
-                applicationId = "com.miHoYo.Yuanshen"
-            }
-
-            create("legacy") {
-                dimension = "version"
-                resValue("string", "app_name_suffixed", "Eden Legacy")
-                applicationId = "dev.legacy.eden_emulator"
-
-                externalNativeBuild {
-                    cmake {
-                        arguments.add("-DYUZU_LEGACY=ON")
-                    }
-                }
-
-                sourceSets {
-                    getByName("legacy") {
-                        res.srcDirs("src/main/legacy")
-                    }
-                }
-            }
-        }
-    }
-
     externalNativeBuild {
         cmake {
             version = "3.22.1"
@@ -284,7 +278,6 @@ dependencies {
     implementation("androidx.core:core-splashscreen:1.0.1")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.2")
     implementation("androidx.window:window:1.3.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("org.commonmark:commonmark:0.22.0")
     implementation("androidx.navigation:navigation-fragment-ktx:2.8.9")
@@ -302,7 +295,9 @@ fun runGitCommand(command: List<String>): String {
             .directory(project.rootDir)
             .redirectOutput(ProcessBuilder.Redirect.PIPE)
             .redirectError(ProcessBuilder.Redirect.PIPE)
-            .start().inputStream.bufferedReader().use { it.readText() }
+            .start()
+            .inputStream.bufferedReader()
+            .use { it.readText() }
             .trim()
     } catch (e: Exception) {
         logger.error("Cannot find git")
@@ -326,9 +321,3 @@ fun getGitVersion(): String {
     }
     return versionName.ifEmpty { "0.0" }
 }
-
-fun getGitHash(): String =
-    runGitCommand(listOf("git", "rev-parse", "--short", "HEAD")).ifEmpty { "dummy-hash" }
-
-fun getBranch(): String =
-    runGitCommand(listOf("git", "rev-parse", "--abbrev-ref", "HEAD")).ifEmpty { "dummy-hash" }

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -227,6 +227,11 @@ object NativeLibrary {
      */
     external fun isUpdateCheckerEnabled(): Boolean
 
+    /**
+     * Returns the build version generated by CMake (BUILD_VERSION).
+     */
+    external fun getBuildVersion(): String
+
     enum class CoreError {
         ErrorSystemFiles,
         ErrorSavestate,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@@ -29,6 +29,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     SYNC_MEMORY_OPERATIONS("sync_memory_operations"),
     BUFFER_REORDER_DISABLE("disable_buffer_reorder"),
     RENDERER_DEBUG("debug"),
+    RENDERER_VERTEX_INPUT_DYNAMIC_STATE("vertex_input_dynamic_state"),
     RENDERER_PROVOKING_VERTEX("provoking_vertex"),
     RENDERER_DESCRIPTOR_INDEXING("descriptor_indexing"),
     RENDERER_SAMPLE_SHADING("sample_shading"),

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@@ -146,6 +146,13 @@ abstract class SettingsItem(
                     descriptionId = R.string.provoking_vertex_description
                 )
             )
+            put(
+                SwitchSetting(
+                    BooleanSetting.RENDERER_VERTEX_INPUT_DYNAMIC_STATE,
+                    titleId = R.string.vertex_input_dynamic_state,
+                    descriptionId = R.string.vertex_input_dynamic_state_description
+                )
+            )
             put(
                 SwitchSetting(
                     BooleanSetting.RENDERER_DESCRIPTOR_INDEXING,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -453,6 +453,7 @@ class SettingsFragmentPresenter(
         sl.apply {
             add(HeaderSetting(R.string.veil_extensions))
             add(ByteSetting.RENDERER_DYNA_STATE.key)
+            add(BooleanSetting.RENDERER_VERTEX_INPUT_DYNAMIC_STATE.key)
             add(BooleanSetting.RENDERER_PROVOKING_VERTEX.key)
             add(BooleanSetting.RENDERER_DESCRIPTOR_INDEXING.key)
             add(BooleanSetting.RENDERER_SAMPLE_SHADING.key)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt

@@ -29,6 +29,7 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.FragmentAboutBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
+import org.yuzu.yuzu_emu.NativeLibrary
 
 class AboutFragment : Fragment() {
     private var _binding: FragmentAboutBinding? = null
@@ -78,11 +79,15 @@ class AboutFragment : Fragment() {
             binding.root.findNavController().navigate(R.id.action_aboutFragment_to_licensesFragment)
         }
 
-        binding.textVersionName.text = BuildConfig.VERSION_NAME
+        val buildName = getString(R.string.app_name_suffixed)
+        val buildVersion = NativeLibrary.getBuildVersion()
+        val fullVersionText = "$buildName ($buildVersion)"
+
+        binding.textVersionName.text = fullVersionText
         binding.buttonVersionName.setOnClickListener {
             val clipBoard =
                 requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            val clip = ClipData.newPlainText(getString(R.string.build), BuildConfig.GIT_HASH)
+            val clip = ClipData.newPlainText(getString(R.string.build), fullVersionText)
             clipBoard.setPrimaryClip(clip)
 
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt

@@ -53,6 +53,7 @@ class GamesFragment : Fragment() {
     private var originalHeaderLeftMargin: Int? = null
 
     private var lastViewType: Int = GameAdapter.VIEW_TYPE_GRID
+    private var fallbackBottomInset: Int = 0
 
     companion object {
         private const val SEARCH_TEXT = "SearchText"
@@ -208,12 +209,12 @@ class GamesFragment : Fragment() {
                 else -> throw IllegalArgumentException("Invalid view type: $savedViewType")
             }
             if (savedViewType == GameAdapter.VIEW_TYPE_CAROUSEL) {
-                doOnNextLayout {
-                    (this as? CarouselRecyclerView)?.setCarouselMode(true, gameAdapter)
-                    adapter = gameAdapter
+                (binding.gridGames as? View)?.let { it -> ViewCompat.requestApplyInsets(it)}
+                doOnNextLayout { //Carousel: important to avoid overlap issues
+                    (this as? CarouselRecyclerView)?.notifyLaidOut(fallbackBottomInset)
                 }
             } else {
-                (this as? CarouselRecyclerView)?.setCarouselMode(false)
+                (this as? CarouselRecyclerView)?.setupCarousel(false)
             }
             adapter = gameAdapter
             lastViewType = savedViewType
@@ -237,9 +238,8 @@ class GamesFragment : Fragment() {
     override fun onResume() {
         super.onResume()
         if (getCurrentViewType() == GameAdapter.VIEW_TYPE_CAROUSEL) {
-            (binding.gridGames as? CarouselRecyclerView)?.restoreScrollState(
-                gamesViewModel.lastScrollPosition
-            )
+            (binding.gridGames as? CarouselRecyclerView)?.setupCarousel(true)
+            (binding.gridGames as? CarouselRecyclerView)?.restoreScrollState(gamesViewModel.lastScrollPosition)
         }
     }
 
@@ -494,6 +494,11 @@ class GamesFragment : Fragment() {
             mlpFab.rightMargin = rightInset + fabPadding
             binding.addDirectory.layoutParams = mlpFab
 
+            val navInsets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val gestureInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemGestures())
+            val bottomInset = maxOf(navInsets.bottom, gestureInsets.bottom, cutoutInsets.bottom)
+            fallbackBottomInset = bottomInset
+            (binding.gridGames as? CarouselRecyclerView)?.notifyInsetsReady(bottomInset)
             windowInsets
         }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/views/CarouselRecyclerView.kt

@@ -20,9 +20,8 @@ import androidx.core.view.doOnNextLayout
 import org.yuzu.yuzu_emu.YuzuApplication
 import androidx.preference.PreferenceManager
 import androidx.core.view.WindowInsetsCompat
-
 /**
- * CarouselRecyclerView encapsulates all carousel logic for the games UI.
+ * CarouselRecyclerView encapsulates all carousel content for the games UI.
  * It manages overlapping cards, center snapping, custom drawing order,
  * joypad & fling navigation and mid-screen swipe-to-refresh.
  */
@@ -34,6 +33,7 @@ class CarouselRecyclerView @JvmOverloads constructor(
 
     private var overlapFactor: Float = 0f
     private var overlapPx: Int = 0
+    private var bottomInset: Int = -1
     private var overlapDecoration: OverlappingDecoration? = null
     private var pagerSnapHelper: PagerSnapHelper? = null
     private var scalingScrollListener: OnScrollListener? = null
@@ -202,46 +202,61 @@ class CarouselRecyclerView @JvmOverloads constructor(
         }
     }
 
-    fun setCarouselMode(enabled: Boolean, gameAdapter: GameAdapter? = null) {
+    fun refreshView() {
+        updateChildScalesAndAlpha()
+        focusCenteredCard()
+    }
+
+    fun notifyInsetsReady(newBottomInset: Int) {
+        if (bottomInset != newBottomInset) {
+            bottomInset = newBottomInset
+        }
+        setupCarousel(true)
+    }
+
+    fun notifyLaidOut(fallBackBottomInset: Int) {
+        if (bottomInset < 0) bottomInset = fallBackBottomInset
+        var gameAdapter = adapter as? GameAdapter ?: return
+        var newCardSize = cardSize(bottomInset)
+        if (gameAdapter.cardSize != newCardSize) {
+            gameAdapter.setCardSize(newCardSize)
+        }
+        setupCarousel(true)
+    }
+
+    fun cardSize(bottomInset: Int): Int {
+        val internalFactor = resources.getFraction(R.fraction.carousel_card_size_factor, 1, 1)
+        val userFactor = preferences.getFloat(CAROUSEL_CARD_SIZE_FACTOR, internalFactor).coerceIn(
+            0f,
+            1f
+        )
+        return (userFactor * (height - bottomInset)).toInt()
+    }
+
+    fun setupCarousel(enabled: Boolean) {
         if (enabled) {
+            val gameAdapter = adapter as? GameAdapter ?: return
+            if (gameAdapter.cardSize == 0) return
+            if (bottomInset < 0) return
+
             useCustomDrawingOrder = true
+            val cardSize = gameAdapter.cardSize
 
-            val insets = rootWindowInsets?.let { WindowInsetsCompat.toWindowInsetsCompat(it, this) }
-            val bottomInset = insets?.getInsets(WindowInsetsCompat.Type.systemBars())?.bottom ?: 0
-            val internalFactor = resources.getFraction(R.fraction.carousel_card_size_factor, 1, 1)
-            val userFactor = preferences.getFloat(CAROUSEL_CARD_SIZE_FACTOR, internalFactor).coerceIn(
-                0f,
-                1f
-            )
-            val cardSize = (userFactor * (height - bottomInset)).toInt()
-            gameAdapter?.setCardSize(cardSize)
-
-            val internalOverlapFactor = resources.getFraction(
-                R.fraction.carousel_overlap_factor,
-                1,
-                1
-            )
-            overlapFactor = preferences.getFloat(CAROUSEL_OVERLAP_FACTOR, internalOverlapFactor).coerceIn(
-                0f,
-                1f
-            )
+            val internalOverlapFactor = resources.getFraction(R.fraction.carousel_overlap_factor,1,1)
+            overlapFactor = preferences.getFloat(CAROUSEL_OVERLAP_FACTOR, internalOverlapFactor).coerceIn(0f,1f)
             overlapPx = (cardSize * overlapFactor).toInt()
 
-            val internalFlingMultiplier = resources.getFraction(
-                R.fraction.carousel_fling_multiplier,
-                1,
-                1
-            )
+            val internalFlingMultiplier = resources.getFraction(R.fraction.carousel_fling_multiplier,1,1)
             flingMultiplier = preferences.getFloat(
                 CAROUSEL_FLING_MULTIPLIER,
                 internalFlingMultiplier
             ).coerceIn(1f, 5f)
 
-            gameAdapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+            gameAdapter .registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
                 override fun onChanged() {
                     if (pendingScrollAfterReload) {
-                        post {
-                            jigglyScroll()
+                        doOnNextLayout {
+                            refreshView()
                             pendingScrollAfterReload = false
                         }
                     }
@@ -257,7 +272,7 @@ class CarouselRecyclerView @JvmOverloads constructor(
                 addItemDecoration(overlapDecoration!!)
             }
 
-            // Gradual scalingAdd commentMore actions
+            // Gradual scaling on scroll
             if (scalingScrollListener == null) {
                 scalingScrollListener = object : OnScrollListener() {
                     override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
@@ -315,8 +330,7 @@ class CarouselRecyclerView @JvmOverloads constructor(
         super.scrollToPosition(position)
         (layoutManager as? LinearLayoutManager)?.scrollToPositionWithOffset(position, overlapPx)
         doOnNextLayout {
-            updateChildScalesAndAlpha()
-            focusCenteredCard()
+            refreshView()
         }
     }
 
@@ -382,12 +396,6 @@ class CarouselRecyclerView @JvmOverloads constructor(
         return sorted[i].first
     }
 
-    fun jigglyScroll() {
-        scrollBy(-1, 0)
-        scrollBy(1, 0)
-        focusCenteredCard()
-    }
-
     inner class OverlappingDecoration(private val overlap: Int) : ItemDecoration() {
         override fun getItemOffsets(
             outRect: Rect,

src/android/app/src/main/jni/native.cpp

@@ -1615,4 +1615,10 @@ JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateUrl(
 }
 #endif
 
+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getBuildVersion(
+        JNIEnv* env,
+        [[maybe_unused]] jobject obj) {
+    return env->NewStringUTF(Common::g_build_version);
+}
+
 } // extern "C"

src/android/app/src/main/res/values/strings.xml

@@ -94,6 +94,8 @@
     <string name="dyna_state">Extended Dynamic State</string>
     <string name="dyna_state_description">Controls the number of features that can be used in Extended Dynamic State. Higher numbers allow for more features and can increase performance, but may cause issues with some drivers and vendors. The default value may vary depending on your system and hardware capabilities. This value can be changed until stability and a better visual quality are achieved.</string>
     <string name="disabled">Disabled</string>
+    <string name="vertex_input_dynamic_state">Vertex Input Dynamic State</string>
+    <string name="vertex_input_dynamic_state_description">Enables vertex input dynamic state feature for better quality and performance.</string>
     <string name="provoking_vertex">Provoking Vertex</string>
     <string name="provoking_vertex_description">Improves lighting and vertex handling in certain games. Only supported on Vulkan 1.0+ GPUs.</string>
     <string name="descriptor_indexing">Descriptor Indexing</string>

src/common/settings.h

@@ -546,6 +546,7 @@ struct Values {
                                            Category::RendererExtensions,
                                            Specialization::Scalar};
 
+    SwitchableSetting<bool> vertex_input_dynamic_state{linkage, true, "vertex_input_dynamic_state", Category::RendererExtensions};
     SwitchableSetting<bool> provoking_vertex{linkage, false, "provoking_vertex", Category::RendererExtensions};
     SwitchableSetting<bool> descriptor_indexing{linkage, false, "descriptor_indexing", Category::RendererExtensions};
     SwitchableSetting<bool> sample_shading{linkage, false, "sample_shading", Category::RendererExtensions, Specialization::Paired};

src/frontend_common/play_time_manager.cpp

@@ -167,25 +167,9 @@ void PlayTimeManager::ResetProgramPlayTime(u64 program_id) {
     Save();
 }
 
-std::string PlayTimeManager::GetReadablePlayTime(u64 time_seconds) {
-    if (time_seconds == 0) {
-        return {};
-    }
-
-    const auto time_minutes = std::max(static_cast<double>(time_seconds) / 60.0, 1.0);
-    const auto time_hours = static_cast<double>(time_seconds) / 3600.0;
-    const bool is_minutes = time_minutes < 60.0;
-
-    if (is_minutes) {
-        return fmt::format("{:.0f} m", time_minutes);
-    } else {
-        const bool has_remainder = time_seconds % 60 != 0;
-        if (has_remainder) {
-            return fmt::format("{:.1f} h", time_hours);
-        } else {
-            return fmt::format("{:.0f} h", time_hours);
-        }
-    }
+std::string PlayTimeManager::GetReadablePlayTime(u64 t) {
+    return t > 0 ? fmt::format("{:02}:{:02}:{:02}", t / 3600, (t / 60) % 60, t % 60)
+        : std::string{};
 }
 
 std::string PlayTimeManager::GetPlayTimeHours(u64 time_seconds) {

src/qt_common/config/shared_translation.cpp

@@ -329,6 +329,11 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
            tr("Extended Dynamic State"),
            tr("Controls the number of features that can be used in Extended Dynamic State.\nHigher numbers allow for more features and can increase performance, but may cause issues.\nThe default value is per-system."));
 
+    INSERT(Settings,
+           vertex_input_dynamic_state,
+           tr("Vertex Input Dynamic State"),
+           tr("Enables vertex input dynamic state feature for better quality and performance."));
+
     INSERT(Settings,
            provoking_vertex,
            tr("Provoking Vertex"),

src/video_core/renderer_opengl/gl_rasterizer.cpp

@@ -1196,17 +1196,15 @@ void RasterizerOpenGL::SyncLogicOpState() {
 
     if (device.IsAmd()) {
         using namespace Tegra::Engines;
-        struct In {
-            const Maxwell3D::Regs::VertexAttribute::Type d;
-            In(Maxwell3D::Regs::VertexAttribute::Type n) : d(n) {}
-            bool operator()(Maxwell3D::Regs::VertexAttribute n) const {
-                return n.type == d;
-            }
-        };
 
-        bool has_float =
-            std::any_of(regs.vertex_attrib_format.begin(), regs.vertex_attrib_format.end(),
-                        In(Maxwell3D::Regs::VertexAttribute::Type::Float));
+        bool has_float = std::any_of(
+            regs.vertex_attrib_format.begin(),
+            regs.vertex_attrib_format.end(),
+            [](const auto& n) {
+                return n.type == Maxwell3D::Regs::VertexAttribute::Type::Float;
+            }
+        );
+
         regs.logic_op.enable = static_cast<u32>(!has_float);
     }
 

src/video_core/renderer_vulkan/vk_buffer_cache.cpp

@@ -579,8 +579,7 @@ void BufferCacheRuntime::BindQuadIndexBuffer(PrimitiveTopology topology, u32 fir
     }
 }
 
-void BufferCacheRuntime::BindVertexBuffer(u32 index, VkBuffer buffer, u32 offset, u32 size,
-                                          u32 stride) {
+void BufferCacheRuntime::BindVertexBuffer(u32 index, VkBuffer buffer, u32 offset, u32 size, u32 stride) {
     if (index >= device.GetMaxVertexInputBindings()) {
         return;
     }

src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp

@@ -845,10 +845,9 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
         VK_DYNAMIC_STATE_LINE_WIDTH,
     };
     if (key.state.extended_dynamic_state) {
-        static constexpr std::array extended{
+        std::vector<VkDynamicState> extended{
             VK_DYNAMIC_STATE_CULL_MODE_EXT,
             VK_DYNAMIC_STATE_FRONT_FACE_EXT,
-          //VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT, //Disabled for VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME
             VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT,
             VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT,
             VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT,
@@ -856,6 +855,9 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
             VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT,
             VK_DYNAMIC_STATE_STENCIL_OP_EXT,
         };
+        if (!device.IsExtVertexInputDynamicStateSupported()) {
+            extended.push_back(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT);
+        }
         if (key.state.dynamic_vertex_input) {
             dynamic_states.push_back(VK_DYNAMIC_STATE_VERTEX_INPUT_EXT);
         }

src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

@@ -404,17 +404,13 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
                     device.GetMaxVertexInputBindings(), Maxwell::NumVertexArrays);
     }
 
-    const u8 dynamic_state = Settings::values.dyna_state.GetValue();
-
-    LOG_INFO(Render_Vulkan, "DynamicState value is set to {}", (u32) dynamic_state);
-
     dynamic_features = DynamicFeatures{
-        .has_extended_dynamic_state = device.IsExtExtendedDynamicStateSupported() && dynamic_state > 0,
-        .has_extended_dynamic_state_2 = device.IsExtExtendedDynamicState2Supported() && dynamic_state > 1,
-        .has_extended_dynamic_state_2_extra = device.IsExtExtendedDynamicState2ExtrasSupported() && dynamic_state > 1,
-        .has_extended_dynamic_state_3_blend = device.IsExtExtendedDynamicState3BlendingSupported() && dynamic_state > 2,
-        .has_extended_dynamic_state_3_enables = device.IsExtExtendedDynamicState3EnablesSupported() && dynamic_state > 2,
-        .has_dynamic_vertex_input = device.IsExtVertexInputDynamicStateSupported() && dynamic_state > 0,
+        .has_extended_dynamic_state = device.IsExtExtendedDynamicStateSupported(),
+        .has_extended_dynamic_state_2 = device.IsExtExtendedDynamicState2Supported(),
+        .has_extended_dynamic_state_2_extra = device.IsExtExtendedDynamicState2ExtrasSupported(),
+        .has_extended_dynamic_state_3_blend = device.IsExtExtendedDynamicState3BlendingSupported(),
+        .has_extended_dynamic_state_3_enables = device.IsExtExtendedDynamicState3EnablesSupported(),
+        .has_dynamic_vertex_input = device.IsExtVertexInputDynamicStateSupported(),
     };
 }
 

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -62,41 +62,29 @@ struct DrawParams {
 VkViewport GetViewportState(const Device& device, const Maxwell& regs, size_t index, float scale) {
     const auto& src = regs.viewport_transform[index];
     const auto conv = [scale](float value) {
-        float new_value = value * scale;
-        if (scale < 1.0f) {
-            const bool sign = std::signbit(value);
-            new_value = std::round(std::abs(new_value));
-            new_value = sign ? -new_value : new_value;
-        }
-        return new_value;
+        float const new_value = value * scale;
+        return scale < 1.0f
+            ? std::round(std::abs(new_value)) * (std::signbit(new_value) ? -1.f : 1.f)
+            : new_value;
     };
-    const float x = conv(src.translate_x - src.scale_x);
-    const float width = conv(src.scale_x * 2.0f);
-    float y = conv(src.translate_y - src.scale_y);
-    float height = conv(src.scale_y * 2.0f);
-
-    const bool lower_left = regs.window_origin.mode != Maxwell::WindowOrigin::Mode::UpperLeft;
-    const bool y_negate = !device.IsNvViewportSwizzleSupported() &&
-                          src.swizzle.y == Maxwell::ViewportSwizzle::NegativeY;
-
-    if (lower_left) {
-        // Flip by surface clip height
-        y += conv(static_cast<f32>(regs.surface_clip.height));
-        height = -height;
-    }
-
-    if (y_negate) {
-        // Flip by viewport height
-        y += height;
-        height = -height;
-    }
-
-    const float reduce_z = regs.depth_mode == Maxwell::DepthMode::MinusOneToOne ? 1.0f : 0.0f;
+    float const w = src.scale_x;
+    float h = src.scale_y;
+    if (regs.window_origin.mode == Maxwell::WindowOrigin::Mode::LowerLeft) // Flip by surface clip height
+        h = -h;
+    if (!device.IsNvViewportSwizzleSupported() && src.swizzle.y == Maxwell::ViewportSwizzle::NegativeY) // Flip by viewport height
+        h = -h;
+    // In theory, a raster flip is equivalent to a texture flip for a whole square viewport
+    // TODO: one day implement this properly and raster flip the triangles, not the whole viewport... guh
+    if(regs.viewport_transform[1].scale_y == 0 && regs.window_origin.flip_y != 0)
+        h = -h;
+    float const x = src.translate_x - w;
+    float const y = src.translate_y - h;
+    float const reduce_z = regs.depth_mode == Maxwell::DepthMode::MinusOneToOne ? 1.0f : 0.0f;
     VkViewport viewport{
-        .x = x,
-        .y = y,
-        .width = width != 0.0f ? width : 1.0f,
-        .height = height != 0.0f ? height : 1.0f,
+        .x = conv(x),
+        .y = conv(y),
+        .width = w != 0.0f ? conv(w * 2.f) : 1.0f,
+        .height = h != 0.0f ? conv(h * 2.f) : 1.0f,
         .minDepth = src.translate_z - src.scale_z * reduce_z,
         .maxDepth = src.translate_z + src.scale_z,
     };
@@ -945,7 +933,6 @@ bool AccelerateDMA::BufferToImage(const Tegra::DMA::ImageCopy& copy_info,
 
 void RasterizerVulkan::UpdateDynamicStates() {
     auto& regs = maxwell3d->regs;
-
     UpdateViewportsState(regs);
     UpdateScissorsState(regs);
     UpdateDepthBias(regs);
@@ -953,10 +940,7 @@ void RasterizerVulkan::UpdateDynamicStates() {
     UpdateDepthBounds(regs);
     UpdateStencilFaces(regs);
     UpdateLineWidth(regs);
-
-    const u8 dynamic_state = Settings::values.dyna_state.GetValue();
-
-    if (device.IsExtExtendedDynamicStateSupported() && dynamic_state > 0) {
+    if (device.IsExtExtendedDynamicStateSupported()) {
         UpdateCullMode(regs);
         UpdateDepthCompareOp(regs);
         UpdateFrontFace(regs);
@@ -966,42 +950,45 @@ void RasterizerVulkan::UpdateDynamicStates() {
             UpdateDepthTestEnable(regs);
             UpdateDepthWriteEnable(regs);
             UpdateStencilTestEnable(regs);
-            if (device.IsExtExtendedDynamicState2Supported() && dynamic_state > 1) {
+            if (device.IsExtExtendedDynamicState2Supported()) {
                 UpdatePrimitiveRestartEnable(regs);
                 UpdateRasterizerDiscardEnable(regs);
                 UpdateDepthBiasEnable(regs);
             }
-            if (device.IsExtExtendedDynamicState3EnablesSupported() && dynamic_state > 2) {
+            if (device.IsExtExtendedDynamicState3EnablesSupported()) {
                 using namespace Tegra::Engines;
                 if (device.GetDriverID() == VkDriverIdKHR::VK_DRIVER_ID_AMD_OPEN_SOURCE || device.GetDriverID() == VkDriverIdKHR::VK_DRIVER_ID_AMD_PROPRIETARY) {
-                    struct In {
-                        const Maxwell3D::Regs::VertexAttribute::Type d;
-                        In(Maxwell3D::Regs::VertexAttribute::Type n) : d(n) {}
-                        bool operator()(Maxwell3D::Regs::VertexAttribute n) const {
-                            return n.type == d;
+                    const auto has_float = std::any_of(
+                        regs.vertex_attrib_format.begin(),
+                        regs.vertex_attrib_format.end(),
+                        [](const auto& attrib) {
+                            return attrib.type == Maxwell3D::Regs::VertexAttribute::Type::Float;
                         }
-                    };
-                    auto has_float = std::any_of(regs.vertex_attrib_format.begin(), regs.vertex_attrib_format.end(), In(Maxwell3D::Regs::VertexAttribute::Type::Float));
+                    );
                     if (regs.logic_op.enable) {
                         regs.logic_op.enable = static_cast<u32>(!has_float);
                     }
                 }
                 UpdateLogicOpEnable(regs);
                 UpdateDepthClampEnable(regs);
-                UpdateLineStippleEnable(regs);
-                UpdateConservativeRasterizationMode(regs);
             }
         }
-        if (device.IsExtExtendedDynamicState2ExtrasSupported() && dynamic_state > 1) {
+        if (device.IsExtExtendedDynamicState2ExtrasSupported()) {
             UpdateLogicOp(regs);
         }
-        if (device.IsExtExtendedDynamicState3BlendingSupported() && dynamic_state > 2) {
+        if (device.IsExtExtendedDynamicState3BlendingSupported()) {
             UpdateBlending(regs);
         }
+        if (device.IsExtExtendedDynamicState3EnablesSupported()) {
+            UpdateLineStippleEnable(regs);
+            UpdateConservativeRasterizationMode(regs);
+        }
     }
-    if (device.IsExtVertexInputDynamicStateSupported() && dynamic_state > 0)
-        if (auto* gp = pipeline_cache.CurrentGraphicsPipeline(); gp && gp->HasDynamicVertexInput())
+    if (device.IsExtVertexInputDynamicStateSupported()) {
+        if (auto* gp = pipeline_cache.CurrentGraphicsPipeline(); gp && gp->HasDynamicVertexInput()) {
             UpdateVertexInput(regs);
+        }
+    }
 }
 
 void RasterizerVulkan::HandleTransformFeedback() {
@@ -1027,10 +1014,10 @@ void RasterizerVulkan::UpdateViewportsState(Tegra::Engines::Maxwell3D::Regs& reg
         return;
     }
     if (!regs.viewport_scale_offset_enabled) {
-        float x = static_cast<float>(regs.surface_clip.x);
-        float y = static_cast<float>(regs.surface_clip.y);
-        float width = (std::max)(1.0f, static_cast<float>(regs.surface_clip.width));
-        float height = (std::max)(1.0f, static_cast<float>(regs.surface_clip.height));
+        float x = float(regs.surface_clip.x);
+        float y = float(regs.surface_clip.y);
+        float width = (std::max)(1.0f, float(regs.surface_clip.width));
+        float height = (std::max)(1.0f, float(regs.surface_clip.height));
         if (regs.window_origin.mode != Maxwell::WindowOrigin::Mode::UpperLeft) {
             y += height;
             height = -height;

src/video_core/vulkan_common/vulkan_device.cpp

@@ -494,18 +494,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
     CollectPhysicalMemoryInfo();
     CollectToolingInfo();
 
-    if (is_qualcomm || is_turnip) {
-        LOG_WARNING(Render_Vulkan,
-                    "Qualcomm and Turnip drivers have broken VK_EXT_custom_border_color");
-        //RemoveExtensionFeature(extensions.custom_border_color, features.custom_border_color,
-        //VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME);
-    }
-
     if (is_qualcomm) {
-        LOG_WARNING(Render_Vulkan,
-                    "Qualcomm drivers have a slow VK_KHR_push_descriptor implementation");
-        //RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
-
         LOG_WARNING(Render_Vulkan,
                     "Disabling shader float controls and 64-bit integer features on Qualcomm proprietary drivers");
         RemoveExtension(extensions.shader_float_controls, VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME);
@@ -544,93 +533,36 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
         if (arch >= NvidiaArchitecture::Arch_AmpereOrNewer) {
             LOG_WARNING(Render_Vulkan, "Ampere and newer have broken float16 math");
             features.shader_float16_int8.shaderFloat16 = false;
-        } else if (arch <= NvidiaArchitecture::Arch_Volta) {
-            if (nv_major_version < 527) {
-                LOG_WARNING(Render_Vulkan, "Volta and older have broken VK_KHR_push_descriptor");
-                //RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
-            }
         }
+
         if (nv_major_version >= 510) {
             LOG_WARNING(Render_Vulkan, "NVIDIA Drivers >= 510 do not support MSAA image blits");
             cant_blit_msaa = true;
         }
     }
-    if (extensions.extended_dynamic_state && is_radv) {
-        // Mask driver version variant
-        const u32 version = (properties.properties.driverVersion << 3) >> 3;
-        if (version < VK_MAKE_API_VERSION(0, 21, 2, 0)) {
-            LOG_WARNING(Render_Vulkan,
-                        "RADV versions older than 21.2 have broken VK_EXT_extended_dynamic_state");
-            //RemoveExtensionFeature(extensions.extended_dynamic_state,
-            //features.extended_dynamic_state,
-            //VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME);
-        }
-    }
-    if (extensions.extended_dynamic_state2 && is_radv) {
-        const u32 version = (properties.properties.driverVersion << 3) >> 3;
-        if (version < VK_MAKE_API_VERSION(0, 22, 3, 1)) {
-            LOG_WARNING(
-                Render_Vulkan,
-                "RADV versions older than 22.3.1 have broken VK_EXT_extended_dynamic_state2");
-            // RemoveExtensionFeature(extensions.extended_dynamic_state2,
-            //        features.extended_dynamic_state2,
-            //      VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME);
-        }
-    }
-    if (extensions.extended_dynamic_state2 && is_qualcomm) {
-        const u32 version = (properties.properties.driverVersion << 3) >> 3;
-        if (version >= VK_MAKE_API_VERSION(0, 0, 676, 0) &&
-            version < VK_MAKE_API_VERSION(0, 0, 680, 0)) {
-            // Qualcomm Adreno 7xx drivers do not properly support extended_dynamic_state2.
-            LOG_WARNING(Render_Vulkan,
-                        "Qualcomm Adreno 7xx drivers have broken VK_EXT_extended_dynamic_state2");
-            //RemoveExtensionFeature(extensions.extended_dynamic_state2,
-            //features.extended_dynamic_state2,
-            //VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME);
-        }
-    }
+
     if (extensions.extended_dynamic_state3 && is_radv) {
         LOG_WARNING(Render_Vulkan, "RADV has broken extendedDynamicState3ColorBlendEquation");
-        features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = true;
-        features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = true;
-        dynamic_state3_blending = true;
+        features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false;
+        features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false;
+        dynamic_state3_blending = false;
 
         const u32 version = (properties.properties.driverVersion << 3) >> 3;
         if (version < VK_MAKE_API_VERSION(0, 23, 1, 0)) {
             LOG_WARNING(Render_Vulkan,
                         "RADV versions older than 23.1.0 have broken depth clamp dynamic state");
-            features.extended_dynamic_state3.extendedDynamicState3DepthClampEnable = true;
-            dynamic_state3_enables = true;
+            features.extended_dynamic_state3.extendedDynamicState3DepthClampEnable = false;
+            dynamic_state3_enables = false;
         }
     }
+
     if (extensions.extended_dynamic_state3 && (is_amd_driver || driver_id == VK_DRIVER_ID_SAMSUNG_PROPRIETARY)) {
         // AMD and Samsung drivers have broken extendedDynamicState3ColorBlendEquation
         LOG_WARNING(Render_Vulkan,
                     "AMD and Samsung drivers have broken extendedDynamicState3ColorBlendEquation");
-        features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = true;
-        features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = true;
-        dynamic_state3_blending = true;
-    }
-    if (extensions.vertex_input_dynamic_state && is_radv) {
-        // TODO(ameerj): Blacklist only offending driver versions
-        // TODO(ameerj): Confirm if RDNA1 is affected
-        const bool is_rdna2 =
-            supported_extensions.contains(VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME);
-        if (is_rdna2) {
-            LOG_WARNING(Render_Vulkan,
-                        "RADV has broken VK_EXT_vertex_input_dynamic_state on RDNA2 hardware");
-            //  RemoveExtensionFeature(extensions.vertex_input_dynamic_state,
-            //      features.vertex_input_dynamic_state,
-            //    VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME);
-        }
-    }
-    if (extensions.vertex_input_dynamic_state && is_qualcomm) {
-        // Qualcomm drivers do not properly support vertex_input_dynamic_state.
-        LOG_WARNING(Render_Vulkan,
-                    "Qualcomm drivers have broken VK_EXT_vertex_input_dynamic_state");
-        //RemoveExtensionFeature(extensions.vertex_input_dynamic_state,
-        //  features.vertex_input_dynamic_state,
-        //     VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME);
+        features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false;
+        features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false;
+        dynamic_state3_blending = false;
     }
 
     sets_per_pool = 64;
@@ -644,12 +576,14 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
             has_broken_cube_compatibility = true;
         }
     }
+
     if (is_qualcomm) {
         const u32 version = (properties.properties.driverVersion << 3) >> 3;
         if (version < VK_MAKE_API_VERSION(0, 255, 615, 512)) {
             has_broken_parallel_compiling = true;
         }
     }
+
     if (extensions.sampler_filter_minmax && is_amd) {
         // Disable ext_sampler_filter_minmax on AMD GCN4 and lower as it is broken.
         if (!features.shader_float16_int8.shaderFloat16) {
@@ -660,24 +594,17 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
         }
     }
 
-    if (extensions.vertex_input_dynamic_state && is_intel_windows) {
-        const u32 version = (properties.properties.driverVersion << 3) >> 3;
-        if (version < VK_MAKE_API_VERSION(27, 20, 100, 0)) {
-            LOG_WARNING(Render_Vulkan, "Intel has broken VK_EXT_vertex_input_dynamic_state");
-            //RemoveExtensionFeature(extensions.vertex_input_dynamic_state,
-            //features.vertex_input_dynamic_state,
-            //VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME);
-        }
-    }
     if (features.shader_float16_int8.shaderFloat16 && is_intel_windows) {
         // Intel's compiler crashes when using fp16 on Astral Chain, disable it for the time being.
         LOG_WARNING(Render_Vulkan, "Intel has broken float16 math");
         features.shader_float16_int8.shaderFloat16 = false;
     }
+
     if (is_intel_windows) {
         LOG_WARNING(Render_Vulkan, "Intel proprietary drivers do not support MSAA image blits");
         cant_blit_msaa = true;
     }
+
     has_broken_compute =
         CheckBrokenCompute(properties.driver.driverID, properties.properties.driverVersion) &&
         !Settings::values.enable_compute_pipelines.GetValue();
@@ -685,24 +612,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
         LOG_WARNING(Render_Vulkan, "Driver does not support native BGR format");
         must_emulate_bgr565 = true;
     }
-    if (extensions.push_descriptor && is_intel_anv) {
-        const u32 version = (properties.properties.driverVersion << 3) >> 3;
-        if (version >= VK_MAKE_API_VERSION(0, 22, 3, 0) &&
-            version < VK_MAKE_API_VERSION(0, 23, 2, 0)) {
-            // Disable VK_KHR_push_descriptor due to
-            // mesa/mesa/-/commit/ff91c5ca42bc80aa411cb3fd8f550aa6fdd16bdc
-            LOG_WARNING(Render_Vulkan,
-                        "ANV drivers 22.3.0 to 23.1.0 have broken VK_KHR_push_descriptor");
-            //RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
-        }
-    } else if (extensions.push_descriptor && is_nvidia) {
-        const auto arch = GetNvidiaArch();
-        if (arch <= NvidiaArchitecture::Arch_Pascal) {
-            LOG_WARNING(Render_Vulkan,
-                        "Pascal and older architectures have broken VK_KHR_push_descriptor");
-            //RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
-        }
-    }
 
     if (is_mvk) {
         LOG_WARNING(Render_Vulkan,
@@ -730,8 +639,8 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
                  "Removing extendedDynamicState3 due to missing extendedDynamicState2");
         RemoveExtensionFeature(extensions.extended_dynamic_state3, features.extended_dynamic_state3,
                                VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME);
-        dynamic_state3_blending = true;
-        dynamic_state3_enables = true;
+        dynamic_state3_blending = false;
+        dynamic_state3_enables = false;
     }
 
     // Mesa Intel drivers on UHD 620 have broken EDS causing extreme flickering - unknown if it affects other iGPUs
@@ -743,22 +652,26 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
         Settings::values.dyna_state.SetValue(0);
     }
 
-    if (Settings::values.dyna_state.GetValue() == 0) {
-        must_emulate_scaled_formats = true;
-        LOG_INFO(Render_Vulkan, "Extended dynamic state is fully disabled, scaled format emulation is ON");
-
-        RemoveExtensionFeature(extensions.custom_border_color, features.custom_border_color, VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME);
+    switch (Settings::values.dyna_state.GetValue()) {
+    case 0:
         RemoveExtensionFeature(extensions.extended_dynamic_state, features.extended_dynamic_state, VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME);
+        [[fallthrough]];
+    case 1:
         RemoveExtensionFeature(extensions.extended_dynamic_state2, features.extended_dynamic_state2, VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME);
+        [[fallthrough]];
+    case 2:
         RemoveExtensionFeature(extensions.extended_dynamic_state3, features.extended_dynamic_state3, VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME);
-        RemoveExtensionFeature(extensions.vertex_input_dynamic_state, features.vertex_input_dynamic_state, VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME);
         dynamic_state3_blending = false;
         dynamic_state3_enables = false;
+        break;
+    }
 
-        LOG_INFO(Render_Vulkan, "All dynamic state extensions and features have been disabled");
-    } else {
-        must_emulate_scaled_formats = false;
-        LOG_INFO(Render_Vulkan, "Extended dynamic state is enabled, scaled format emulation is OFF");
+    if (!extensions.extended_dynamic_state) {
+        Settings::values.vertex_input_dynamic_state.SetValue(false);
+    }
+
+    if (!Settings::values.vertex_input_dynamic_state.GetValue()) {
+        RemoveExtensionFeature(extensions.vertex_input_dynamic_state, features.vertex_input_dynamic_state, VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME);
     }
 
     logical = vk::Device::Create(physical, queue_cis, ExtensionListForVulkan(loaded_extensions), first_next, dld);
@@ -799,6 +712,9 @@ Device::~Device() {
 
 VkFormat Device::GetSupportedFormat(VkFormat wanted_format, VkFormatFeatureFlags wanted_usage,
                                     FormatType format_type) const {
+    if (wanted_format == VK_FORMAT_D24_UNORM_S8_UINT) {
+        return VK_FORMAT_D32_SFLOAT_S8_UINT;
+    }
     if (IsFormatSupported(wanted_format, wanted_usage, format_type)) {
         return wanted_format;
     }