ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vk oit: tentative workaround for AMD crash 

Issue #908
This commit is contained in:
Flyinghead 2023-02-05 21:56:08 +01:00
parent 46d7dfc750
commit 084066bde7
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/rend/vulkan/oit/oit_drawer.cpp
View File

@ -212,6 +212,32 @@ void OITDrawer::UploadMainBuffer(const OITDescriptorSets::VertexShaderUniforms&
{ {
BufferPacker packer; BufferPacker packer;
// Add a dummy transparent triangle to work around an AMD crash if nothing is drawn
PolyParam poly{};
poly.init();
poly.first = pvrrc.idx.size();
poly.count = 3;
poly.isp.DepthMode = 6;
poly.pcw.Gouraud = 1;
poly.tsp.SrcInstr = 4;
poly.tsp.DstInstr = 5;
poly.tsp.FogCtrl = 2;
poly.tsp.UseAlpha = 1;
dummyTrPolyIndex = pvrrc.global_param_tr.size();
pvrrc.global_param_tr.push_back(poly);
Vertex v{};
v.col[3] = 1; // non null alpha so it's not optimized out
v.z = 1.f;
pvrrc.idx.push_back(pvrrc.verts.size());
pvrrc.verts.push_back(v);
v.x = 1.f;
pvrrc.idx.push_back(pvrrc.verts.size());
pvrrc.verts.push_back(v);
v.x = 0.f;
v.y = 1.f;
pvrrc.idx.push_back(pvrrc.verts.size());
pvrrc.verts.push_back(v);
// Vertex // Vertex
packer.add(&pvrrc.verts[0], pvrrc.verts.size() * sizeof(decltype(pvrrc.verts[0]))); packer.add(&pvrrc.verts[0], pvrrc.verts.size() * sizeof(decltype(pvrrc.verts[0])));
// Modifier Volumes // Modifier Volumes
@ -364,7 +390,12 @@ bool OITDrawer::Draw(const Texture *fogTexture, const Texture *paletteTexture)
if (current_pass.autosort) if (current_pass.autosort)
{ {
if (!firstFrameAfterInit) if (!firstFrameAfterInit)
DrawList(cmdBuffer, ListType_Translucent, true, Pass::OIT, pvrrc.global_param_tr, previous_pass.tr_count, current_pass.tr_count); {
if (previous_pass.tr_count == current_pass.tr_count)
DrawList(cmdBuffer, ListType_Translucent, true, Pass::OIT, pvrrc.global_param_tr, dummyTrPolyIndex, dummyTrPolyIndex + 1);
else
DrawList(cmdBuffer, ListType_Translucent, true, Pass::OIT, pvrrc.global_param_tr, previous_pass.tr_count, current_pass.tr_count);
}
} }
else else
DrawList(cmdBuffer, ListType_Translucent, false, Pass::Color, pvrrc.global_param_tr, previous_pass.tr_count, current_pass.tr_count); DrawList(cmdBuffer, ListType_Translucent, false, Pass::Color, pvrrc.global_param_tr, previous_pass.tr_count, current_pass.tr_count);

1
core/rend/vulkan/oit/oit_drawer.h
View File

@ -152,6 +152,7 @@ private:
int renderPass = 0; int renderPass = 0;
OITDescriptorSets descriptorSets; OITDescriptorSets descriptorSets;
std::vector<std::unique_ptr<BufferData>> mainBuffers; std::vector<std::unique_ptr<BufferData>> mainBuffers;
int dummyTrPolyIndex = 0;
}; };
class OITScreenDrawer : public OITDrawer class OITScreenDrawer : public OITDrawer