Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allow vertex decoding steps to have their own different decoders.

Browse Source 
As long as they decode to the same output format..
This commit is contained in:
Henrik Rydgård 2023-05-25 15:42:16 +02:00
parent 1e269c1d3c
commit 266c653e7e
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
GPU/Common/DrawEngineCommon.cpp
View File

@ -165,6 +165,8 @@ void DrawEngineCommon::NotifyConfigChanged() {
decJitCache_->Clear();
lastVType_ = -1;
dec_ = nullptr;
// Just make sure there's no pending draw, since we wipe the decoders. There shouldn't be one.
numDrawCalls_ = 0;
decoderMap_.Iterate([&](const uint32_t vtype, VertexDecoder *decoder) {
delete decoder;
});
@ -624,9 +626,12 @@ void DrawEngineCommon::DecodeVertsStep(u8 *dest, int &i, int &decodedVerts, cons
int indexLowerBound = dc.indexLowerBound;
int indexUpperBound = dc.indexUpperBound;
if (dc.indexType == GE_VTYPE_IDX_NONE >> GE_VTYPE_IDX_SHIFT) {
int indexType = dc.IndexType();
const VertexDecoder *dec = dc.dec;
if (indexType == GE_VTYPE_IDX_NONE >> GE_VTYPE_IDX_SHIFT) {
// Decode the verts (and at the same time apply morphing/skinning). Simple.
dec_->DecodeVerts(dest + decodedVerts * (int)dec_->GetDecVtxFmt().stride,
dec->DecodeVerts(dest + decodedVerts * (int)dec->GetDecVtxFmt().stride,
dc.verts, uvScale, indexLowerBound, indexUpperBound);
decodedVerts += indexUpperBound - indexLowerBound + 1;
@ -640,13 +645,14 @@ void DrawEngineCommon::DecodeVertsStep(u8 *dest, int &i, int &decodedVerts, cons
// inds pointer but the same base vertex pointer. We'd like to reuse vertices between
// these as much as possible, so we make sure here to combine as many as possible
// into one nice big drawcall, sharing data.
// NOTE: We can't do that if the vertex decoder changes, so let's check for that.
// 1. Look ahead to find the max index, only looking as "matching" drawcalls.
// Expand the lower and upper bounds as we go.
int lastMatch = i;
const int total = numDrawCalls_;
for (int j = i + 1; j < total; ++j) {
if (drawCalls_[j].verts != dc.verts)
if (drawCalls_[j].verts != dc.verts || drawCalls_[j].dec != dc.dec)
break;
// TODO: What if UV scale/offset changes between drawcalls here?
indexLowerBound = std::min(indexLowerBound, (int)drawCalls_[j].indexLowerBound);
@ -655,7 +661,7 @@ void DrawEngineCommon::DecodeVertsStep(u8 *dest, int &i, int &decodedVerts, cons
}
// 2. Loop through the drawcalls, translating indices as we go.
switch (dc.indexType) {
switch (indexType) {
case GE_VTYPE_IDX_8BIT >> GE_VTYPE_IDX_SHIFT:
for (int j = i; j <= lastMatch; j++) {
bool clockwise = true;
@ -693,7 +699,7 @@ void DrawEngineCommon::DecodeVertsStep(u8 *dest, int &i, int &decodedVerts, cons
}
// 3. Decode that range of vertex data.
dec_->DecodeVerts(dest + decodedVerts * (int)dec_->GetDecVtxFmt().stride,
dec->DecodeVerts(dest + decodedVerts * (int)dec->GetDecVtxFmt().stride,
dc.verts, uvScale, indexLowerBound, indexUpperBound);
decodedVerts += vertexCount;
@ -818,6 +824,7 @@ void DrawEngineCommon::SubmitPrim(const void *verts, const void *inds, GEPrimiti
dc.verts = verts;
dc.inds = inds;
dc.vertexCount = vertexCount;
dc.dec = dec_;
dc.indexType = (vertTypeID & GE_VTYPE_IDX_MASK) >> GE_VTYPE_IDX_SHIFT;
dc.prim = prim;
dc.cullMode = cullMode;

6
GPU/Common/DrawEngineCommon.h
View File

@ -200,7 +200,7 @@ protected:
u16 *decIndex_ = nullptr;
// Cached vertex decoders
u32 lastVType_ = -1; // corresponds to dec_. Could really just pick it out of dec_...
u32 lastVType_ = -1; // corresponds to dec_, but also has a few extra bits (texgen type).
DenseHashMap<u32, VertexDecoder *, nullptr> decoderMap_;
VertexDecoder *dec_ = nullptr;
VertexDecoderJitCache *decJitCache_ = nullptr;
@ -213,6 +213,7 @@ protected:
struct DeferredDrawCall {
const void *verts;
const void *inds;
VertexDecoder *dec;
u32 vertexCount;
u8 indexType;
s8 prim;
@ -220,6 +221,9 @@ protected:
u16 indexLowerBound;
u16 indexUpperBound;
UVScale uvScale;
int IndexType() const {
return (dec->VertexType() & GE_VTYPE_IDX_MASK) >> GE_VTYPE_IDX_SHIFT;
}
};
enum { MAX_DEFERRED_DRAW_CALLS = 128 };