Mesa (master): glsl: Add '.ir' extension to builtin IR files

Paul Berry stereotype441 at kemper.freedesktop.org
Mon Oct 31 11:26:20 PDT 2011


Module: Mesa
Branch: master
Commit: b6f32bbe12e1082e78951b6ef073bf244ba0b8b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6f32bbe12e1082e78951b6ef073bf244ba0b8b7

Author: Paul Berry <stereotype441 at gmail.com>
Date:   Thu Oct  6 10:31:34 2011 -0700

glsl: Add '.ir' extension to builtin IR files

This patch adds the extension '.ir' to all the files in
src/glsl/builtins/ir/, and changes generate_builtins.py so that it no
longer globs on '*' to find the files to build.  This prevents
spurious files (such as EMACS' infamous *~ backup files) from breaking
the build.

---

 src/glsl/builtins/ir/{abs => abs.ir}               |    0 
 src/glsl/builtins/ir/{acos => acos.ir}             |    0 
 src/glsl/builtins/ir/{acosh => acosh.ir}           |    0 
 src/glsl/builtins/ir/{all => all.ir}               |    0 
 src/glsl/builtins/ir/{any => any.ir}               |    0 
 src/glsl/builtins/ir/{asin => asin.ir}             |    0 
 src/glsl/builtins/ir/{asinh => asinh.ir}           |    0 
 src/glsl/builtins/ir/{atan => atan.ir}             |    0 
 src/glsl/builtins/ir/{atanh => atanh.ir}           |    0 
 src/glsl/builtins/ir/{ceil => ceil.ir}             |    0 
 src/glsl/builtins/ir/{clamp => clamp.ir}           |    0 
 src/glsl/builtins/ir/{cos => cos.ir}               |    0 
 src/glsl/builtins/ir/{cosh => cosh.ir}             |    0 
 src/glsl/builtins/ir/{cross => cross.ir}           |    0 
 src/glsl/builtins/ir/{dFdx => dFdx.ir}             |    0 
 src/glsl/builtins/ir/{dFdy => dFdy.ir}             |    0 
 src/glsl/builtins/ir/{degrees => degrees.ir}       |    0 
 src/glsl/builtins/ir/{distance => distance.ir}     |    0 
 src/glsl/builtins/ir/{dot => dot.ir}               |    0 
 src/glsl/builtins/ir/{equal => equal.ir}           |    0 
 src/glsl/builtins/ir/{exp => exp.ir}               |    0 
 src/glsl/builtins/ir/{exp2 => exp2.ir}             |    0 
 .../builtins/ir/{faceforward => faceforward.ir}    |    0 
 src/glsl/builtins/ir/{floor => floor.ir}           |    0 
 src/glsl/builtins/ir/{fract => fract.ir}           |    0 
 src/glsl/builtins/ir/{ftransform => ftransform.ir} |    0 
 src/glsl/builtins/ir/{fwidth => fwidth.ir}         |    0 
 .../builtins/ir/{greaterThan => greaterThan.ir}    |    0 
 .../ir/{greaterThanEqual => greaterThanEqual.ir}   |    0 
 .../builtins/ir/{inversesqrt => inversesqrt.ir}    |    0 
 src/glsl/builtins/ir/{length => length.ir}         |    0 
 src/glsl/builtins/ir/{lessThan => lessThan.ir}     |    0 
 .../ir/{lessThanEqual => lessThanEqual.ir}         |    0 
 src/glsl/builtins/ir/{log => log.ir}               |    0 
 src/glsl/builtins/ir/{log2 => log2.ir}             |    0 
 .../ir/{matrixCompMult => matrixCompMult.ir}       |    0 
 src/glsl/builtins/ir/{max => max.ir}               |    0 
 src/glsl/builtins/ir/{min => min.ir}               |    0 
 src/glsl/builtins/ir/{mix => mix.ir}               |    0 
 src/glsl/builtins/ir/{mod => mod.ir}               |    0 
 src/glsl/builtins/ir/{modf => modf.ir}             |    0 
 src/glsl/builtins/ir/{noise1 => noise1.ir}         |    0 
 src/glsl/builtins/ir/{noise2 => noise2.ir}         |    0 
 src/glsl/builtins/ir/{noise3 => noise3.ir}         |    0 
 src/glsl/builtins/ir/{noise4 => noise4.ir}         |    0 
 src/glsl/builtins/ir/{normalize => normalize.ir}   |    0 
 src/glsl/builtins/ir/{not => not.ir}               |    0 
 src/glsl/builtins/ir/{notEqual => notEqual.ir}     |    0 
 .../builtins/ir/{outerProduct => outerProduct.ir}  |    0 
 src/glsl/builtins/ir/{pow => pow.ir}               |    0 
 src/glsl/builtins/ir/{radians => radians.ir}       |    0 
 src/glsl/builtins/ir/{reflect => reflect.ir}       |    0 
 src/glsl/builtins/ir/{refract => refract.ir}       |    0 
 src/glsl/builtins/ir/{round => round.ir}           |    0 
 src/glsl/builtins/ir/{roundEven => roundEven.ir}   |    0 
 src/glsl/builtins/ir/{sign => sign.ir}             |    0 
 src/glsl/builtins/ir/{sin => sin.ir}               |    0 
 src/glsl/builtins/ir/{sinh => sinh.ir}             |    0 
 src/glsl/builtins/ir/{smoothstep => smoothstep.ir} |    0 
 src/glsl/builtins/ir/{sqrt => sqrt.ir}             |    0 
 src/glsl/builtins/ir/{step => step.ir}             |    0 
 src/glsl/builtins/ir/{tan => tan.ir}               |    0 
 src/glsl/builtins/ir/{tanh => tanh.ir}             |    0 
 src/glsl/builtins/ir/{transpose => transpose.ir}   |    0 
 src/glsl/builtins/ir/{trunc => trunc.ir}           |    0 
 src/glsl/builtins/tools/generate_builtins.py       |   12 +++++++++---
 66 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/glsl/builtins/ir/abs b/src/glsl/builtins/ir/abs.ir
similarity index 100%
rename from src/glsl/builtins/ir/abs
rename to src/glsl/builtins/ir/abs.ir
diff --git a/src/glsl/builtins/ir/acos b/src/glsl/builtins/ir/acos.ir
similarity index 100%
rename from src/glsl/builtins/ir/acos
rename to src/glsl/builtins/ir/acos.ir
diff --git a/src/glsl/builtins/ir/acosh b/src/glsl/builtins/ir/acosh.ir
similarity index 100%
rename from src/glsl/builtins/ir/acosh
rename to src/glsl/builtins/ir/acosh.ir
diff --git a/src/glsl/builtins/ir/all b/src/glsl/builtins/ir/all.ir
similarity index 100%
rename from src/glsl/builtins/ir/all
rename to src/glsl/builtins/ir/all.ir
diff --git a/src/glsl/builtins/ir/any b/src/glsl/builtins/ir/any.ir
similarity index 100%
rename from src/glsl/builtins/ir/any
rename to src/glsl/builtins/ir/any.ir
diff --git a/src/glsl/builtins/ir/asin b/src/glsl/builtins/ir/asin.ir
similarity index 100%
rename from src/glsl/builtins/ir/asin
rename to src/glsl/builtins/ir/asin.ir
diff --git a/src/glsl/builtins/ir/asinh b/src/glsl/builtins/ir/asinh.ir
similarity index 100%
rename from src/glsl/builtins/ir/asinh
rename to src/glsl/builtins/ir/asinh.ir
diff --git a/src/glsl/builtins/ir/atan b/src/glsl/builtins/ir/atan.ir
similarity index 100%
rename from src/glsl/builtins/ir/atan
rename to src/glsl/builtins/ir/atan.ir
diff --git a/src/glsl/builtins/ir/atanh b/src/glsl/builtins/ir/atanh.ir
similarity index 100%
rename from src/glsl/builtins/ir/atanh
rename to src/glsl/builtins/ir/atanh.ir
diff --git a/src/glsl/builtins/ir/ceil b/src/glsl/builtins/ir/ceil.ir
similarity index 100%
rename from src/glsl/builtins/ir/ceil
rename to src/glsl/builtins/ir/ceil.ir
diff --git a/src/glsl/builtins/ir/clamp b/src/glsl/builtins/ir/clamp.ir
similarity index 100%
rename from src/glsl/builtins/ir/clamp
rename to src/glsl/builtins/ir/clamp.ir
diff --git a/src/glsl/builtins/ir/cos b/src/glsl/builtins/ir/cos.ir
similarity index 100%
rename from src/glsl/builtins/ir/cos
rename to src/glsl/builtins/ir/cos.ir
diff --git a/src/glsl/builtins/ir/cosh b/src/glsl/builtins/ir/cosh.ir
similarity index 100%
rename from src/glsl/builtins/ir/cosh
rename to src/glsl/builtins/ir/cosh.ir
diff --git a/src/glsl/builtins/ir/cross b/src/glsl/builtins/ir/cross.ir
similarity index 100%
rename from src/glsl/builtins/ir/cross
rename to src/glsl/builtins/ir/cross.ir
diff --git a/src/glsl/builtins/ir/dFdx b/src/glsl/builtins/ir/dFdx.ir
similarity index 100%
rename from src/glsl/builtins/ir/dFdx
rename to src/glsl/builtins/ir/dFdx.ir
diff --git a/src/glsl/builtins/ir/dFdy b/src/glsl/builtins/ir/dFdy.ir
similarity index 100%
rename from src/glsl/builtins/ir/dFdy
rename to src/glsl/builtins/ir/dFdy.ir
diff --git a/src/glsl/builtins/ir/degrees b/src/glsl/builtins/ir/degrees.ir
similarity index 100%
rename from src/glsl/builtins/ir/degrees
rename to src/glsl/builtins/ir/degrees.ir
diff --git a/src/glsl/builtins/ir/distance b/src/glsl/builtins/ir/distance.ir
similarity index 100%
rename from src/glsl/builtins/ir/distance
rename to src/glsl/builtins/ir/distance.ir
diff --git a/src/glsl/builtins/ir/dot b/src/glsl/builtins/ir/dot.ir
similarity index 100%
rename from src/glsl/builtins/ir/dot
rename to src/glsl/builtins/ir/dot.ir
diff --git a/src/glsl/builtins/ir/equal b/src/glsl/builtins/ir/equal.ir
similarity index 100%
rename from src/glsl/builtins/ir/equal
rename to src/glsl/builtins/ir/equal.ir
diff --git a/src/glsl/builtins/ir/exp b/src/glsl/builtins/ir/exp.ir
similarity index 100%
rename from src/glsl/builtins/ir/exp
rename to src/glsl/builtins/ir/exp.ir
diff --git a/src/glsl/builtins/ir/exp2 b/src/glsl/builtins/ir/exp2.ir
similarity index 100%
rename from src/glsl/builtins/ir/exp2
rename to src/glsl/builtins/ir/exp2.ir
diff --git a/src/glsl/builtins/ir/faceforward b/src/glsl/builtins/ir/faceforward.ir
similarity index 100%
rename from src/glsl/builtins/ir/faceforward
rename to src/glsl/builtins/ir/faceforward.ir
diff --git a/src/glsl/builtins/ir/floor b/src/glsl/builtins/ir/floor.ir
similarity index 100%
rename from src/glsl/builtins/ir/floor
rename to src/glsl/builtins/ir/floor.ir
diff --git a/src/glsl/builtins/ir/fract b/src/glsl/builtins/ir/fract.ir
similarity index 100%
rename from src/glsl/builtins/ir/fract
rename to src/glsl/builtins/ir/fract.ir
diff --git a/src/glsl/builtins/ir/ftransform b/src/glsl/builtins/ir/ftransform.ir
similarity index 100%
rename from src/glsl/builtins/ir/ftransform
rename to src/glsl/builtins/ir/ftransform.ir
diff --git a/src/glsl/builtins/ir/fwidth b/src/glsl/builtins/ir/fwidth.ir
similarity index 100%
rename from src/glsl/builtins/ir/fwidth
rename to src/glsl/builtins/ir/fwidth.ir
diff --git a/src/glsl/builtins/ir/greaterThan b/src/glsl/builtins/ir/greaterThan.ir
similarity index 100%
rename from src/glsl/builtins/ir/greaterThan
rename to src/glsl/builtins/ir/greaterThan.ir
diff --git a/src/glsl/builtins/ir/greaterThanEqual b/src/glsl/builtins/ir/greaterThanEqual.ir
similarity index 100%
rename from src/glsl/builtins/ir/greaterThanEqual
rename to src/glsl/builtins/ir/greaterThanEqual.ir
diff --git a/src/glsl/builtins/ir/inversesqrt b/src/glsl/builtins/ir/inversesqrt.ir
similarity index 100%
rename from src/glsl/builtins/ir/inversesqrt
rename to src/glsl/builtins/ir/inversesqrt.ir
diff --git a/src/glsl/builtins/ir/length b/src/glsl/builtins/ir/length.ir
similarity index 100%
rename from src/glsl/builtins/ir/length
rename to src/glsl/builtins/ir/length.ir
diff --git a/src/glsl/builtins/ir/lessThan b/src/glsl/builtins/ir/lessThan.ir
similarity index 100%
rename from src/glsl/builtins/ir/lessThan
rename to src/glsl/builtins/ir/lessThan.ir
diff --git a/src/glsl/builtins/ir/lessThanEqual b/src/glsl/builtins/ir/lessThanEqual.ir
similarity index 100%
rename from src/glsl/builtins/ir/lessThanEqual
rename to src/glsl/builtins/ir/lessThanEqual.ir
diff --git a/src/glsl/builtins/ir/log b/src/glsl/builtins/ir/log.ir
similarity index 100%
rename from src/glsl/builtins/ir/log
rename to src/glsl/builtins/ir/log.ir
diff --git a/src/glsl/builtins/ir/log2 b/src/glsl/builtins/ir/log2.ir
similarity index 100%
rename from src/glsl/builtins/ir/log2
rename to src/glsl/builtins/ir/log2.ir
diff --git a/src/glsl/builtins/ir/matrixCompMult b/src/glsl/builtins/ir/matrixCompMult.ir
similarity index 100%
rename from src/glsl/builtins/ir/matrixCompMult
rename to src/glsl/builtins/ir/matrixCompMult.ir
diff --git a/src/glsl/builtins/ir/max b/src/glsl/builtins/ir/max.ir
similarity index 100%
rename from src/glsl/builtins/ir/max
rename to src/glsl/builtins/ir/max.ir
diff --git a/src/glsl/builtins/ir/min b/src/glsl/builtins/ir/min.ir
similarity index 100%
rename from src/glsl/builtins/ir/min
rename to src/glsl/builtins/ir/min.ir
diff --git a/src/glsl/builtins/ir/mix b/src/glsl/builtins/ir/mix.ir
similarity index 100%
rename from src/glsl/builtins/ir/mix
rename to src/glsl/builtins/ir/mix.ir
diff --git a/src/glsl/builtins/ir/mod b/src/glsl/builtins/ir/mod.ir
similarity index 100%
rename from src/glsl/builtins/ir/mod
rename to src/glsl/builtins/ir/mod.ir
diff --git a/src/glsl/builtins/ir/modf b/src/glsl/builtins/ir/modf.ir
similarity index 100%
rename from src/glsl/builtins/ir/modf
rename to src/glsl/builtins/ir/modf.ir
diff --git a/src/glsl/builtins/ir/noise1 b/src/glsl/builtins/ir/noise1.ir
similarity index 100%
rename from src/glsl/builtins/ir/noise1
rename to src/glsl/builtins/ir/noise1.ir
diff --git a/src/glsl/builtins/ir/noise2 b/src/glsl/builtins/ir/noise2.ir
similarity index 100%
rename from src/glsl/builtins/ir/noise2
rename to src/glsl/builtins/ir/noise2.ir
diff --git a/src/glsl/builtins/ir/noise3 b/src/glsl/builtins/ir/noise3.ir
similarity index 100%
rename from src/glsl/builtins/ir/noise3
rename to src/glsl/builtins/ir/noise3.ir
diff --git a/src/glsl/builtins/ir/noise4 b/src/glsl/builtins/ir/noise4.ir
similarity index 100%
rename from src/glsl/builtins/ir/noise4
rename to src/glsl/builtins/ir/noise4.ir
diff --git a/src/glsl/builtins/ir/normalize b/src/glsl/builtins/ir/normalize.ir
similarity index 100%
rename from src/glsl/builtins/ir/normalize
rename to src/glsl/builtins/ir/normalize.ir
diff --git a/src/glsl/builtins/ir/not b/src/glsl/builtins/ir/not.ir
similarity index 100%
rename from src/glsl/builtins/ir/not
rename to src/glsl/builtins/ir/not.ir
diff --git a/src/glsl/builtins/ir/notEqual b/src/glsl/builtins/ir/notEqual.ir
similarity index 100%
rename from src/glsl/builtins/ir/notEqual
rename to src/glsl/builtins/ir/notEqual.ir
diff --git a/src/glsl/builtins/ir/outerProduct b/src/glsl/builtins/ir/outerProduct.ir
similarity index 100%
rename from src/glsl/builtins/ir/outerProduct
rename to src/glsl/builtins/ir/outerProduct.ir
diff --git a/src/glsl/builtins/ir/pow b/src/glsl/builtins/ir/pow.ir
similarity index 100%
rename from src/glsl/builtins/ir/pow
rename to src/glsl/builtins/ir/pow.ir
diff --git a/src/glsl/builtins/ir/radians b/src/glsl/builtins/ir/radians.ir
similarity index 100%
rename from src/glsl/builtins/ir/radians
rename to src/glsl/builtins/ir/radians.ir
diff --git a/src/glsl/builtins/ir/reflect b/src/glsl/builtins/ir/reflect.ir
similarity index 100%
rename from src/glsl/builtins/ir/reflect
rename to src/glsl/builtins/ir/reflect.ir
diff --git a/src/glsl/builtins/ir/refract b/src/glsl/builtins/ir/refract.ir
similarity index 100%
rename from src/glsl/builtins/ir/refract
rename to src/glsl/builtins/ir/refract.ir
diff --git a/src/glsl/builtins/ir/round b/src/glsl/builtins/ir/round.ir
similarity index 100%
rename from src/glsl/builtins/ir/round
rename to src/glsl/builtins/ir/round.ir
diff --git a/src/glsl/builtins/ir/roundEven b/src/glsl/builtins/ir/roundEven.ir
similarity index 100%
rename from src/glsl/builtins/ir/roundEven
rename to src/glsl/builtins/ir/roundEven.ir
diff --git a/src/glsl/builtins/ir/sign b/src/glsl/builtins/ir/sign.ir
similarity index 100%
rename from src/glsl/builtins/ir/sign
rename to src/glsl/builtins/ir/sign.ir
diff --git a/src/glsl/builtins/ir/sin b/src/glsl/builtins/ir/sin.ir
similarity index 100%
rename from src/glsl/builtins/ir/sin
rename to src/glsl/builtins/ir/sin.ir
diff --git a/src/glsl/builtins/ir/sinh b/src/glsl/builtins/ir/sinh.ir
similarity index 100%
rename from src/glsl/builtins/ir/sinh
rename to src/glsl/builtins/ir/sinh.ir
diff --git a/src/glsl/builtins/ir/smoothstep b/src/glsl/builtins/ir/smoothstep.ir
similarity index 100%
rename from src/glsl/builtins/ir/smoothstep
rename to src/glsl/builtins/ir/smoothstep.ir
diff --git a/src/glsl/builtins/ir/sqrt b/src/glsl/builtins/ir/sqrt.ir
similarity index 100%
rename from src/glsl/builtins/ir/sqrt
rename to src/glsl/builtins/ir/sqrt.ir
diff --git a/src/glsl/builtins/ir/step b/src/glsl/builtins/ir/step.ir
similarity index 100%
rename from src/glsl/builtins/ir/step
rename to src/glsl/builtins/ir/step.ir
diff --git a/src/glsl/builtins/ir/tan b/src/glsl/builtins/ir/tan.ir
similarity index 100%
rename from src/glsl/builtins/ir/tan
rename to src/glsl/builtins/ir/tan.ir
diff --git a/src/glsl/builtins/ir/tanh b/src/glsl/builtins/ir/tanh.ir
similarity index 100%
rename from src/glsl/builtins/ir/tanh
rename to src/glsl/builtins/ir/tanh.ir
diff --git a/src/glsl/builtins/ir/transpose b/src/glsl/builtins/ir/transpose.ir
similarity index 100%
rename from src/glsl/builtins/ir/transpose
rename to src/glsl/builtins/ir/transpose.ir
diff --git a/src/glsl/builtins/ir/trunc b/src/glsl/builtins/ir/trunc.ir
similarity index 100%
rename from src/glsl/builtins/ir/trunc
rename to 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 8ce2b70..b8c12bc 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
 



More information about the mesa-commit mailing list