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

Merge branch 'master' of github.com:hrydgard/ppsspp

Browse Source
This commit is contained in:
Henrik Rydgard committed 2012-11-11 18:44:46 +01:00
2 parents 8aa072161c 5f02c9ad36
commit dfabd74020
2 files changed
+7 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GPU/GLES/DisplayListInterpreter.cpp
+2 -2
View File
@@ -739,9 +739,9 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff)
case GE_CMD_LDC0:case GE_CMD_LDC1:case GE_CMD_LDC2:case GE_CMD_LDC3:
case GE_CMD_LSC0:case GE_CMD_LSC1:case GE_CMD_LSC2:case GE_CMD_LSC3:
{
float r = (float)(data>>16)/255.0f;
float r = (float)(data & 0xff)/255.0f;
float g = (float)((data>>8) & 0xff)/255.0f;
float b = (float)(data & 0xff)/255.0f;
float b = (float)(data>>16)/255.0f;
int l = (cmd - GE_CMD_LAC0) / 3;
int t = (cmd - GE_CMD_LAC0) % 3;
GPU/GLES/TransformPipeline.cpp
+5 -2
View File
@@ -295,11 +295,14 @@ void TransformAndDrawPrim(void *verts, void *inds, int prim, int vertexCount, Li
psum += tpos*decoded[index].weights[i];
nsum += tnorm*decoded[index].weights[i];
}
nsum.Normalize();
psum.Write(out);
nsum.Write(norm);
Vec3ByMatrix43(out, psum.v, gstate.worldMatrix);
Norm3ByMatrix43(norm, nsum.v, gstate.worldMatrix);
}
// Perform lighting here if enabled. don't need to check through, it's checked above.
float dots[4] = {0,0,0,0};
if (program->a_color0 != -1)