66 files changed, 9 insertions, 3 deletions
diff --git a/src/glsl/builtins/ir/abs b/src/glsl/builtins/ir/abs.ir
index d07d1d99e9f..d07d1d99e9f 100644
--- a/src/glsl/builtins/ir/abs
+++ b/src/glsl/builtins/ir/abs.ir
diff --git a/src/glsl/builtins/ir/acos b/src/glsl/builtins/ir/acos.ir
index d1cfebeff8a..d1cfebeff8a 100644
--- a/src/glsl/builtins/ir/acos
+++ b/src/glsl/builtins/ir/acos.ir
diff --git a/src/glsl/builtins/ir/acosh b/src/glsl/builtins/ir/acosh.ir
index 9a4c291ad5b..9a4c291ad5b 100644
--- a/src/glsl/builtins/ir/acosh
+++ b/src/glsl/builtins/ir/acosh.ir
diff --git a/src/glsl/builtins/ir/all b/src/glsl/builtins/ir/all.ir
index 2cac0dfb684..2cac0dfb684 100644
--- a/src/glsl/builtins/ir/all
+++ b/src/glsl/builtins/ir/all.ir
diff --git a/src/glsl/builtins/ir/any b/src/glsl/builtins/ir/any.ir
index cc6038a3156..cc6038a3156 100644
--- a/src/glsl/builtins/ir/any
+++ b/src/glsl/builtins/ir/any.ir
diff --git a/src/glsl/builtins/ir/asin b/src/glsl/builtins/ir/asin.ir
index 45d9e672958..45d9e672958 100644
--- a/src/glsl/builtins/ir/asin
+++ b/src/glsl/builtins/ir/asin.ir
diff --git a/src/glsl/builtins/ir/asinh b/src/glsl/builtins/ir/asinh.ir
index d2dc7102cc3..d2dc7102cc3 100644
--- a/src/glsl/builtins/ir/asinh
+++ b/src/glsl/builtins/ir/asinh.ir
diff --git a/src/glsl/builtins/ir/atan b/src/glsl/builtins/ir/atan.ir
index 7b5ea13c6ba..7b5ea13c6ba 100644
--- a/src/glsl/builtins/ir/atan
+++ b/src/glsl/builtins/ir/atan.ir
diff --git a/src/glsl/builtins/ir/atanh b/src/glsl/builtins/ir/atanh.ir
index 5ef3596f052..5ef3596f052 100644
--- a/src/glsl/builtins/ir/atanh
+++ b/src/glsl/builtins/ir/atanh.ir
diff --git a/src/glsl/builtins/ir/ceil b/src/glsl/builtins/ir/ceil.ir
index a26a7750493..a26a7750493 100644
--- a/src/glsl/builtins/ir/ceil
+++ b/src/glsl/builtins/ir/ceil.ir
diff --git a/src/glsl/builtins/ir/clamp b/src/glsl/builtins/ir/clamp.ir
index 2bdc466b269..2bdc466b269 100644
--- a/src/glsl/builtins/ir/clamp
+++ b/src/glsl/builtins/ir/clamp.ir
diff --git a/src/glsl/builtins/ir/cos b/src/glsl/builtins/ir/cos.ir
index 88f266eccbe..88f266eccbe 100644
--- a/src/glsl/builtins/ir/cos
+++ b/src/glsl/builtins/ir/cos.ir
diff --git a/src/glsl/builtins/ir/cosh b/src/glsl/builtins/ir/cosh.ir
index 945743138fc..945743138fc 100644
--- a/src/glsl/builtins/ir/cosh
+++ b/src/glsl/builtins/ir/cosh.ir
diff --git a/src/glsl/builtins/ir/cross b/src/glsl/builtins/ir/cross.ir
index 02991fe4227..02991fe4227 100644
--- a/src/glsl/builtins/ir/cross
+++ b/src/glsl/builtins/ir/cross.ir
diff --git a/src/glsl/builtins/ir/dFdx b/src/glsl/builtins/ir/dFdx.ir
index 30594d33c74..30594d33c74 100644
--- a/src/glsl/builtins/ir/dFdx
+++ b/src/glsl/builtins/ir/dFdx.ir
diff --git a/src/glsl/builtins/ir/dFdy b/src/glsl/builtins/ir/dFdy.ir
index fb5798d3cbe..fb5798d3cbe 100644
--- a/src/glsl/builtins/ir/dFdy
+++ b/src/glsl/builtins/ir/dFdy.ir
diff --git a/src/glsl/builtins/ir/degrees b/src/glsl/builtins/ir/degrees.ir
index dc0d7b9e20d..dc0d7b9e20d 100644
--- a/src/glsl/builtins/ir/degrees
+++ b/src/glsl/builtins/ir/degrees.ir
diff --git a/src/glsl/builtins/ir/distance b/src/glsl/builtins/ir/distance.ir
index c249f8c9962..c249f8c9962 100644
--- a/src/glsl/builtins/ir/distance
+++ b/src/glsl/builtins/ir/distance.ir
diff --git a/src/glsl/builtins/ir/dot b/src/glsl/builtins/ir/dot.ir
index 1f27f323597..1f27f323597 100644
--- a/src/glsl/builtins/ir/dot
+++ b/src/glsl/builtins/ir/dot.ir
diff --git a/src/glsl/builtins/ir/equal b/src/glsl/builtins/ir/equal.ir
index a414b3e535f..a414b3e535f 100644
--- a/src/glsl/builtins/ir/equal
+++ b/src/glsl/builtins/ir/equal.ir
diff --git a/src/glsl/builtins/ir/exp b/src/glsl/builtins/ir/exp.ir
index a73bd6a7f84..a73bd6a7f84 100644
--- a/src/glsl/builtins/ir/exp
+++ b/src/glsl/builtins/ir/exp.ir
diff --git a/src/glsl/builtins/ir/exp2 b/src/glsl/builtins/ir/exp2.ir
index a842d3fe65b..a842d3fe65b 100644
--- a/src/glsl/builtins/ir/exp2
+++ b/src/glsl/builtins/ir/exp2.ir
diff --git a/src/glsl/builtins/ir/faceforward b/src/glsl/builtins/ir/faceforward.ir
index 35b79571c6b..35b79571c6b 100644
--- a/src/glsl/builtins/ir/faceforward
+++ b/src/glsl/builtins/ir/faceforward.ir
diff --git a/src/glsl/builtins/ir/floor b/src/glsl/builtins/ir/floor.ir
index 8dd8052799b..8dd8052799b 100644
--- a/src/glsl/builtins/ir/floor
+++ b/src/glsl/builtins/ir/floor.ir
diff --git a/src/glsl/builtins/ir/fract b/src/glsl/builtins/ir/fract.ir
index 3f0763d1b3e..3f0763d1b3e 100644
--- a/src/glsl/builtins/ir/fract
+++ b/src/glsl/builtins/ir/fract.ir
diff --git a/src/glsl/builtins/ir/ftransform b/src/glsl/builtins/ir/ftransform.ir
index 9ca63dc1e34..9ca63dc1e34 100644
--- a/src/glsl/builtins/ir/ftransform
+++ b/src/glsl/builtins/ir/ftransform.ir
diff --git a/src/glsl/builtins/ir/fwidth b/src/glsl/builtins/ir/fwidth.ir
index 385e05d6a1a..385e05d6a1a 100644
--- a/src/glsl/builtins/ir/fwidth
+++ b/src/glsl/builtins/ir/fwidth.ir
diff --git a/src/glsl/builtins/ir/greaterThan b/src/glsl/builtins/ir/greaterThan.ir
index 18af865288f..18af865288f 100644
--- a/src/glsl/builtins/ir/greaterThan
+++ b/src/glsl/builtins/ir/greaterThan.ir
diff --git a/src/glsl/builtins/ir/greaterThanEqual b/src/glsl/builtins/ir/greaterThanEqual.ir
index 6d3bc892cb7..6d3bc892cb7 100644
--- a/src/glsl/builtins/ir/greaterThanEqual
+++ b/src/glsl/builtins/ir/greaterThanEqual.ir
diff --git a/src/glsl/builtins/ir/inversesqrt b/src/glsl/builtins/ir/inversesqrt.ir
index 5b66d2b3695..5b66d2b3695 100644
--- a/src/glsl/builtins/ir/inversesqrt
+++ b/src/glsl/builtins/ir/inversesqrt.ir
diff --git a/src/glsl/builtins/ir/length b/src/glsl/builtins/ir/length.ir
index b72334ee8a2..b72334ee8a2 100644
--- a/src/glsl/builtins/ir/length
+++ b/src/glsl/builtins/ir/length.ir
diff --git a/src/glsl/builtins/ir/lessThan b/src/glsl/builtins/ir/lessThan.ir
index 8401fe9db60..8401fe9db60 100644
--- a/src/glsl/builtins/ir/lessThan
+++ b/src/glsl/builtins/ir/lessThan.ir
diff --git a/src/glsl/builtins/ir/lessThanEqual b/src/glsl/builtins/ir/lessThanEqual.ir
index c1cdd3fb605..c1cdd3fb605 100644
--- a/src/glsl/builtins/ir/lessThanEqual
+++ b/src/glsl/builtins/ir/lessThanEqual.ir
diff --git a/src/glsl/builtins/ir/log b/src/glsl/builtins/ir/log.ir
index d168abb5a73..d168abb5a73 100644
--- a/src/glsl/builtins/ir/log
+++ b/src/glsl/builtins/ir/log.ir
diff --git a/src/glsl/builtins/ir/log2 b/src/glsl/builtins/ir/log2.ir
index b96c6276f0a..b96c6276f0a 100644
--- a/src/glsl/builtins/ir/log2
+++ b/src/glsl/builtins/ir/log2.ir
diff --git a/src/glsl/builtins/ir/matrixCompMult b/src/glsl/builtins/ir/matrixCompMult.ir
index 2400f11afad..2400f11afad 100644
--- a/src/glsl/builtins/ir/matrixCompMult
+++ b/src/glsl/builtins/ir/matrixCompMult.ir
diff --git a/src/glsl/builtins/ir/max b/src/glsl/builtins/ir/max.ir
index 2b5a02868cc..2b5a02868cc 100644
--- a/src/glsl/builtins/ir/max
+++ b/src/glsl/builtins/ir/max.ir
diff --git a/src/glsl/builtins/ir/min b/src/glsl/builtins/ir/min.ir
index 2deef1118a7..2deef1118a7 100644
--- a/src/glsl/builtins/ir/min
+++ b/src/glsl/builtins/ir/min.ir
diff --git a/src/glsl/builtins/ir/mix b/src/glsl/builtins/ir/mix.ir
index a31f0fa7086..a31f0fa7086 100644
--- a/src/glsl/builtins/ir/mix
+++ b/src/glsl/builtins/ir/mix.ir
diff --git a/src/glsl/builtins/ir/mod b/src/glsl/builtins/ir/mod.ir
index aeaea240e2d..aeaea240e2d 100644
--- a/src/glsl/builtins/ir/mod
+++ b/src/glsl/builtins/ir/mod.ir
diff --git a/src/glsl/builtins/ir/modf b/src/glsl/builtins/ir/modf.ir
index f4f631567bd..f4f631567bd 100644
--- a/src/glsl/builtins/ir/modf
+++ b/src/glsl/builtins/ir/modf.ir
diff --git a/src/glsl/builtins/ir/noise1 b/src/glsl/builtins/ir/noise1.ir
index 115505610a6..115505610a6 100644
--- a/src/glsl/builtins/ir/noise1
+++ b/src/glsl/builtins/ir/noise1.ir
diff --git a/src/glsl/builtins/ir/noise2 b/src/glsl/builtins/ir/noise2.ir
index d3366145fed..d3366145fed 100644
--- a/src/glsl/builtins/ir/noise2
+++ b/src/glsl/builtins/ir/noise2.ir
diff --git a/src/glsl/builtins/ir/noise3 b/src/glsl/builtins/ir/noise3.ir
index 1d8aa3f30d0..1d8aa3f30d0 100644
--- a/src/glsl/builtins/ir/noise3
+++ b/src/glsl/builtins/ir/noise3.ir
diff --git a/src/glsl/builtins/ir/noise4 b/src/glsl/builtins/ir/noise4.ir
index 4949696546f..4949696546f 100644
--- a/src/glsl/builtins/ir/noise4
+++ b/src/glsl/builtins/ir/noise4.ir
diff --git a/src/glsl/builtins/ir/normalize b/src/glsl/builtins/ir/normalize.ir
index 0de0db0b648..0de0db0b648 100644
--- a/src/glsl/builtins/ir/normalize
+++ b/src/glsl/builtins/ir/normalize.ir
diff --git a/src/glsl/builtins/ir/not b/src/glsl/builtins/ir/not.ir
index b696b06557f..b696b06557f 100644
--- a/src/glsl/builtins/ir/not
+++ b/src/glsl/builtins/ir/not.ir
diff --git a/src/glsl/builtins/ir/notEqual b/src/glsl/builtins/ir/notEqual.ir
index abaf1914c9f..abaf1914c9f 100644
--- a/src/glsl/builtins/ir/notEqual
+++ b/src/glsl/builtins/ir/notEqual.ir
diff --git a/src/glsl/builtins/ir/outerProduct b/src/glsl/builtins/ir/outerProduct.ir
index 0e3f375bbac..0e3f375bbac 100644
--- a/src/glsl/builtins/ir/outerProduct
+++ b/src/glsl/builtins/ir/outerProduct.ir
diff --git a/src/glsl/builtins/ir/pow b/src/glsl/builtins/ir/pow.ir
index a61bc4418e3..a61bc4418e3 100644
--- a/src/glsl/builtins/ir/pow
+++ b/src/glsl/builtins/ir/pow.ir
diff --git a/src/glsl/builtins/ir/radians b/src/glsl/builtins/ir/radians.ir
index a419101cf16..a419101cf16 100644
--- a/src/glsl/builtins/ir/radians
+++ b/src/glsl/builtins/ir/radians.ir
diff --git a/src/glsl/builtins/ir/reflect b/src/glsl/builtins/ir/reflect.ir
index 1fa394e3c99..1fa394e3c99 100644
--- a/src/glsl/builtins/ir/reflect
+++ b/src/glsl/builtins/ir/reflect.ir
diff --git a/src/glsl/builtins/ir/refract b/src/glsl/builtins/ir/refract.ir
index 60899f01cec..60899f01cec 100644
--- a/src/glsl/builtins/ir/refract
+++ b/src/glsl/builtins/ir/refract.ir
diff --git a/src/glsl/builtins/ir/round b/src/glsl/builtins/ir/round.ir
index d0d425bd656..d0d425bd656 100644
--- a/src/glsl/builtins/ir/round
+++ b/src/glsl/builtins/ir/round.ir
diff --git a/src/glsl/builtins/ir/roundEven b/src/glsl/builtins/ir/roundEven.ir
index a9c99b6f44c..a9c99b6f44c 100644
--- a/src/glsl/builtins/ir/roundEven
+++ b/src/glsl/builtins/ir/roundEven.ir
diff --git a/src/glsl/builtins/ir/sign b/src/glsl/builtins/ir/sign.ir
index 1f51718dab1..1f51718dab1 100644
--- a/src/glsl/builtins/ir/sign
+++ b/src/glsl/builtins/ir/sign.ir
diff --git a/src/glsl/builtins/ir/sin b/src/glsl/builtins/ir/sin.ir
index e6009d8ef12..e6009d8ef12 100644
--- a/src/glsl/builtins/ir/sin
+++ b/src/glsl/builtins/ir/sin.ir
diff --git a/src/glsl/builtins/ir/sinh b/src/glsl/builtins/ir/sinh.ir
index 31edd30e5ec..31edd30e5ec 100644
--- a/src/glsl/builtins/ir/sinh
+++ b/src/glsl/builtins/ir/sinh.ir
diff --git a/src/glsl/builtins/ir/smoothstep b/src/glsl/builtins/ir/smoothstep.ir
index 94c98b29e53..94c98b29e53 100644
--- a/src/glsl/builtins/ir/smoothstep
+++ b/src/glsl/builtins/ir/smoothstep.ir
diff --git a/src/glsl/builtins/ir/sqrt b/src/glsl/builtins/ir/sqrt.ir
index 0302d164ae5..0302d164ae5 100644
--- a/src/glsl/builtins/ir/sqrt
+++ b/src/glsl/builtins/ir/sqrt.ir
diff --git a/src/glsl/builtins/ir/step b/src/glsl/builtins/ir/step.ir
index efcd7bc8023..efcd7bc8023 100644
--- a/src/glsl/builtins/ir/step
+++ b/src/glsl/builtins/ir/step.ir
diff --git a/src/glsl/builtins/ir/tan b/src/glsl/builtins/ir/tan.ir
index 99798631859..99798631859 100644
--- a/src/glsl/builtins/ir/tan
+++ b/src/glsl/builtins/ir/tan.ir
diff --git a/src/glsl/builtins/ir/tanh b/src/glsl/builtins/ir/tanh.ir
index 3b7271bf779..3b7271bf779 100644
--- a/src/glsl/builtins/ir/tanh
+++ b/src/glsl/builtins/ir/tanh.ir
diff --git a/src/glsl/builtins/ir/transpose b/src/glsl/builtins/ir/transpose.ir
index 043327d235b..043327d235b 100644
--- a/src/glsl/builtins/ir/transpose
+++ b/src/glsl/builtins/ir/transpose.ir
diff --git a/src/glsl/builtins/ir/trunc b/src/glsl/builtins/ir/trunc.ir
index d320a2a7722..d320a2a7722 100644
--- a/src/glsl/builtins/ir/trunc
+++ b/src/glsl/builtins/ir/trunc.ir
diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
index 8ce2b70c500..b8c12bc3659 100755
--- a/src/glsl/builtins/tools/generate_builtins.py
+++ b/src/glsl/builtins/tools/generate_builtins.py
@@ -24,9 +24,10 @@ compiler = argv[1]
 
 # Read the files in builtins/ir/*...add them to the supplied dictionary.
 def read_ir_files(fs):
-    for filename in glob(path.join(path.join(builtins_dir, 'ir'), '*')):
+    for filename in glob(path.join(path.join(builtins_dir, 'ir'), '*.ir')):
+        function_name = path.basename(filename).split('.')[0]
         with open(filename) as f:
-            fs[path.basename(filename)] = f.read()
+            fs[function_name] = f.read()
 
 # Return a dictionary containing all builtin definitions (even generated)
 def get_builtin_definitions():
@@ -103,8 +104,13 @@ def write_profiles():
         write_profile(filename, profile)
 
 def get_profile_list():
+    profile_files = []
+    for extension in ['frag', 'vert']:
+        path_glob = path.join(
+            path.join(builtins_dir, 'profiles'), '*.' + extension)
+        profile_files.extend(glob(path_glob))
     profiles = []
-    for pfile in sorted(glob(path.join(path.join(builtins_dir, 'profiles'), '*'))):
+    for pfile in sorted(profile_files):
         profiles.append((pfile, path.basename(pfile).replace('.', '_')))
     return profiles