Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Common/GPU/Vulkan/VulkanFrameData.cpp
View file

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

2
build.gradle
View file

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

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true