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

Spline: Avoid having to modify and restore gstate_c.uv

Browse Source
This commit is contained in:
Henrik Rydgård
2026-07-03 12:51:53 +02:00
parent 8804042a9d
commit e2fbf295cf
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPU/Common/SplineCommon.cpp
+11 -20
View File
@@ -465,8 +465,9 @@ void DrawEngineCommon::SubmitCurve(const void *control_points, const void *indic
u16 index_lower_bound = 0;
u16 index_upper_bound = num_points - 1;
IndexConverter ConvertIndex(vertType, indices);
if (indices)
if (indices) {
GetIndexBounds(indices, num_points, vertType, &index_lower_bound, &index_upper_bound);
}
u32 vertTypeID = GetVertTypeID(vertType, gstate.getUVGenMode(), applySkinInDecode_);
VertexDecoder *origVDecoder = GetVertexDecoder(vertTypeID);
@@ -487,7 +488,8 @@ void DrawEngineCommon::SubmitCurve(const void *control_points, const void *indic
}
const u32 origVertType = vertType;
vertType = ::NormalizeVertices(simplified_control_points, temp_buffer, (u8 *)control_points, index_lower_bound, index_upper_bound, gstate_c.uv, origVDecoder, vertType);
UVScale neutralUVScale{1.0f, 1.0f, 0.0f, 0.0f}; // Avoid rescaling UV during normalization, it will happen anyway later (in DispatchSubmitPrim). Although ideally we should avoid running Decode at all there.
vertType = ::NormalizeVertices(simplified_control_points, temp_buffer, (u8 *)control_points, index_lower_bound, index_upper_bound, neutralUVScale, origVDecoder, vertType);
VertexDecoder *vdecoder = GetVertexDecoder(vertType);
@@ -502,8 +504,9 @@ void DrawEngineCommon::SubmitCurve(const void *control_points, const void *indic
ERROR_LOG(Log::G3D, "Failed to allocate space for control point pointers, skipping curve draw");
return;
}
for (int idx = 0; idx < num_points; idx++)
for (int idx = 0; idx < num_points; idx++) {
points[idx] = simplified_control_points + (indices ? ConvertIndex(idx) : idx);
}
OutputBuffers output;
output.vertices = (SimpleVertex *)(decoded_ + DECODED_VERTEX_BUFFER_SIZE / 2);
@@ -515,23 +518,15 @@ void DrawEngineCommon::SubmitCurve(const void *control_points, const void *indic
surface.Init(maxVerts);
ControlPoints cpoints(points, num_points, managedBuf);
if (cpoints.IsValid())
if (cpoints.IsValid()) {
// Run the tessellation!
SoftwareTessellation(output, surface, origVertType, cpoints);
else
} else {
ERROR_LOG(Log::G3D, "Failed to allocate space for control point values, skipping curve draw");
}
u32 vertTypeWithIndex16 = (vertType & ~GE_VTYPE_IDX_MASK) | GE_VTYPE_IDX_16BIT;
UVScale prevUVScale;
if (origVertType & GE_VTYPE_TC_MASK) {
// We scaled during Normalize already so let's turn it off when drawing.
prevUVScale = gstate_c.uv;
gstate_c.uv.uScale = 1.0f;
gstate_c.uv.vScale = 1.0f;
gstate_c.uv.uOff = 0;
gstate_c.uv.vOff = 0;
}
vertTypeID = GetVertTypeID(vertTypeWithIndex16, gstate.getUVGenMode(), applySkinInDecode_);
int generatedBytesRead;
if (output.count) {
@@ -539,11 +534,7 @@ void DrawEngineCommon::SubmitCurve(const void *control_points, const void *indic
DispatchSubmitPrim(output.vertices, output.indices, PatchPrimToPrim(surface.primType), output.count, vertTypeID, true, &generatedBytesRead, flags);
}
if (flushOnParams_)
if (flushOnParams_) {
Flush();
if (origVertType & GE_VTYPE_TC_MASK) {
// If analysis says this is uninitialized, it's wrong.
gstate_c.uv = prevUVScale;
}
}