From: Dave Airlie <airlied@redhat.com>
Date: Wed, 26 Aug 2015 00:37:09 +0000 (+1000)
Subject: mesa/formats: pass correct parameter to _mesa_is_format_compressed
X-Git-Tag: android-x86-6.0-r1~7785
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=73e5adc4b2bf082addd1ae76fb23c2773887162b;p=android-x86%2Fexternal-mesa.git

mesa/formats: pass correct parameter to _mesa_is_format_compressed

commit 26c549e69d12e44e2e36c09764ce2cceab262a1b
Author: Nanley Chery <nanley.g.chery@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@intel.com>
sSigned-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 8dd07d88f40..34a4434c3ba 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;
    }