fix a variety of warnings/errors

2 files changed, 3 insertions, 2 deletions

diff --git a/src/mesa/shader/slang/MachineIndependent/Intermediate.cpp b/src/mesa/shader/slang/MachineIndependent/Intermediate.cpp
index 759a2902629..056fe17de02 100755
--- a/src/mesa/shader/slang/MachineIndependent/Intermediate.cpp
+++ b/src/mesa/shader/slang/MachineIndependent/Intermediate.cpp
@@ -1670,7 +1670,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, TIntermTyped* constantNod
                     //

                     int rightValue = constantNode->getAsConstantUnion()->getUnionArrayPointer()->iConst;

                     int leftValue = this->getUnionArrayPointer()->iConst;

-                    int line = this->getLine();

+                    //int line = this->getLine();

 

                     switch(op) {

                     //?? add constant intrinsics

@@ -2085,6 +2085,7 @@ bool TIntermediate::removeMatrixConstNode(TIntermSequence &parentSequence, TType
                     case EbtInt:   constantUnion->iConst = 0;     break;

                     case EbtFloat: constantUnion->fConst = 0.0;   break;

                     case EbtBool:  constantUnion->bConst = false; break;

+                    default: ; /* default added by BrianP */

                     }

                 }

                 TIntermConstantUnion *constant = new TIntermConstantUnion(constantUnion,

diff --git a/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp b/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp
index 497264348b7..ba717fce12b 100755
--- a/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp
+++ b/src/mesa/shader/slang/MachineIndependent/PoolAlloc.cpp
@@ -203,7 +203,7 @@ void TAllocation::checkGuardBlock(unsigned char* blockMem, unsigned char val, ch
             char assertMsg[80];

 

             // We don't print the assert message.  It's here just to be helpful.

-            sprintf(assertMsg, "PoolAlloc: Damage %s %lu byte allocation at 0x%p\n",

+            sprintf(assertMsg, "PoolAlloc: Damage %s %u byte allocation at 0x%p\n",

                     locText, size, data());

             assert(0 && "PoolAlloc: Damage in guard block");

         }