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

Revert "Merge pull request #7361 from hrydgard/color-conv-centralize"

Browse Source 
This reverts commit f1b57dabf5, reversing
changes made to 41001637ce.
This commit is contained in:
Henrik Rydgard committed 2015-01-22 19:53:32 +01:00
1 parent 07933cad42
commit cae58cafee
33 files changed
+1195 -476
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GPU/Common/VertexDecoderCommon.cpp
+8 -5
View File
@@ -21,7 +21,6 @@
#include "base/logging.h"
#include "Common/CPUDetect.h"
#include "Common/ColorConv.h"
#include "Core/Config.h"
#include "Core/MemMap.h"
#include "Core/HDRemaster.h"
@@ -365,7 +364,8 @@ void VertexDecoder::Step_TcFloatPrescale() const {
uv[1] = uvdata[1] * gstate_c.uv.vScale + gstate_c.uv.vOff;
}
void VertexDecoder::Step_Color565() const {
void VertexDecoder::Step_Color565() const
{
u8 *c = decoded_ + decFmt.c0off;
u16 cdata = *(u16_le *)(ptr_ + coloff);
c[0] = Convert5To8(cdata & 0x1f);
@@ -375,7 +375,8 @@ void VertexDecoder::Step_Color565() const {
// Always full alpha.
}
void VertexDecoder::Step_Color5551() const {
void VertexDecoder::Step_Color5551() const
{
u8 *c = decoded_ + decFmt.c0off;
u16 cdata = *(u16_le *)(ptr_ + coloff);
c[0] = Convert5To8(cdata & 0x1f);
@@ -385,7 +386,8 @@ void VertexDecoder::Step_Color5551() const {
gstate_c.vertexFullAlpha = gstate_c.vertexFullAlpha && c[3] != 0;
}
void VertexDecoder::Step_Color4444() const {
void VertexDecoder::Step_Color4444() const
{
u8 *c = decoded_ + decFmt.c0off;
u16 cdata = *(u16_le *)(ptr_ + coloff);
for (int j = 0; j < 4; j++)
@@ -393,7 +395,8 @@ void VertexDecoder::Step_Color4444() const {
gstate_c.vertexFullAlpha = gstate_c.vertexFullAlpha && c[3] == 255;
}
void VertexDecoder::Step_Color8888() const {
void VertexDecoder::Step_Color8888() const
{
u8 *c = decoded_ + decFmt.c0off;
const u8 *cdata = (const u8*)(ptr_ + coloff);
memcpy(c, cdata, sizeof(u8) * 4);