Reduce flicker on savestate screenshot load

hrydgard · Dec 13, 2023 · 1ac780a · 1ac780a
1 parent d549817
commit 1ac780a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Common/Render/ManagedTexture.h b/Common/Render/ManagedTexture.h
@@ -53,6 +53,10 @@ class ManagedTexture {
 	void DeviceLost();
 	void DeviceRestored(Draw::DrawContext *draw);
 
+	bool Failed() const {
+		return state_ == LoadState::FAILED;
+	}
+
 	enum class LoadState {
 		PENDING,
 		FAILED,

diff --git a/Common/UI/AsyncImageFileView.cpp b/Common/UI/AsyncImageFileView.cpp
@@ -100,12 +100,14 @@ void AsyncImageFileView::Draw(UIContext &dc) {
 			dc.DrawText(text_.c_str(), bounds_.centerX(), bounds_.centerY(), 0xFFFFFFFF, ALIGN_CENTER | FLAG_DYNAMIC_ASCII);
 		}
 	} else {
-		if (!filename_.empty()) {
-			// draw a black rectangle to represent the missing screenshot.
-			dc.FillRect(UI::Drawable(0xFF000000), GetBounds());
-		} else {
-			// draw a dark gray rectangle to represent no save state.
-			dc.FillRect(UI::Drawable(0x50202020), GetBounds());
+		if (!texture_ || texture_->Failed()) {
+			if (!filename_.empty()) {
+				// draw a black rectangle to represent the missing screenshot.
+				dc.FillRect(UI::Drawable(0xFF000000), GetBounds());
+			} else {
+				// draw a dark gray rectangle to represent no save state.
+				dc.FillRect(UI::Drawable(0x50202020), GetBounds());
+			}
 		}
 		if (!text_.empty()) {
 			dc.DrawText(text_.c_str(), bounds_.centerX(), bounds_.centerY(), 0xFFFFFFFF, ALIGN_CENTER | FLAG_DYNAMIC_ASCII);