Module Name:    xsrc
Committed By:   riastradh
Date:           Fri Feb 26 21:41:31 UTC 2016

Modified Files:
        xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen:
            nv50_ir_emit_nvc0.cpp

Log Message:
Avoid Clang constant-logical-operand warning.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
    
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp:1.2
--- xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp:1.1.1.1	Thu Dec 18 06:02:07 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp	Fri Feb 26 21:41:31 2016
@@ -2455,7 +2455,7 @@ CodeEmitterNVC0::getMinEncodingSize(cons
 {
    const Target::OpInfo &info = targ->getOpInfo(i);
 
-   if (writeIssueDelays || info.minEncSize == 8 || 1)
+   if (writeIssueDelays || info.minEncSize == 8 || true)
       return 8;
 
    if (i->ftz || i->saturate || i->join)
@@ -2466,7 +2466,7 @@ CodeEmitterNVC0::getMinEncodingSize(cons
       return 8;
 
    if (i->op == OP_PINTERP) {
-      if (i->getSampleMode() || 1) // XXX: grr, short op doesn't work
+      if (i->getSampleMode() || true) // XXX: grr, short op doesn't work
          return 8;
    } else
    if (i->op == OP_MOV && i->lanes != 0xf) {

Reply via email to