preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-01 03:57:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

UI: Don't use draw objects from before a device loss

Browse Source 
The system info screen's "Copy summary" kept the draw context it was
created with, and the GPU driver test screen kept its pipelines and
sampler, using and finally releasing them into a deleted context after
Android lost the surface. Look up the draw context when clicked, and
release the test objects on device loss (they're recreated on draw).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-10-26 15:04:00 +01:00
1 parent ac8440e35d
commit 247e764b97
3 files changed
+41 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/GPUDriverTestScreen.cpp
+38 -47
View File
@@ -239,61 +239,48 @@ GPUDriverTestScreen::GPUDriverTestScreen() {
}
GPUDriverTestScreen::~GPUDriverTestScreen() {
if (discardWriteDepthStencil_)
discardWriteDepthStencil_->Release();
if (discardWriteDepth_)
discardWriteDepth_->Release();
if (discardWriteStencil_)
discardWriteStencil_->Release();
DestroyDeviceObjects();
}
if (drawTestStencilEqualDepthAlways_)
drawTestStencilEqualDepthAlways_->Release();
if (drawTestStencilNotEqualDepthAlways_)
drawTestStencilNotEqualDepthAlways_->Release();
if (drawTestStencilEqual_)
drawTestStencilEqual_->Release();
if (drawTestStencilNotEqual_)
drawTestStencilNotEqual_->Release();
if (drawTestStencilAlwaysDepthLessEqual_)
drawTestStencilAlwaysDepthLessEqual_->Release();
if (drawTestStencilAlwaysDepthGreater_)
drawTestStencilAlwaysDepthGreater_->Release();
if (drawTestDepthLessEqual_)
drawTestDepthLessEqual_->Release();
if (drawTestDepthGreater_)
drawTestDepthGreater_->Release();
template <class T>
static void ReleaseAndClear(T *&obj) {
if (obj) {
obj->Release();
obj = nullptr;
}
}
if (discardFragShader_)
discardFragShader_->Release();
void GPUDriverTestScreen::deviceLost() {
UIBaseDialogScreen::deviceLost();
DestroyDeviceObjects();
}
// Shader test
if (adrenoLogicDiscardPipeline_)
adrenoLogicDiscardPipeline_->Release();
if (flatShadingPipeline_)
flatShadingPipeline_->Release();
if (adrenoLogicDiscardFragShader_)
adrenoLogicDiscardFragShader_->Release();
if (adrenoLogicDiscardVertShader_)
adrenoLogicDiscardVertShader_->Release();
if (flatFragShader_)
flatFragShader_->Release();
if (flatVertShader_)
flatVertShader_->Release();
if (samplerNearest_)
samplerNearest_->Release();
// Everything is created again on the next draw, from the new draw context.
void GPUDriverTestScreen::DestroyDeviceObjects() {
ReleaseAndClear(discardWriteDepthStencil_);
ReleaseAndClear(discardWriteDepth_);
ReleaseAndClear(discardWriteStencil_);
ReleaseAndClear(drawTestStencilEqualDepthAlways_);
ReleaseAndClear(drawTestStencilNotEqualDepthAlways_);
ReleaseAndClear(drawTestStencilEqual_);
ReleaseAndClear(drawTestStencilNotEqual_);
ReleaseAndClear(drawTestStencilAlwaysDepthLessEqual_);
ReleaseAndClear(drawTestStencilAlwaysDepthGreater_);
ReleaseAndClear(drawTestDepthLessEqual_);
ReleaseAndClear(drawTestDepthGreater_);
ReleaseAndClear(discardFragShader_);
ReleaseAndClear(adrenoLogicDiscardPipeline_);
ReleaseAndClear(flatShadingPipeline_);
ReleaseAndClear(adrenoLogicDiscardFragShader_);
ReleaseAndClear(adrenoLogicDiscardVertShader_);
ReleaseAndClear(flatFragShader_);
ReleaseAndClear(flatVertShader_);
ReleaseAndClear(samplerNearest_);
}
void GPUDriverTestScreen::CreateViews() {
using namespace Draw;
if (!samplerNearest_) {
DrawContext *draw = screenManager()->getDrawContext();
SamplerStateDesc nearestDesc{};
samplerNearest_ = draw->CreateSamplerState(nearestDesc);
}
// Don't bother with views for now.
using namespace UI;
auto di = GetI18NCategory(I18NCat::DIALOG);
@@ -631,6 +618,10 @@ void GPUDriverTestScreen::ShaderTest(UIContext &dc) {
}
void GPUDriverTestScreen::DrawForeground(UIContext &dc) {
if (!samplerNearest_) {
Draw::SamplerStateDesc nearestDesc{};
samplerNearest_ = screenManager()->getDrawContext()->CreateSamplerState(nearestDesc);
}
switch (tabHolder_->GetCurrentTab()) {
case 0:
DiscardTest(dc);