Skip to content

S
swiftshader
Commit f08be92d by Alexis Hetu Committed by Alexis Hétu
Options

ETC2 RGBA fix

Since EAC is no longer decoded to an 8 bit format, but ETC2 alpha still is, we need to distinguish between the 2. Added an argument to DecodeBlock for that purpose. Change-Id: Ied4263cecc43f88609a357437c11f4e43af229b8 Reviewed-on: https://swiftshader-review.googlesource.com/15228Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 60e20280
Showing with 5 additions and 5 deletions
src/Renderer/ETC_Decoder.cpp
...@@ -89,9 +89,9 @@ namespace ...@@ -89,9 +89,9 @@ namespace
struct ETC2 struct ETC2
{ {
// Decodes unsigned single or dual channel block to bytes // Decodes unsigned single or dual channel block to bytes
static void DecodeBlock(const ETC2** sources, unsigned char *dest, int nbChannels, int x, int y, int w, int h, int pitch, bool isSigned) static void DecodeBlock(const ETC2** sources, unsigned char *dest, int nbChannels, int x, int y, int w, int h, int pitch, bool isSigned, bool isEAC)
{ {
if(nbChannels <= 2) // EAC if(isEAC)
{ {
for(int j = 0; j < 4 && (y + j) < h; j++) for(int j = 0; j < 4 && (y + j) < h; j++)
{ {
...@@ -690,7 +690,7 @@ bool ETC_Decoder::Decode(const unsigned char* src, unsigned char *dst, int w, in ...@@ -690,7 +690,7 @@ bool ETC_Decoder::Decode(const unsigned char* src, unsigned char *dst, int w, in
unsigned char *dstRow = dst + (y * dstPitch); unsigned char *dstRow = dst + (y * dstPitch);
for(int x = 0; x < w; x += 4, sources[0]++) for(int x = 0; x < w; x += 4, sources[0]++)
{ {
ETC2::DecodeBlock(sources, dstRow + (x * dstBpp), 1, x, y, dstW, dstH, dstPitch, inputType == ETC_R_SIGNED); ETC2::DecodeBlock(sources, dstRow + (x * dstBpp), 1, x, y, dstW, dstH, dstPitch, inputType == ETC_R_SIGNED, true);
} }
} }
break; break;
...@@ -702,7 +702,7 @@ bool ETC_Decoder::Decode(const unsigned char* src, unsigned char *dst, int w, in ...@@ -702,7 +702,7 @@ bool ETC_Decoder::Decode(const unsigned char* src, unsigned char *dst, int w, in
unsigned char *dstRow = dst + (y * dstPitch); unsigned char *dstRow = dst + (y * dstPitch);
for(int x = 0; x < w; x += 4, sources[0] += 2, sources[1] += 2) for(int x = 0; x < w; x += 4, sources[0] += 2, sources[1] += 2)
{ {
ETC2::DecodeBlock(sources, dstRow + (x * dstBpp), 2, x, y, dstW, dstH, dstPitch, inputType == ETC_RG_SIGNED); ETC2::DecodeBlock(sources, dstRow + (x * dstBpp), 2, x, y, dstW, dstH, dstPitch, inputType == ETC_RG_SIGNED, true);
} }
} }
break; break;
...@@ -724,7 +724,7 @@ bool ETC_Decoder::Decode(const unsigned char* src, unsigned char *dst, int w, in ...@@ -724,7 +724,7 @@ bool ETC_Decoder::Decode(const unsigned char* src, unsigned char *dst, int w, in
for(int x = 0; x < w; x += 4) for(int x = 0; x < w; x += 4)
{ {
// Decode Alpha // Decode Alpha
ETC2::DecodeBlock(&sources[0], &(alphaValues[0][0]), 1, x, y, dstW, dstH, 4, false); ETC2::DecodeBlock(&sources[0], &(alphaValues[0][0]), 1, x, y, dstW, dstH, 4, false, false);
sources[0]++; // RGBA packets are 128 bits, so move on to the next 64 bit packet to decode the RGB color sources[0]++; // RGBA packets are 128 bits, so move on to the next 64 bit packet to decode the RGB color
// Decode RGB // Decode RGB
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment