gallivm: Translate KIL instead of KILP.

diff --git a/src/gallium/auxiliary/gallivm/instructions.cpp b/src/gallium/auxiliary/gallivm/instructions.cpp
index 1a98491b82a5e92514242af5c1294fb846acfef7..035224e8f3c8a9ade7a3e3db92c843d3e6ab7599 100644 (file)
--- a/src/gallium/auxiliary/gallivm/instructions.cpp
+++ b/src/gallium/auxiliary/gallivm/instructions.cpp
@@ -878,9 +878,9 @@ llvm::Value * Instructions::scs(llvm::Value *in)
    return call;
 }
 
-llvm::Value * Instructions::kilp(llvm::Value *in)
+llvm::Value * Instructions::kil(llvm::Value *in)
 {
-   llvm::Function *func = m_mod->getFunction("kilp");
+   llvm::Function *func = m_mod->getFunction("kil");
    assert(func);
 
    CallInst *call = m_builder.CreateCall(func, in, name("kilpres"));

diff --git a/src/gallium/auxiliary/gallivm/instructions.h b/src/gallium/auxiliary/gallivm/instructions.h
index 3a476928b6d1e674390b9e1dff341f05fc296224..d286ce80c7874429302924a329fd25b7072a395a 100644 (file)
--- a/src/gallium/auxiliary/gallivm/instructions.h
+++ b/src/gallium/auxiliary/gallivm/instructions.h
@@ -79,7 +79,7 @@ public:
    llvm::Value *floor(llvm::Value *in);
    llvm::Value *frc(llvm::Value *in);
    void         ifop(llvm::Value *in);
-   llvm::Value *kilp(llvm::Value *in);
+   llvm::Value *kil(llvm::Value *in);
    llvm::Value *lerp(llvm::Value *in1, llvm::Value *in2,
                      llvm::Value *in3);
    llvm::Value *lit(llvm::Value *in);

diff --git a/src/gallium/auxiliary/gallivm/llvm_builtins.c b/src/gallium/auxiliary/gallivm/llvm_builtins.c
index 6b9d626ed4ae6756e636effc9487d7d664d85fa0..d5a003a48b28d44411ff235419b07abbd2b50a55 100644 (file)
--- a/src/gallium/auxiliary/gallivm/llvm_builtins.c
+++ b/src/gallium/auxiliary/gallivm/llvm_builtins.c
@@ -105,7 +105,7 @@ inline float4 vsin(float4 val)
    return result;
 }
 
-inline int kilp(float4 val)
+inline int kil(float4 val)
 {
    if (val.x < 0 || val.y < 0 || val.z < 0 || val.w < 0)
       return 1;

diff --git a/src/gallium/auxiliary/gallivm/tgsitollvm.cpp b/src/gallium/auxiliary/gallivm/tgsitollvm.cpp
index b14e2affd6fcafae9e19680ba4fdfbccc6955cdd..cc1516a45e0d18454b1d2bd0eeeb2912cfa0c4a0 100644 (file)
--- a/src/gallium/auxiliary/gallivm/tgsitollvm.cpp
+++ b/src/gallium/auxiliary/gallivm/tgsitollvm.cpp
@@ -396,11 +396,7 @@ translate_instruction(llvm::Module *module,
       break;
    case TGSI_OPCODE_DDY:
       break;
-   case TGSI_OPCODE_KILP: {
-      out = instr->kilp(inputs[0]);
-      storage->setKilElement(out);
-      return;
-   }
+   case TGSI_OPCODE_KILP:
       break;
    case TGSI_OPCODE_PK2H:
       break;
@@ -602,7 +598,11 @@ translate_instruction(llvm::Module *module,
       break;
    case TGSI_OPCODE_BREAKC:
       break;
-   case TGSI_OPCODE_KIL:
+   case TGSI_OPCODE_KIL: {
+      out = instr->kil(inputs[0]);
+      storage->setKilElement(out);
+      return;
+   }
       break;
    case TGSI_OPCODE_END:
       instr->end();
@@ -799,8 +799,7 @@ translate_instructionir(llvm::Module *module,
       break;
    case TGSI_OPCODE_DDY:
       break;
-   case TGSI_OPCODE_KILP: {
-   }
+   case TGSI_OPCODE_KILP:
       break;
    case TGSI_OPCODE_PK2H:
       break;
@@ -967,7 +966,8 @@ translate_instructionir(llvm::Module *module,
       break;
    case TGSI_OPCODE_BREAKC:
       break;
-   case TGSI_OPCODE_KIL:
+   case TGSI_OPCODE_KIL: {
+   }
       break;
    case TGSI_OPCODE_END:
       instr->end();