KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "util: fix DXT1 RGBA texture compression if the source color is (0, 0, 0, 0)" 

This reverts commit 6e7d782da5.

Oops, I just had this locally for testing and forgot to remove it before pushing.
This commit is contained in:
Dave Airlie 2011-02-16 16:13:58 +10:00
parent 04903d1f63
commit 4ffef88899
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gallium/auxiliary/util/u_format_s3tc.c
View File

@ -416,20 +416,8 @@ util_format_dxt1_rgba_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
uint8_t tmp[4][4][4]; /* [bh][bw][comps] */
for(j = 0; j < bh; ++j) {
for(i = 0; i < bw; ++i) {
const uint8_t *srcp = &src[(y + j)*src_stride/sizeof(*src) + (x + i)*comps];
/* Workaround for a bug in libtxc_dxtn.
* If the color is (0,0,0,0), it is compressed as (0,0,0,1),
* which is incorrect. Any other (x,y,z,0) color is compressed
* correctly as (0,0,0,0), so let's use (1,0,0,0). */
if (srcp[0] == 0 && srcp[1] == 0 && srcp[2] == 0 && srcp[3] == 0) {
tmp[j][i][0] = 255;
tmp[j][i][1] = 0;
tmp[j][i][2] = 0;
tmp[j][i][3] = 0;
} else {
for(k = 0; k < comps; ++k) {
tmp[j][i][k] = srcp[k];
}
for(k = 0; k < comps; ++k) {
tmp[j][i][k] = src[(y + j)*src_stride/sizeof(*src) + (x + i)*comps + k];
}
}
}