mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Common: Remove some unused color conv funcs.
We already have versions of these doing other conversions.
This commit is contained in:
1 parent
f44852bb18
commit
e3fdb183f6
2 files changed
-91
No files matched your search
@@ -34,88 +34,6 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// convert 4444 image to 8888, parallelizable
|
||||
void convert4444_gl(u16* data, u32* out, int width, int l, int u) {
|
||||
for (int y = l; y < u; ++y) {
|
||||
for (int x = 0; x < width; ++x) {
|
||||
u32 val = data[y*width + x];
|
||||
u32 r = ((val >> 12) & 0xF) * 17;
|
||||
u32 g = ((val >> 8) & 0xF) * 17;
|
||||
u32 b = ((val >> 4) & 0xF) * 17;
|
||||
u32 a = ((val >> 0) & 0xF) * 17;
|
||||
out[y*width + x] = (a << 24) | (b << 16) | (g << 8) | r;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// convert 565 image to 8888, parallelizable
|
||||
void convert565_gl(u16* data, u32* out, int width, int l, int u) {
|
||||
for (int y = l; y < u; ++y) {
|
||||
for (int x = 0; x < width; ++x) {
|
||||
u32 val = data[y*width + x];
|
||||
u32 r = Convert5To8((val >> 11) & 0x1F);
|
||||
u32 g = Convert6To8((val >> 5) & 0x3F);
|
||||
u32 b = Convert5To8((val)& 0x1F);
|
||||
out[y*width + x] = (0xFF << 24) | (b << 16) | (g << 8) | r;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// convert 5551 image to 8888, parallelizable
|
||||
void convert5551_gl(u16* data, u32* out, int width, int l, int u) {
|
||||
for (int y = l; y < u; ++y) {
|
||||
for (int x = 0; x < width; ++x) {
|
||||
u32 val = data[y*width + x];
|
||||
u32 r = Convert5To8((val >> 11) & 0x1F);
|
||||
u32 g = Convert5To8((val >> 6) & 0x1F);
|
||||
u32 b = Convert5To8((val >> 1) & 0x1F);
|
||||
u32 a = (val & 0x1) * 255;
|
||||
out[y*width + x] = (a << 24) | (b << 16) | (g << 8) | r;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// convert 4444 image to 8888, parallelizable
|
||||
void convert4444_dx9(u16* data, u32* out, int width, int l, int u) {
|
||||
for (int y = l; y < u; ++y) {
|
||||
for (int x = 0; x < width; ++x) {
|
||||
u32 val = data[y*width + x];
|
||||
u32 r = ((val >> 0) & 0xF) * 17;
|
||||
u32 g = ((val >> 4) & 0xF) * 17;
|
||||
u32 b = ((val >> 8) & 0xF) * 17;
|
||||
u32 a = ((val >> 12) & 0xF) * 17;
|
||||
out[y*width + x] = (a << 24) | (b << 16) | (g << 8) | r;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// convert 565 image to 8888, parallelizable
|
||||
void convert565_dx9(u16* data, u32* out, int width, int l, int u) {
|
||||
for (int y = l; y < u; ++y) {
|
||||
for (int x = 0; x < width; ++x) {
|
||||
u32 val = data[y*width + x];
|
||||
u32 r = Convert5To8((val)& 0x1F);
|
||||
u32 g = Convert6To8((val >> 5) & 0x3F);
|
||||
u32 b = Convert5To8((val >> 11) & 0x1F);
|
||||
out[y*width + x] = (0xFF << 24) | (b << 16) | (g << 8) | r;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// convert 5551 image to 8888, parallelizable
|
||||
void convert5551_dx9(u16* data, u32* out, int width, int l, int u) {
|
||||
for (int y = l; y < u; ++y) {
|
||||
for (int x = 0; x < width; ++x) {
|
||||
u32 val = data[y*width + x];
|
||||
u32 r = Convert5To8((val >> 0) & 0x1F);
|
||||
u32 g = Convert5To8((val >> 5) & 0x1F);
|
||||
u32 b = Convert5To8((val >> 10) & 0x1F);
|
||||
u32 a = ((val >> 15) & 0x1) * 255;
|
||||
out[y*width + x] = (a << 24) | (b << 16) | (g << 8) | r;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ConvertBGRA8888ToRGBA8888(u32 *dst, const u32 *src, u32 numPixels) {
|
||||
#ifdef _M_SSE
|
||||
const __m128i maskGA = _mm_set1_epi32(0xFF00FF00);
|
||||
|
||||
@@ -126,15 +126,6 @@ inline u16 RGBA8888ToRGBA444X(u32 value) {
|
||||
return r | g | b;
|
||||
}
|
||||
|
||||
// convert image to 8888, parallelizable
|
||||
// TODO: Implement these in terms of the conversion functions below.
|
||||
void convert4444_gl(u16* data, u32* out, int width, int l, int u);
|
||||
void convert565_gl(u16* data, u32* out, int width, int l, int u);
|
||||
void convert5551_gl(u16* data, u32* out, int width, int l, int u);
|
||||
void convert4444_dx9(u16* data, u32* out, int width, int l, int u);
|
||||
void convert565_dx9(u16* data, u32* out, int width, int l, int u);
|
||||
void convert5551_dx9(u16* data, u32* out, int width, int l, int u);
|
||||
|
||||
// "Complete" set of color conversion functions between the usual formats.
|
||||
|
||||
// TODO: Need to revisit the naming convention of these. Seems totally backwards
|
||||
|
||||
Reference in new issue
Block a user