Use new symbol table initization for vertex shader.

src/compiler/Compiler.cpp

@@ -69,7 +69,20 @@ bool InitializeSymbolTable(
         }
     }
 
-    InsertBuiltInFunctionsCommon(resources, &symbolTable);
+
+    switch (type) {
+    case SH_FRAGMENT_SHADER:
+        InsertBuiltInFunctionsCommon(resources, &symbolTable);
+        break;
+
+    case SH_VERTEX_SHADER:
+        InsertBuiltInFunctionsCommon(resources, &symbolTable);
+        InsertBuiltInFunctionsVertex(resources, &symbolTable);
+        break;
+
+    default: assert(false && "Language not supported");
+    }
+
     IdentifyBuiltIns(type, spec, resources, symbolTable);
 
     return true;

src/compiler/Initialize.cpp

@@ -16,31 +16,6 @@
 
 //============================================================================
 //
-// Prototypes for built-in functions seen by vertex shaders only.
-//
-//============================================================================
-static TString BuiltInFunctionsVertex(const ShBuiltInResources& resources)
-{
-    TString s;
-
-    //
-    // Geometric Functions.
-    //
-    //s.append(TString("vec4 ftransform();"));
-
-    //
-    // Texture Functions.
-    //
-    s.append(TString("vec4 texture2DLod(sampler2D sampler, vec2 coord, float lod);"));
-    s.append(TString("vec4 texture2DProjLod(sampler2D sampler, vec3 coord, float lod);"));
-    s.append(TString("vec4 texture2DProjLod(sampler2D sampler, vec4 coord, float lod);"));
-    s.append(TString("vec4 textureCubeLod(samplerCube sampler, vec3 coord, float lod);"));
-
-    return s;
-}
-
-//============================================================================
-//
 // Prototypes for built-in functions seen by fragment shaders only.
 //
 //============================================================================
@@ -164,7 +139,6 @@ void TBuiltIns::initialize(ShShaderType type, ShShaderSpec spec,
 
     case SH_VERTEX_SHADER:
         builtInStrings.push_back(DefaultPrecisionVertex());
-        builtInStrings.push_back(BuiltInFunctionsVertex(resources));
         builtInStrings.push_back(StandardUniforms());
         break;
 

src/compiler/builtin_symbol_table.cpp

@@ -16,6 +16,7 @@ static void builtin1(TSymbolTable* t, TType* rvalue, const char* name, TType* pt
   f->addParameter(param);
   t->insert(*f);
 }
+
 static void builtin2(TSymbolTable* t, TType* rvalue, const char* name, TType* ptype1, const char* pname1, TType* ptype2, const char* pname2)
 {
   TFunction* f = new TFunction(new TString(name), *rvalue);
@@ -37,7 +38,8 @@ static void builtin3(TSymbolTable* t, TType* rvalue, const char* name, TType* pt
   f->addParameter(param3);
   t->insert(*f);
 }
-void InsertBuiltInFunctionsCommon(const ShBuiltInResources& resources, TSymbolTable * t) {
+
+void InsertBuiltInFunctionsCommon(const ShBuiltInResources& resources, TSymbolTable* t) {
     builtin1(t, new TType(EbtFloat, EbpUndefined, EvqGlobal, 1, false, false), "radians", new TType(EbtFloat, EbpUndefined, EvqGlobal, 1, false, false), "degrees");
     builtin1(t, new TType(EbtFloat, EbpUndefined, EvqGlobal, 2, false, false), "radians", new TType(EbtFloat, EbpUndefined, EvqGlobal, 2, false, false), "degrees");
     builtin1(t, new TType(EbtFloat, EbpUndefined, EvqGlobal, 3, false, false), "radians", new TType(EbtFloat, EbpUndefined, EvqGlobal, 3, false, false), "degrees");
@@ -277,3 +279,11 @@ void InsertBuiltInFunctionsCommon(const ShBuiltInResources& resources, TSymbolTa
         builtin2(t, new TType(EbtFloat, EbpUndefined, EvqGlobal, 4, false, false), "texture2DRectProj", new TType(EbtSampler2DRect, EbpUndefined, EvqGlobal, 1, false, false), "sampler", new TType(EbtFloat, EbpUndefined, EvqGlobal, 4, false, false), "coord");
     }
 }
+
+void InsertBuiltInFunctionsVertex(const ShBuiltInResources& resources, TSymbolTable* t) {
+    builtin3(t, new TType(EbtFloat, EbpUndefined, EvqGlobal, 4, false, false), "texture2DLod", new TType(EbtSampler2D, EbpUndefined, EvqGlobal, 1, false, false), "sampler", new TType(EbtFloat, EbpUndefined, EvqGlobal, 2, false, false), "coord", new TType(EbtFloat, EbpUndefined, EvqGlobal, 1, false, false), "lod");
+    builtin3(t, new TType(EbtFloat, EbpUndefined, EvqGlobal, 4, false, false), "texture2DProjLod", new TType(EbtSampler2D, EbpUndefined, EvqGlobal, 1, false, false), "sampler", new TType(EbtFloat, EbpUndefined, EvqGlobal, 3, false, false), "coord", new TType(EbtFloat, EbpUndefined, EvqGlobal, 1, false, false), "lod");
+    builtin3(t, new TType(EbtFloat, EbpUndefined, EvqGlobal, 4, false, false), "texture2DProjLod", new TType(EbtSampler2D, EbpUndefined, EvqGlobal, 1, false, false), "sampler", new TType(EbtFloat, EbpUndefined, EvqGlobal, 4, false, false), "coord", new TType(EbtFloat, EbpUndefined, EvqGlobal, 1, false, false), "lod");
+    builtin3(t, new TType(EbtFloat, EbpUndefined, EvqGlobal, 4, false, false), "textureCubeLod", new TType(EbtSamplerCube, EbpUndefined, EvqGlobal, 1, false, false), "sampler", new TType(EbtFloat, EbpUndefined, EvqGlobal, 3, false, false), "coord", new TType(EbtFloat, EbpUndefined, EvqGlobal, 1, false, false), "lod");
+}
+

src/compiler/builtin_symbol_table.h

@@ -10,6 +10,7 @@
 
 class TSymbolTable;
 
-extern void InsertBuiltInFunctionsCommon(const ShBuiltInResources& resources, TSymbolTable * t);
+extern void InsertBuiltInFunctionsCommon(const ShBuiltInResources& resources, TSymbolTable* t);
+extern void InsertBuiltInFunctionsVertex(const ShBuiltInResources& resources, TSymbolTable* t);
 
 #endif // _BUILTIN_SYMBOL_TABLE_INCLUDED_

src/compiler/generate_builtin_symbol_table.py

@@ -38,6 +38,7 @@ static void builtin1(TSymbolTable* t, TType* rvalue, const char* name, TType* pt
   f->addParameter(param);
   t->insert(*f);
 }
+
 static void builtin2(TSymbolTable* t, TType* rvalue, const char* name, TType* ptype1, const char* pname1, TType* ptype2, const char* pname2)
 {
   TFunction* f = new TFunction(new TString(name), *rvalue);
@@ -59,33 +60,42 @@ static void builtin3(TSymbolTable* t, TType* rvalue, const char* name, TType* pt
   f->addParameter(param3);
   t->insert(*f);
 }
+
 """
 output.write(registerfunc)
 
-commonHeader = "void InsertBuiltInFunctionsCommon(const ShBuiltInResources& resources, TSymbolTable * t) {\n"
+# A function that parses the JSON representation of a list of builtin functions.
+def parseBuiltin(name):
+    for func in builtin[name]:
+        out = ""
+        indent = "    ";
+        size = len(func['parameter'])
+        if 'condition' in func:
+            out += indent + "if (" + func['condition'] + ") {\n"
+            indent += indent;
+        out += indent + "builtin" + str(size) + "(t, "
+        out += ttypeMap[func['return_type']]
+        out += ", \"" + func['name'] + "\""
+        paramlist = func['parameter']
+        paramdef = "";
+        for param in paramlist:
+            paramdef += ", "
+            paramdef += ttypeMap[param['type']] 
+            paramdef += ", \"" + param['name'] + "\""
+        out += paramdef + ");\n"
+        if 'condition' in func:
+            out += "    }\n"
+        output.write(out)
+
+commonHeader = "void InsertBuiltInFunctionsCommon(const ShBuiltInResources& resources, TSymbolTable* t) {\n"
 output.write(commonHeader)
+parseBuiltin("common")
+output.write("}\n\n")
 
-for func in builtin["common"]:
-	out = ""
-	indent = "    ";
-	size = len(func['parameter'])
-	if 'condition' in func:
-		out += indent + "if (" + func['condition'] + ") {\n"
-		indent += indent;
-	out += indent + "builtin" + str(size) + "(t, "
-	out += ttypeMap[func['return_type']]
-	out += ", \"" + func['name'] + "\""
-	paramlist = func['parameter']
-	paramdef = "";
-	for param in paramlist:
-		paramdef += ", "
-		paramdef += ttypeMap[param['type']] 
-		paramdef += ", \"" + param['name'] + "\""
-	out += paramdef + ");\n"
-	if 'condition' in func:
-		out += "    }\n"
-	output.write(out)
-output.write("}\n")
+vertexHeader = "void InsertBuiltInFunctionsVertex(const ShBuiltInResources& resources, TSymbolTable* t) {\n"
+output.write(vertexHeader)
+parseBuiltin("vertex")
+output.write("}\n\n")
 
 json_data.close()
 output.close()