PCSX2/gsdx-sourceforge
1
0
Fork 0
mirror of https://github.com/PCSX2/gsdx-sourceforge.git synced 2026-02-04 03:11:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
gabest
2009-01-28 22:59:38 +00:00
parent 19232551a1
commit dfce193902
4 changed files with 1142 additions and 1046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2102
gsdx/GSDrawScanline.cpp
View File

File diff suppressed because it is too large Load Diff

2
gsdx/GSPerfMon.h
View File

@@ -24,7 +24,7 @@
class GSPerfMon
{
public:
enum counter_t {Frame, Prim, Draw, Swizzle, Unswizzle, Fillrate, CounterLast};
enum counter_t {Frame, Prim, Draw, Swizzle, Unswizzle, Fillrate, Quad, CounterLast};
enum warning_t {DATE, PABE, ABE, COLCLAMP, DepthTexture, WarningLast};
protected:

3
gsdx/GSRenderer.h
View File

@@ -350,11 +350,12 @@ public:
double fps = 1000.0f / m_perfmon.Get(GSPerfMon::Frame);
s_stats.Format(
_T("%I64d | %d x %d | %.2f fps (%d%%) | %s - %s | %s | %d/%d | %d%% CPU | %.2f | %.2f"),
_T("%I64d | %d x %d | %.2f fps (%d%%) | %s - %s | %s | %d/%d/%d | %d%% CPU | %.2f | %.2f"),
m_perfmon.GetFrame(), GetDisplaySize().cx, GetDisplaySize().cy, fps, (int)(100.0 * fps / GetFPS()),
SMODE2->INT ? (CString(_T("Interlaced ")) + (SMODE2->FFMD ? _T("(frame)") : _T("(field)"))) : _T("Progressive"),
GSSettingsDlg::g_interlace[m_interlace].name,
GSSettingsDlg::g_aspectratio[m_aspectratio].name,
(int)m_perfmon.Get(GSPerfMon::Quad),
(int)m_perfmon.Get(GSPerfMon::Prim),
(int)m_perfmon.Get(GSPerfMon::Draw),
m_perfmon.CPU(),

81
gsdx/GSRendererSW.h
View File

@@ -686,6 +686,59 @@ protected:
r &= CRect(0, 0, w, h);
}
template<int i0, int i1, int i2, int i3>
static bool IsQuad(GSVertexSW* v)
{
GSVector4 v0 = v[i0].p.xyxy(v[i0].t);
GSVector4 v1 = v[i1].p.xyxy(v[i1].t);
GSVector4 v2 = v[i2].p.xyxy(v[i2].t);
GSVector4 v3 = v[i3].p.xyxy(v[i3].t);
GSVector4 v4 = v0 == v1;
GSVector4 v5 = v0 == v2;
GSVector4 v6 = v3 == v1;
GSVector4 v7 = v3 == v2;
v1 = (v4 ^ v5) & (v6 ^ v7);
v2 = (v4 ^ v5.zwxy()) & (v6 ^ v7.zwxy());
if((v1 & v2 & (v0 != v3)).alltrue())
{
v0 = v[i0].p.zwzw(v[i0].t);
v1 = v[i1].p.zwzw(v[i1].t);
v2 = v[i2].p.zwzw(v[i2].t);
v3 = v[i3].p.zwzw(v[i3].t);
if(((v0 == v1) & (v0 == v2) & (v0 == v3)).alltrue())
{
v0 = v[i0].c;
v1 = v[i1].c;
v2 = v[i2].c;
v3 = v[i3].c;
if(((v0 == v1) & (v0 == v2) & (v0 == v3)).alltrue())
{
/*
printf("quad\n");
for(int i = 0; i < 6; i++)
{
printf("p = %.3f %.3f %.3f %.3f t = %.3f %.3f %.3f %.3f c = %.0f %.0f %.0f %.0f\n",
v[i].p.x, v[i].p.y, v[i].p.z, v[i].p.w,
v[i].t.x, v[i].t.y, v[i].t.z, v[i].t.w,
v[i].c.x / 128, v[i].c.y / 128, v[i].c.z / 128, v[i].c.w / 128);
}
*/
return true;
}
}
}
return false;
}
public:
GSRendererSW(BYTE* base, bool mt, void (*irq)(), int nloophack, const GSRendererSettings& rs, int threads)
: GSRendererT(base, mt, irq, nloophack, rs)
@@ -826,6 +879,34 @@ public:
}
m_count += count;
if(m_count == 6)
{
bool isquad = false;
switch(prim)
{
case GS_TRIANGLESTRIP:
isquad = IsQuad<0, 1, 2, 5>(m_vertices);
break;
case GS_TRIANGLEFAN:
isquad = IsQuad<1, 0, 2, 5>(m_vertices);
break;
// TODO: case GS_TRIANGLELIST:
}
if(isquad)
{
m_vertices[prim == GS_TRIANGLESTRIP ? 1 : 0] = m_vertices[5];
m_count = 2;
UINT32 tmp = PRIM->PRIM;
PRIM->PRIM = GS_SPRITE;
Flush();
PRIM->PRIM = tmp;
m_count = 0;
m_perfmon.Put(GSPerfMon::Quad, 1);
}
}
}
}
};