Move some output out of BuiltInFunctionEmulator subclasses

src/compiler/translator/BuiltInFunctionEmulator.h

@@ -26,15 +26,15 @@ class BuiltInFunctionEmulator
     // "name(" becomes "webgl_name_emu(".
     static TString GetEmulatedFunctionName(const TString& name);
 
-  protected:
-    BuiltInFunctionEmulator();
-
     bool IsOutputEmpty() const;
 
     // Output function emulation definition. This should be before any other
     // shader source.
     void OutputEmulatedFunctions(TInfoSinkBase& out) const;
 
+  protected:
+    BuiltInFunctionEmulator();
+
     // Add functions that need to be emulated.
     void AddEmulatedFunction(TOperator op, const TType& param, const char* emulatedFunctionDefinition);
     void AddEmulatedFunction(TOperator op, const TType& param1, const TType& param2, const char* emulatedFunctionDefinition);

src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp

@@ -37,23 +37,3 @@ BuiltInFunctionEmulatorGLSL::BuiltInFunctionEmulatorGLSL(sh::GLenum shaderType)
     AddEmulatedFunction(EOpReflect, float1, float1, "#define webgl_reflect_emu(I, N) ((I) - 2.0 * (N) * (I) * (N))");
 #endif
 }
-
-void BuiltInFunctionEmulatorGLSL::OutputEmulatedFunctionDefinition(
-    TInfoSinkBase& out, bool withPrecision) const
-{
-    if (IsOutputEmpty())
-        return;
-
-    out << "// BEGIN: Generated code for built-in function emulation\n\n";
-    if (withPrecision) {
-        out << "#if defined(GL_FRAGMENT_PRECISION_HIGH)\n"
-            << "#define webgl_emu_precision highp\n"
-            << "#else\n"
-            << "#define webgl_emu_precision mediump\n"
-            << "#endif\n\n";
-    } else {
-        out << "#define webgl_emu_precision\n\n";
-    }
-    OutputEmulatedFunctions(out);
-    out << "// END: Generated code for built-in function emulation\n\n";
-}

src/compiler/translator/BuiltInFunctionEmulatorGLSL.h

@@ -16,8 +16,6 @@ class BuiltInFunctionEmulatorGLSL : public BuiltInFunctionEmulator
 {
   public:
     BuiltInFunctionEmulatorGLSL(sh::GLenum shaderType);
-
-    void OutputEmulatedFunctionDefinition(TInfoSinkBase& out, bool withPrecision) const;
 };
 
 #endif  // COMPILER_TRANSLATOR_BUILTINFUNCTIONEMULATORGLSL_H_

src/compiler/translator/BuiltInFunctionEmulatorHLSL.cpp

@@ -408,9 +408,3 @@ BuiltInFunctionEmulatorHLSL::BuiltInFunctionEmulatorHLSL()
         "    return cof / determinant(transpose(m));\n"
         "}\n");
 }
-
-void BuiltInFunctionEmulatorHLSL::OutputEmulatedFunctionDefinition(
-    TInfoSinkBase& out) const
-{
-    OutputEmulatedFunctions(out);
-}

src/compiler/translator/BuiltInFunctionEmulatorHLSL.h

@@ -16,8 +16,6 @@ class BuiltInFunctionEmulatorHLSL : public BuiltInFunctionEmulator
 {
   public:
     BuiltInFunctionEmulatorHLSL();
-
-    void OutputEmulatedFunctionDefinition(TInfoSinkBase& out) const;
 };
 
 #endif  // COMPILER_TRANSLATOR_BUILTINFUNCTIONEMULATORHLSL_H_

src/compiler/translator/OutputHLSL.cpp

@@ -1266,7 +1266,7 @@ void OutputHLSL::header(const BuiltInFunctionEmulatorHLSL *builtInFunctionEmulat
                "\n";
     }
 
-    builtInFunctionEmulator->OutputEmulatedFunctionDefinition(out);
+    builtInFunctionEmulator->OutputEmulatedFunctions(out);
 }
 
 void OutputHLSL::visitSymbol(TIntermSymbol *node)

src/compiler/translator/TranslatorESSL.cpp

@@ -34,8 +34,25 @@ void TranslatorESSL::translate(TIntermNode *root, int) {
     }
 
     // Write emulated built-in functions if needed.
-    getBuiltInFunctionEmulator().OutputEmulatedFunctionDefinition(
-        sink, getShaderType() == GL_FRAGMENT_SHADER);
+    if (!getBuiltInFunctionEmulator().IsOutputEmpty())
+    {
+        sink << "// BEGIN: Generated code for built-in function emulation\n\n";
+        if (getShaderType() == GL_FRAGMENT_SHADER)
+        {
+            sink << "#if defined(GL_FRAGMENT_PRECISION_HIGH)\n"
+                 << "#define webgl_emu_precision highp\n"
+                 << "#else\n"
+                 << "#define webgl_emu_precision mediump\n"
+                 << "#endif\n\n";
+        }
+        else
+        {
+            sink << "#define webgl_emu_precision highp\n";
+        }
+
+        getBuiltInFunctionEmulator().OutputEmulatedFunctions(sink);
+        sink << "// END: Generated code for built-in function emulation\n\n";
+    }
 
     // Write array bounds clamping emulation if needed.
     getArrayBoundsClamper().OutputClampingFunctionDefinition(sink);

src/compiler/translator/TranslatorGLSL.cpp

@@ -83,8 +83,13 @@ void TranslatorGLSL::translate(TIntermNode *root, int) {
     }
 
     // Write emulated built-in functions if needed.
-    getBuiltInFunctionEmulator().OutputEmulatedFunctionDefinition(
-        sink, false);
+    if (!getBuiltInFunctionEmulator().IsOutputEmpty())
+    {
+        sink << "// BEGIN: Generated code for built-in function emulation\n\n";
+        sink << "#define webgl_emu_precision\n\n";
+        getBuiltInFunctionEmulator().OutputEmulatedFunctions(sink);
+        sink << "// END: Generated code for built-in function emulation\n\n";
+    }
 
     // Write array bounds clamping emulation if needed.
     getArrayBoundsClamper().OutputClampingFunctionDefinition(sink);