Backed out changeset 286171389d12 (bug 1264214) for unexpected passes in test_conformance__glsl__misc__shaders-with-name-conflicts. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 27 Apr 2016 18:59:01 +0200
changeset 334170 673b6e68925ebca7689072ed42587380ceef6149
parent 334169 a4a7d5ed6da1bfed15153f1ae975c633c975d72d
child 334171 121b581f0e4e83513fac1462f7b4a0a6fb16a03e
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1264214
milestone49.0a1
backs out286171389d121ded03eb541974c58035836b96ad
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 286171389d12 (bug 1264214) for unexpected passes in test_conformance__glsl__misc__shaders-with-name-conflicts. r=backout
dom/canvas/WebGLProgram.cpp
--- a/dom/canvas/WebGLProgram.cpp
+++ b/dom/canvas/WebGLProgram.cpp
@@ -950,29 +950,17 @@ WebGLProgram::LinkProgram()
         // This can't be done trivially, because we have to deal with mapped names too.
         mVertShader->ApplyTransformFeedbackVaryings(mGLName,
                                                     mTransformFeedbackVaryings,
                                                     mTransformFeedbackBufferMode,
                                                     &mTempMappedVaryings);
     }
 
     LinkAndUpdate();
-    if (IsLinked()) {
-        // Check if the attrib name conflicting to uniform name
-        for (const auto& uniform : mMostRecentLinkInfo->uniformMap) {
-            if (mMostRecentLinkInfo->attribMap.find(uniform.first) != mMostRecentLinkInfo->attribMap.end()) {
-                mLinkLog = nsPrintfCString("The uniform name (%s) conflicts with attribute name.",
-                                           uniform.first.get());
-                mMostRecentLinkInfo = nullptr;
-                break;
-            }
-        }
-    }
-
-    if (mMostRecentLinkInfo)
+    if (IsLinked())
         return;
 
     // Failed link.
     if (mContext->ShouldGenerateWarnings()) {
         // report shader/program infoLogs as warnings.
         // note that shader compilation errors can be deferred to linkProgram,
         // which is why we can't do anything in compileShader. In practice we could
         // report in compileShader the translation errors generated by ANGLE,