Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Stub invalid vertex decoder colors to avoid crash.

Browse source 
These values are invalid, but before we'd call a null pointer if we hit
them.  Should do tests to see what actual behavior is.
This commit is contained in:
Unknown W. Brackets 2015-04-17 23:24:21 -07:00
parent 42bcea7b41
commit 327ca4c96e
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
GPU/Common/VertexDecoderCommon.cpp
View file

@ -365,6 +365,11 @@ void VertexDecoder::Step_TcFloatPrescale() const {
uv[1] = uvdata[1] * gstate_c.uv.vScale + gstate_c.uv.vOff;
}
void VertexDecoder::Step_ColorInvalid() const
{
// Do nothing. This is only here to prevent crashes.
}
void VertexDecoder::Step_Color565() const
{
u8 *c = decoded_ + decFmt.c0off;
@ -762,7 +767,10 @@ static const StepFunction tcstep_through_RemasterToFloat[4] = {
// TODO: Tc Morph
static const StepFunction colstep[8] = {
0, 0, 0, 0,
0,
&VertexDecoder::Step_ColorInvalid,
&VertexDecoder::Step_ColorInvalid,
&VertexDecoder::Step_ColorInvalid,
&VertexDecoder::Step_Color565,
&VertexDecoder::Step_Color5551,
&VertexDecoder::Step_Color4444,
@ -770,7 +778,10 @@ static const StepFunction colstep[8] = {
};
static const StepFunction colstep_morph[8] = {
0, 0, 0, 0,
0,
&VertexDecoder::Step_ColorInvalid,
&VertexDecoder::Step_ColorInvalid,
&VertexDecoder::Step_ColorInvalid,
&VertexDecoder::Step_Color565Morph,
&VertexDecoder::Step_Color5551Morph,
&VertexDecoder::Step_Color4444Morph,

1
GPU/Common/VertexDecoderCommon.h
View file

@ -493,6 +493,7 @@ public:
void Step_TcU16ThroughDoubleToFloat() const;
void Step_TcFloatThrough() const;
void Step_ColorInvalid() const;
void Step_Color4444() const;
void Step_Color565() const;
void Step_Color5551() const;