preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-22 02:39:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22682 from hrydgard/spline-line-edges

Browse Source 
Splines: Draw a line patch's shared quad edges once
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2026-10-20 14:52:25 +02:00
2 parents 5471f5fe88 7adf0c15ee
commit 394c05f414
2 files changed
+15 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GPU/Common/SplineCommon.cpp
+11 -5
View File
@@ -57,14 +57,20 @@ public:
namespace Spline {
static void CopyQuadIndex(u16 *&indices, GEPatchPrimType type, const int idx0, const int idx1, const int idx2, const int idx3) {
// Returns the number of indices written.
static int CopyQuadIndex(u16 *&indices, GEPatchPrimType type, const int idx0, const int idx1, const int idx2, const int idx3, bool rightEdge) {
if (type == GE_PATCHPRIM_LINES) {
// A zigzag per quad: left edge down, the diagonal up to the top right, right edge down (gpu/probe exp175,
// exact: line colors and lit start pixels show the directions, and overlapping pixels the order).
// exact: line colors and lit start pixels show the directions, and overlapping pixels the order). The right
// edge only on a patch's last column, as the next quad's left edge is the same line (exp257, counted with
// additive blending).
*(indices++) = idx0;
*(indices++) = idx2;
*(indices++) = idx2;
*(indices++) = idx1;
if (!rightEdge) {
return 4;
}
*(indices++) = idx1;
*(indices++) = idx3;
} else {
@@ -75,16 +81,16 @@ static void CopyQuadIndex(u16 *&indices, GEPatchPrimType type, const int idx0, c
*(indices++) = idx2;
*(indices++) = idx3;
}
return 6;
}
void BuildIndex(u16 *indices, int &count, int num_u, int num_v, GEPatchPrimType prim_type, int total) {
void BuildIndex(u16 *indices, int &count, int num_u, int num_v, int patch_u, GEPatchPrimType prim_type, int total) {
for (int v = 0; v < num_v; ++v) {
for (int u = 0; u < num_u; ++u) {
int idx0 = v * (num_u + 1) + u + total; // Top left
int idx2 = (v + 1) * (num_u + 1) + u + total; // Bottom left
CopyQuadIndex(indices, prim_type, idx0, idx0 + 1, idx2, idx2 + 1);
count += 6;
count += CopyQuadIndex(indices, prim_type, idx0, idx0 + 1, idx2, idx2 + 1, (u + 1) % patch_u == 0);
}
}
}
GPU/Common/SplineCommon.h
+4 -3
View File
@@ -34,7 +34,8 @@ class SimpleBufferManager;
namespace Spline {
void BuildIndex(u16 *indices, int &count, int num_u, int num_v, GEPatchPrimType prim_type, int total = 0);
// patch_u is the number of quads per patch along u.
void BuildIndex(u16 *indices, int &count, int num_u, int num_v, int patch_u, GEPatchPrimType prim_type, int total = 0);
class Bezier3DWeight;
class Spline3DWeight;
@@ -99,7 +100,7 @@ struct BezierSurface : public SurfaceInfo {
for (int patch_v = 0; patch_v < num_patches_v; ++patch_v) {
int patch_index = patch_v * num_patches_u + patch_u;
int total = patch_index * num_verts_per_patch;
Spline::BuildIndex(indices + count, count, tess_u, tess_v, primType, total);
Spline::BuildIndex(indices + count, count, tess_u, tess_v, tess_u, primType, total);
}
}
}
@@ -133,7 +134,7 @@ struct SplineSurface : public SurfaceInfo {
}
void BuildIndex(u16 *indices, int &count) const {
Spline::BuildIndex(indices, count, num_patches_u * tess_u, num_patches_v * tess_v, primType);
Spline::BuildIndex(indices, count, num_patches_u * tess_u, num_patches_v * tess_v, tess_u, primType);
}
};