Mesa (master): gallium/util: fix inverted if is_nop logic in s3tc

Luca Barbieri lb at kemper.freedesktop.org
Sat Apr 3 01:36:15 UTC 2010


Module: Mesa
Branch: master
Commit: ea1c8ceaeabe3c1c137e8e2a06fa26fd6991d7d3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea1c8ceaeabe3c1c137e8e2a06fa26fd6991d7d3

Author: Luca Barbieri <luca at luca-barbieri.com>
Date:   Sat Apr  3 01:55:27 2010 +0200

gallium/util: fix inverted if is_nop logic in s3tc

---

 src/gallium/auxiliary/util/u_format_s3tc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_format_s3tc.c b/src/gallium/auxiliary/util/u_format_s3tc.c
index d48551f..7808210 100644
--- a/src/gallium/auxiliary/util/u_format_s3tc.c
+++ b/src/gallium/auxiliary/util/u_format_s3tc.c
@@ -303,7 +303,7 @@ util_format_dxt3_rgba_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const
 void
 util_format_dxt5_rgba_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
 {
-   if (is_nop(util_format_dxt5_rgba_fetch)) {
+   if (!is_nop(util_format_dxt5_rgba_fetch)) {
       unsigned x, y, i, j;
       for(y = 0; y < height; y += 4) {
          const uint8_t *src = src_row;
@@ -324,7 +324,7 @@ util_format_dxt5_rgba_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const
 void
 util_format_dxt1_rgb_unpack_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height)
 {
-   if (is_nop(util_format_dxt1_rgb_fetch)) {
+   if (!is_nop(util_format_dxt1_rgb_fetch)) {
       unsigned x, y, i, j;
       for(y = 0; y < height; y += 4) {
          const uint8_t *src = src_row;




More information about the mesa-commit mailing list