| Revision | 1fc9f34d7c81a43c5bebc2730d3636116574ee03 (tree) |
|---|---|
| Zeit | 2013-10-31 23:21:48 |
| Autor | Rudolf Polzer <divverent@xono...> |
| Commiter | Rudolf Polzer |
Fix for #2 (alpha zero pixels wreaking havoc).
One place accidentally ignored alpha-zero pixels, making it inconsistent
with the rest and causing bad visual errors in MODE_FAST.
s2tc_algorithm.cpp (diff)| @@ -880,7 +880,7 @@ namespace | ||
| 880 | 880 | |
| 881 | 881 | color_t c0 = make_color_t(0, 0, 0); |
| 882 | 882 | |
| 883 | - // dummy values because we don't know whether the first pixel willw rite | |
| 883 | + // dummy values because we don't know whether the first pixel will write | |
| 884 | 884 | c[0].r = 31; |
| 885 | 885 | c[0].g = 63; |
| 886 | 886 | c[0].b = 31; |
| @@ -903,8 +903,6 @@ namespace | ||
| 903 | 903 | c[2].b = rgba[(x + y * iw) * 4 + 2]; |
| 904 | 904 | ca[2] = rgba[(x + y * iw) * 4 + 3]; |
| 905 | 905 | // MODE_FAST doesn't work for normalmaps, so this works |
| 906 | - if(!ca[2]) | |
| 907 | - continue; | |
| 908 | 906 | |
| 909 | 907 | int d = ColorDist(c[2], c0); |
| 910 | 908 | if(d > dmax) |
| @@ -1130,7 +1128,7 @@ namespace | ||
| 1130 | 1128 | template<DxtMode dxt, ColorDistFunc ColorDist> |
| 1131 | 1129 | inline s2tc_encode_block_func_t s2tc_encode_block_func(int nrandom, RefinementMode refine) |
| 1132 | 1130 | { |
| 1133 | - if(!supports_fast<ColorDist>::value || nrandom >= 0) | |
| 1131 | + if(!supports_fast<ColorDist>::value || nrandom >= 0) | |
| 1134 | 1132 | return s2tc_encode_block_func<dxt, ColorDist, MODE_NORMAL>(refine); |
| 1135 | 1133 | else |
| 1136 | 1134 | return s2tc_encode_block_func<dxt, ColorDist, MODE_FAST>(refine); |
Android-x86
Fork