summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-02-16 16:13:58 +1000
committerDave Airlie <airlied@redhat.com>2011-02-16 16:13:58 +1000
commit4ffef888997888c120deba9c1604cfd56645c041 (patch)
tree828e897d60a676a5f77955a2507cfa29a1510c01
parent04903d1f639d21e1476552adf4de7f4edc35b489 (diff)
Revert "util: fix DXT1 RGBA texture compression if the source color is (0, 0, 0, 0)"
This reverts commit 6e7d782da506da233b2ac695b022ac393e1c719e. Oops, I just had this locally for testing and forgot to remove it before pushing.
-rw-r--r--src/gallium/auxiliary/util/u_format_s3tc.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/gallium/auxiliary/util/u_format_s3tc.c b/src/gallium/auxiliary/util/u_format_s3tc.c
index 31288e3f0c..bb989c29d8 100644
--- a/src/gallium/auxiliary/util/u_format_s3tc.c
+++ b/src/gallium/auxiliary/util/u_format_s3tc.c
@@ -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];
}
}
}