Mesa (master): llvmpipe: Changed known failures in lp_test_conv.

[Jose Fonseca]

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

Author: James Benton <jbenton at vmware.com>
Date:   Fri May 18 16:16:46 2012 +0100

llvmpipe: Changed known failures in lp_test_conv.

To comply with the recent fixes to lp_bld_conv.

Signed-off-by: José Fonseca <jfonseca at vmware.com>

---

 src/gallium/drivers/llvmpipe/lp_test_conv.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_test_conv.c b/src/gallium/drivers/llvmpipe/lp_test_conv.c
index 2889350..307b8d9 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_conv.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_conv.c
@@ -173,6 +173,15 @@ test_one(struct gallivm_state *gallivm, unsigned verbose,
       return TRUE;
    }
 
+   /* Known failures
+    * - fixed point 32 -> float 32
+    * - float 32 -> signed normalised integer 32
+    */
+   if ((src_type.floating && !dst_type.floating && dst_type.sign && dst_type.norm && src_type.width == dst_type.width) ||
+       (!src_type.floating && dst_type.floating && src_type.fixed && src_type.width == dst_type.width)) {
+      return TRUE;
+   }
+
    if(verbose >= 1)
       dump_conv_types(stdout, src_type, dst_type);
 
@@ -384,9 +393,6 @@ test_all(struct gallivm_state *gallivm, unsigned verbose, FILE *fp)
          if(src_type == dst_type)
             continue;
 
-         if(src_type->norm != dst_type->norm)
-            continue;
-
          if(!test_one(gallivm, verbose, fp, *src_type, *dst_type))
            success = FALSE;