Merge pull request #19279 from hrydgard/fix-screenshot-hang

Fix screenshot hang
This commit is contained in:
Henrik Rydgård 2024-06-19 12:00:02 +02:00 committed by GitHub
commit 03b68fdc61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions

View file

@ -208,10 +208,11 @@ void FrameData::Submit(VulkanContext *vulkan, FrameSubmitType type, FrameDataSha
cmdBufs[numCmdBufs++] = presentCmd;
hasPresentCommands = false;
}
if (type == FrameSubmitType::FinishFrame) {
fenceToTrigger = fence;
}
if (type == FrameSubmitType::FinishFrame) {
_dbg_assert_(!fenceToTrigger);
fenceToTrigger = fence;
}
if (!numCmdBufs && fenceToTrigger == VK_NULL_HANDLE) {

View file

@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.3.1'
classpath 'com.android.tools.build:gradle:8.5.0'
}
}

View file

@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
android.useAndroidX=true
android.enableJetifier=true