builtins: Add ftransform().

Fixes glsl-orangebook-ch06-bump.vert.

diff --git a/builtin_function.cpp b/builtin_function.cpp
index b7719ab..4203502 100644 (file)
--- a/builtin_function.cpp
+++ b/builtin_function.cpp
@@ -1778,6 +1778,22 @@ static const char *functions_for_110 [] = {
    builtins_110_tan,
 };
 
+/* Version 110_vs builtins */
+
+static const char *builtins_110_vs_ftransform = {
+   "((function ftransform\n"
+   "   (signature vec4\n"
+   "     (parameters)\n"
+   "    ((return (expression vec4 *\n"
+   "         (var_ref gl_ModelViewProjectionMatrix)\n"
+   "         (var_ref gl_Vertex)))))\n"
+   "))\n"
+};
+
+static const char *functions_for_110_vs [] = {
+   builtins_110_vs_ftransform,
+};
+
 /* Version 130 builtins */
 
 static const char *builtins_130_equal = {
@@ -2039,6 +2055,10 @@ _mesa_glsl_initialize_functions(exec_list *instructions,
       read_builtins(state, instructions, functions_for_110,
                     sizeof(functions_for_110) / sizeof(const char *));
 
+   if (state->language_version >= 110 && state->target == vertex_shader)
+      read_builtins(state, instructions, functions_for_110_vs,
+                    sizeof(functions_for_110_vs) / sizeof(const char *));
+
    if (state->language_version >= 130)
       read_builtins(state, instructions, functions_for_130,
                     sizeof(functions_for_130) / sizeof(const char *));

diff --git a/builtins/110_vs/ftransform b/builtins/110_vs/ftransform
new file mode 100644 (file)
index 0000000..3a5e8cc
--- /dev/null
+++ b/builtins/110_vs/ftransform
@@ -0,0 +1,7 @@
+((function ftransform
+   (signature vec4
+     (parameters)
+    ((return (expression vec4 *
+             (var_ref gl_ModelViewProjectionMatrix)
+             (var_ref gl_Vertex)))))
+))

diff --git a/builtins/tools/generate_builtins.pl b/builtins/tools/generate_builtins.pl
index e7ec8ef..9ce0ce3 100755 (executable)
--- a/builtins/tools/generate_builtins.pl
+++ b/builtins/tools/generate_builtins.pl
@@ -85,7 +85,7 @@ read_builtins(_mesa_glsl_parse_state *st, exec_list *instructions,
 
 EOF
 
-@versions = sort(<builtins/[1-9][0-9][0-9]>);
+@versions = sort(<builtins/[1-9][0-9][0-9]*>);
 foreach $version (@versions) {
    $version =~ s!builtins/!!g;
    process_version($version);
@@ -99,7 +99,14 @@ _mesa_glsl_initialize_functions(exec_list *instructions,
 EOF
 
 foreach $version (@versions) {
-   print "   if (state->language_version >= $version)\n";
+    $version_number = $version;
+   if ($version =~ m/_vs/) {
+       $version_check = " && state->target == vertex_shader";
+       $version_number =~ s/_vs//;
+   } else {
+       $version_check = "";
+   }
+   print "   if (state->language_version >= $version_number$version_check)\n";
    print "      read_builtins(state, instructions, functions_for_$version,\n";
    print "                    sizeof(functions_for_$version) / ";
    print "sizeof(const char *));\n\n"