commit 08e229e79bb201820600b9a4dd9d77e68b4090cd
author Jamie Madill <jmadill@chromium.org> Wed Oct 05 17:16:13 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Oct 07 17:45:24 2016 +0000
tree 5ec7b3025a5d79a6202053be41811fa39b013495
parent 76648fe2c8642c16ecade893757eca458f40ab40

translator: Return null uniform map if no HLSL.

This replaces the global empty map.

BUG=angleproject:1459

Change-Id: If7d824cbf4492e722cbf99d1045402a26535af5c
Reviewed-on: https://chromium-review.googlesource.com/394236
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/ShaderLang.cpp

diff --git a/src/compiler/translator/ShaderLang.cpp b/src/compiler/translator/ShaderLang.cpp
index b6db0f0..37b1114 100644
--- a/src/compiler/translator/ShaderLang.cpp
+++ b/src/compiler/translator/ShaderLang.cpp
@@ -405,7 +405,6 @@
 
     return translator->getUniformRegisterMap();
 #else
-    static std::map<std::string, unsigned int> map;
-    return &map;
+    return nullptr;
 #endif  // ANGLE_ENABLE_HLSL
 }