commit 73941deb4f417fb7f21353951c5a3b32a8a4a2bf
author Daniel Bratell <bratell@opera.com> Wed Feb 25 14:34:49 2015 +0100
committer Jamie Madill <jmadill@chromium.org> Wed Feb 25 16:27:01 2015 +0000
tree 331f9474dadf4bb5cd42677ae5cb8708bc6bde7a
parent 53f076fac824fa8e09ebc0cedcd7484bdc511cb7

Disable the HLSL code in Angle if it is not being used.

We're only using the HLSL code in Windows so
it's not necessary to compile and distribute it on other platforms.

This adds a defined ANGLE_ENABLE_HLSL that can be checked in files that
are used by non-HLSL code as well. Mostly the HLSL code is just not
include by the build system.

Details of the space savings (heavily truncated)

Total change: -165717 bytes
===========================
 -606 - Source: angle/src/common/utilities.cpp
 -627 - Source: angle/src/compiler/translator/FlagStd140Structs.cpp
 -695 - Source: /usr/include/c++/4.8/bits/stl_algo.h
 -710 - Source: angle/src/compiler/translator/TranslatorHLSL.cpp
 -713 - Source: angle/src/compiler/translator/IntermNode.h
 -863 - Source: /usr/include/c++/4.8/bits/stl_map.h
 -935 - Source: angle/src/compiler/translator/blocklayout.cpp
 -1515 - Source: angle/src/compiler/translator/BuiltInFunctionEmulator.cpp
 -1655 - Source: angle/src/compiler/translator/UnfoldShortCircuit.cpp
 -2375 - Source: /usr/include/c++/4.8/bits/vector.tcc
 -3135 - Source: angle/src/compiler/translator/RewriteElseBlocks.cpp
 -4656 - Source: angle/src/compiler/translator/UtilsHLSL.cpp
 -5265 - Source: angle/src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp
 -6505 - Source: /usr/include/c++/4.8/bits/stl_tree.h
 -11480 - Source: angle/src/compiler/translator/UniformHLSL.cpp
 -13580 - Source: angle/src/compiler/translator/StructureHLSL.cpp
 -18964 - Source: ??
    (constant strings and a few vtbls)
 -89332 - Source: angle/src/compiler/translator/OutputHLSL.cpp

Change-Id: I23ccc98abd0a21f847dd34f9482800b3ba679d56
Reviewed-on: https://chromium-review.googlesource.com/251528
Tested-by: bratell at Opera <bratell@opera.com>
Reviewed-by: 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 03a9aef..b8040da 100644
--- a/src/compiler/translator/ShaderLang.cpp
+++ b/src/compiler/translator/ShaderLang.cpp
@@ -14,7 +14,9 @@
 #include "compiler/translator/Compiler.h"
 #include "compiler/translator/InitializeDll.h"
 #include "compiler/translator/length_limits.h"
+#ifdef ANGLE_ENABLE_HLSL
 #include "compiler/translator/TranslatorHLSL.h"
+#endif // ANGLE_ENABLE_HLSL
 #include "compiler/translator/VariablePacker.h"
 #include "angle_gl.h"
 
@@ -92,6 +94,7 @@
     return base->getAsCompiler();
 }
 
+#ifdef ANGLE_ENABLE_HLSL
 TranslatorHLSL *GetTranslatorHLSLFromHandle(ShHandle handle)
 {
     if (!handle)
@@ -99,6 +102,7 @@
     TShHandleBase *base = static_cast<TShHandleBase *>(handle);
     return base->getAsTranslatorHLSL();
 }
+#endif // ANGLE_ENABLE_HLSL
 
 }  // namespace anonymous
 
@@ -327,6 +331,7 @@
                                  const std::string &interfaceBlockName,
                                  unsigned int *indexOut)
 {
+#ifdef ANGLE_ENABLE_HLSL
     ASSERT(indexOut);
 
     TranslatorHLSL *translator = GetTranslatorHLSLFromHandle(handle);
@@ -339,12 +344,16 @@
 
     *indexOut = translator->getInterfaceBlockRegister(interfaceBlockName);
     return true;
+#else
+    return false;
+#endif // ANGLE_ENABLE_HLSL
 }
 
 bool ShGetUniformRegister(const ShHandle handle,
                           const std::string &uniformName,
                           unsigned int *indexOut)
 {
+#ifdef ANGLE_ENABLE_HLSL
     ASSERT(indexOut);
     TranslatorHLSL *translator = GetTranslatorHLSLFromHandle(handle);
     ASSERT(translator);
@@ -356,4 +365,7 @@
 
     *indexOut = translator->getUniformRegister(uniformName);
     return true;
+#else
+    return false;
+#endif // ANGLE_ENABLE_HLSL
 }