commit cebb5aa092f92e1f727fe5e4300dbd83abd49afb
author Geoff Lang <geofflang@chromium.org> Mon Apr 07 14:13:40 2014 -0400
committer Geoff Lang <geofflang@chromium.org> Fri Apr 11 19:20:18 2014 +0000
tree deae17af43cba68713e2d93634509b05fe414652
parent 662b8481b2eecd36a46d27ceae48ff95f7ca159c

Fix warnings about unreferenced local variables.

BUG=angleproject:602

Change-Id: I2eb04fe6eed60b3877b14628e81c0b1fe3b68647
Reviewed-on: https://chromium-review.googlesource.com/193431
Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

src/compiler/translator/BlockLayoutEncoder.cpp

diff --git a/src/compiler/translator/BlockLayoutEncoder.cpp b/src/compiler/translator/BlockLayoutEncoder.cpp
index b8d14e2..ef94d9b 100644
--- a/src/compiler/translator/BlockLayoutEncoder.cpp
+++ b/src/compiler/translator/BlockLayoutEncoder.cpp
@@ -102,7 +102,6 @@
     // We assume we are only dealing with 4 byte components (no doubles or half-words currently)
     ASSERT(gl::UniformComponentSize(gl::UniformComponentType(type)) == BytesPerComponent);
 
-    int numComponents = gl::UniformComponentCount(type);
     size_t baseAlignment = 0;
     int matrixStride = 0;
     int arrayStride = 0;

src/compiler/translator/OutputHLSL.cpp

diff --git a/src/compiler/translator/OutputHLSL.cpp b/src/compiler/translator/OutputHLSL.cpp
index d3d064b..5520367 100644
--- a/src/compiler/translator/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
@@ -3534,10 +3534,7 @@
                                      structureString(*structure, true, false) +
                                      "#pragma pack_matrix(column_major)\n";
 
-            const TString &std140Prefix = "std";
             TString std140String = structureString(*structure, false, true);
-
-            const TString &std140RowMajorPrefix = "std_rm";
             TString std140RowMajorString = "#pragma pack_matrix(row_major)\n" +
                                            structureString(*structure, true, true) +
                                            "#pragma pack_matrix(column_major)\n";
@@ -3889,7 +3886,6 @@
 
     if (!structure)
     {
-        const bool isRowMajorMatrix = (type.isMatrix() && type.getLayoutQualifier().matrixPacking == EmpRowMajor);
         Uniform uniform(glVariableType(type), glVariablePrecision(type), name.c_str(),
                         (unsigned int)type.getArraySize(), (unsigned int)registerIndex, 0);
         output.push_back(uniform);

src/compiler/translator/ShaderLang.cpp

diff --git a/src/compiler/translator/ShaderLang.cpp b/src/compiler/translator/ShaderLang.cpp
index 5675f26..fe215b7 100644
--- a/src/compiler/translator/ShaderLang.cpp
+++ b/src/compiler/translator/ShaderLang.cpp
@@ -215,6 +215,7 @@
             // 64 bits hashing output requires 16 bytes for hex 
             // representation.
             const char HashedNamePrefix[] = HASHED_NAME_PREFIX;
+            (void)HashedNamePrefix;
             *params = 16 + sizeof(HashedNamePrefix);
         }
         break;