From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 3 May 2010 08:54:01 +0000 (+0100)
Subject: gallivm: Replace predicate assertion failure with warning message.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e27983bc08d4eff5effbbcffbf5c9f5862fca2cf;p=mesa.git

gallivm: Replace predicate assertion failure with warning message.
---

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
index f49f278c3d0..faf491fc3c7 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
@@ -579,7 +579,6 @@ emit_store(
 
    case TGSI_FILE_PREDICATE:
       /* FIXME */
-      assert(0);
       break;
 
    default:
@@ -729,7 +728,7 @@ emit_kilp(struct lp_build_tgsi_soa_context *bld,
    lp_build_mask_update(bld->mask, mask);
 }
 
-static int
+static void
 emit_declaration(
    struct lp_build_tgsi_soa_context *bld,
    const struct tgsi_full_declaration *decl)
@@ -767,13 +766,15 @@ emit_declaration(
                                                 vec_type, "");
          break;
 
+      case TGSI_FILE_PREDICATE:
+         _debug_printf("warning: predicate registers not yet implemented\n");
+         break;
+
       default:
          /* don't need to declare other vars */
          break;
       }
    }
-
-   return TRUE;
 }
 
 
@@ -1755,10 +1756,7 @@ lp_build_tgsi_soa(LLVMBuilderRef builder,
       switch( parse.FullToken.Token.Type ) {
       case TGSI_TOKEN_TYPE_DECLARATION:
          /* Inputs already interpolated */
-         {
-            if (!emit_declaration( &bld, &parse.FullToken.FullDeclaration ))
-               _debug_printf("warning: failed to define LLVM variable\n");
-         }
+         emit_declaration( &bld, &parse.FullToken.FullDeclaration );
          break;
 
       case TGSI_TOKEN_TYPE_INSTRUCTION: