Fix a bug in long variable name mapping.

Originally we only match varying variables in vertex/fragment shaders. However, we should also match uniform names. For example, if a uniform variable name is used in both vertex and fragment shader, and after mapping the names are different, then the name mapping table is no longer 1:1. BUG=106638 (crbug) TEST=http://seanseefried.com/chrome-bug/simple-broken.html shows a magenta square Review URL: http://codereview.appspot.com/5520051 git-svn-id: https://angleproject.googlecode.com/svn/trunk@939 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix a bug in long variable name mapping.
89c9813b · zmo@google.com · 9a4d112c · 89c9813b · 89c9813b
Commit 89c9813b authored Jan 06, 2012 by zmo@google.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

version.h src/common/version.h +1 -1

MapLongVariableNames.cpp src/compiler/MapLongVariableNames.cpp +2 -1

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 938
+#define BUILD_REVISION 939

 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/compiler/MapLongVariableNames.cpp
+++ b/src/compiler/MapLongVariableNames.cpp
 //
-// Copyright (c) 2002-2011 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -37,6 +37,7 @@ void MapLongVariableNames::visitSymbol(TIntermSymbol* symbol)
          case EvqVaryingOut:
          case EvqInvariantVaryingIn:
          case EvqInvariantVaryingOut:
+          case EvqUniform:
            symbol->setSymbol(
                mapVaryingLongName(symbol->getSymbol()));
            break;