summaryrefslogtreecommitdiff
path: root/progs/glsl
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-06-18 14:07:38 -0700
committerEric Anholt <eric@anholt.net>2008-06-18 14:07:38 -0700
commit654258a4fe5e7114022c6e02f2844fc469fcc6f3 (patch)
tree89d285becb87659ab61ee0ceeb35c76726ae93d2 /progs/glsl
parent64adeb163d7da6d75b5664cd2ee3783cadaf63d8 (diff)
parentcf29ab3ba075905cca786b52617d7dc993f58033 (diff)
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'progs/glsl')
-rw-r--r--progs/glsl/.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/progs/glsl/.gitignore b/progs/glsl/.gitignore
index 7865753ea9..1e0aecebef 100644
--- a/progs/glsl/.gitignore
+++ b/progs/glsl/.gitignore
@@ -4,10 +4,13 @@ bump
deriv
extfuncs.h
mandelbrot
+multitex
noise
points
readtex.c
readtex.h
+shaderutil.c
+shaderutil.h
texdemo1
toyball
trirast