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

GSdx: made a little mistake masking the unused giftag regs, when all 16 were in-use 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5076 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 2012-01-20 00:34:44 +00:00
parent 5de9f84fae
commit 6a86a6520d
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/GSdx/GSRendererSW.cpp
View File

@ -250,10 +250,12 @@ void GSRendererSW::Draw()
GSVertexSW* RESTRICT d = sd->vertex; GSVertexSW* RESTRICT d = sd->vertex;
GSVector4i o = (GSVector4i)m_context->XYOFFSET; GSVector4i o = (GSVector4i)m_context->XYOFFSET;
GSVector4 tsize = GSVector4(0x10000 << m_context->TEX0.TW, 0x10000 << m_context->TEX0.TH); GSVector4 tsize = GSVector4(0x10000 << m_context->TEX0.TW, 0x10000 << m_context->TEX0.TH, 1, 0);
for(size_t i = 0; i < m_vertex.next; i++, s++, d++) for(size_t i = 0; i < m_vertex.next; i++, s++, d++)
{ {
// TODO: load xyzuvf in one piece
uint32 z = s->XYZ.Z; uint32 z = s->XYZ.Z;
GSVector4i xy = GSVector4i::load((int)s->XYZ.u32[0]).upl16() - o; GSVector4i xy = GSVector4i::load((int)s->XYZ.u32[0]).upl16() - o;
@ -263,6 +265,8 @@ void GSRendererSW::Draw()
p = GSVector4(xy).xyxy(GSVector4(zf) + (GSVector4::m_x4f800000 & GSVector4::cast(zf.sra32(31)))) * g_pos_scale; p = GSVector4(xy).xyxy(GSVector4(zf) + (GSVector4::m_x4f800000 & GSVector4::cast(zf.sra32(31)))) * g_pos_scale;
GSVector4 stcq = GSVector4::load<true>(&s->m[0]); // s t rgba q
if(PRIM->TME) if(PRIM->TME)
{ {
if(PRIM->FST) if(PRIM->FST)
@ -271,12 +275,11 @@ void GSRendererSW::Draw()
} }
else else
{ {
t = GSVector4(s->ST.S, s->ST.T) * tsize; t = stcq.xyww() * tsize;
t = t.xyxy(GSVector4::load(s->RGBAQ.Q));
} }
} }
c = GSVector4::rgba32(s->RGBAQ.u32[0], 7); c = GSVector4(GSVector4i::cast(stcq).zzzz().u8to32() << 7);
d->p = p; d->p = p;
d->c = c; d->c = c;
@ -284,7 +287,7 @@ void GSRendererSW::Draw()
if(sd->primclass == GS_SPRITE_CLASS) if(sd->primclass == GS_SPRITE_CLASS)
{ {
d->t.u32[3] = z; d->t.u32[3] = z; // TODO: store this to the 4th unused GSVector4?
} }
} }
} }

6
plugins/GSdx/GSVector.cpp
View File

@ -22,8 +22,9 @@
#include "stdafx.h" #include "stdafx.h"
#include "GSVector.h" #include "GSVector.h"
const GSVector4i GSVector4i::m_xff[16] = const GSVector4i GSVector4i::m_xff[17] =
{ {
GSVector4i(0x00000000, 0x00000000, 0x00000000, 0x00000000),
GSVector4i(0x000000ff, 0x00000000, 0x00000000, 0x00000000), GSVector4i(0x000000ff, 0x00000000, 0x00000000, 0x00000000),
GSVector4i(0x0000ffff, 0x00000000, 0x00000000, 0x00000000), GSVector4i(0x0000ffff, 0x00000000, 0x00000000, 0x00000000),
GSVector4i(0x00ffffff, 0x00000000, 0x00000000, 0x00000000), GSVector4i(0x00ffffff, 0x00000000, 0x00000000, 0x00000000),
@ -42,8 +43,9 @@ const GSVector4i GSVector4i::m_xff[16] =
GSVector4i(0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff), GSVector4i(0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff),
}; };
const GSVector4i GSVector4i::m_x0f[16] = const GSVector4i GSVector4i::m_x0f[17] =
{ {
GSVector4i(0x00000000, 0x00000000, 0x00000000, 0x00000000),
GSVector4i(0x0000000f, 0x00000000, 0x00000000, 0x00000000), GSVector4i(0x0000000f, 0x00000000, 0x00000000, 0x00000000),
GSVector4i(0x00000f0f, 0x00000000, 0x00000000, 0x00000000), GSVector4i(0x00000f0f, 0x00000000, 0x00000000, 0x00000000),
GSVector4i(0x000f0f0f, 0x00000000, 0x00000000, 0x00000000), GSVector4i(0x000f0f0f, 0x00000000, 0x00000000, 0x00000000),

4
plugins/GSdx/GSVector.h
View File

@ -79,8 +79,8 @@ class GSVector4;
__aligned(class, 16) GSVector4i __aligned(class, 16) GSVector4i
{ {
static const GSVector4i m_xff[16]; static const GSVector4i m_xff[17];
static const GSVector4i m_x0f[16]; static const GSVector4i m_x0f[17];
public: public:
union union

2
plugins/GSdx/GSVertexTrace.cpp
View File

@ -140,6 +140,8 @@ void GSVertexTrace::FindMinMax(const void* vertex, const uint32* index, int coun
GSVector4i cmin = GSVector4i::xffffffff(); GSVector4i cmin = GSVector4i::xffffffff();
GSVector4i cmax = GSVector4i::zero(); GSVector4i cmax = GSVector4i::zero();
// TODO: SSE41 has integer min/max, use that for xy/z/uv/f
const GSVertex* RESTRICT v = (GSVertex*)vertex; const GSVertex* RESTRICT v = (GSVertex*)vertex;
for(int i = 0; i < count; i += n) for(int i = 0; i < count; i += n)