Mesa (master): mesa/formats: pass correct parameter to _mesa_is_format_compressed

Dave Airlie airlied at kemper.freedesktop.org
Wed Aug 26 04:13:45 UTC 2015


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Aug 26 10:37:09 2015 +1000

mesa/formats: pass correct parameter to _mesa_is_format_compressed

commit 26c549e69d12e44e2e36c09764ce2cceab262a1b
Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Fri Jul 31 10:26:36 2015 -0700

    mesa/formats: remove compressed formats from matching function

caused a regression in my CTS testing, this looks like a clear
thinko.

Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
sSigned-off-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/main/formats.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 8dd07d8..34a4434 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -1979,7 +1979,7 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
    case MESA_FORMAT_X8R8G8B8_SRGB:
       return GL_FALSE;
    default:
-      assert(_mesa_is_format_compressed(format));
+      assert(_mesa_is_format_compressed(mesa_format));
       if (error)
          *error = GL_INVALID_ENUM;
    }




More information about the mesa-commit mailing list