glslang: Fix over 100 warnings from MSVC warning level 4.

[platform/upstream/glslang.git] / glslang / MachineIndependent / parseConst.cpp

diff --git a/glslang/MachineIndependent/parseConst.cpp b/glslang/MachineIndependent/parseConst.cpp
index ac643b6..90621d3 100644 (file)
--- a/glslang/MachineIndependent/parseConst.cpp
+++ b/glslang/MachineIndependent/parseConst.cpp
@@ -62,6 +62,10 @@ public:
     bool isMatrix;
     int matrixCols;
     int matrixRows;
+
+protected:
+    TConstTraverser(TConstTraverser&);
+    TConstTraverser& operator=(TConstTraverser&);
 };
 
 bool TConstTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node)
@@ -82,7 +86,7 @@ bool TConstTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node)
     if (flag) {
         singleConstantParam = true; 
         constructorType = node->getOp();
-        size = node->getType().getObjectSize();
+        size = node->getType().computeNumComponents();
 
         if (node->getType().isMatrix()) {
             isMatrix = true;
@@ -115,13 +119,13 @@ bool TConstTraverser::visitAggregate(TVisit /* visit */, TIntermAggregate* node)
 void TConstTraverser::visitConstantUnion(TIntermConstantUnion* node)
 {
     TConstUnionArray leftUnionArray(unionArray);
-    int instanceSize = type.getObjectSize();
+    int instanceSize = type.computeNumComponents();
 
     if (index >= instanceSize)
         return;
 
     if (! singleConstantParam) {
-        int rightUnionSize = node->getType().getObjectSize();
+        int rightUnionSize = node->getType().computeNumComponents();
     
         const TConstUnionArray& rightUnionArray = node->getConstArray();
         for (int i = 0; i < rightUnionSize; i++) {
@@ -136,6 +140,7 @@ void TConstTraverser::visitConstantUnion(TIntermConstantUnion* node)
         const TConstUnionArray& rightUnionArray = node->getConstArray();
         if (! isMatrix) {
             int count = 0;
+            int nodeComps = node->getType().computeNumComponents();
             for (int i = index; i < endIndex; i++) {
                 if (i >= instanceSize)
                     return;
@@ -144,7 +149,7 @@ void TConstTraverser::visitConstantUnion(TIntermConstantUnion* node)
 
                 (index)++;
                 
-                if (node->getType().getObjectSize() > 1)
+                if (nodeComps > 1)
                     count++;
             }
         } else {
@@ -169,6 +174,7 @@ void TConstTraverser::visitConstantUnion(TIntermConstantUnion* node)
                 // matrix from vector
                 int count = 0;
                 const int startIndex = index;
+                int nodeComps = node->getType().computeNumComponents();
                 for (int i = startIndex; i < endIndex; i++) {
                     if (i >= instanceSize)
                         return;
@@ -179,7 +185,7 @@ void TConstTraverser::visitConstantUnion(TIntermConstantUnion* node)
 
                     index++;
 
-                    if (node->getType().getObjectSize() > 1)
+                    if (nodeComps > 1)
                         count++;                
                 }
             }