diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-09 09:22:22 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-09 09:22:22 -0700 |
| commit | e97681c7f551a2a2a6bd5eff0f4192a870c816c0 (patch) | |
| tree | dff2bf0e6d22efb92af131f64be0621ed316977c /progs/glsl/.gitignore | |
| parent | 1a46c8a062aea59de5cf55881104489db5d609e5 (diff) | |
| parent | b907d4cd8fafe719b4f87d877562829548937485 (diff) | |
mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c
Diffstat (limited to 'progs/glsl/.gitignore')
| -rw-r--r-- | progs/glsl/.gitignore | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/progs/glsl/.gitignore b/progs/glsl/.gitignore index 21c41da0cd..7a51c8cf6f 100644 --- a/progs/glsl/.gitignore +++ b/progs/glsl/.gitignore @@ -1,18 +1,27 @@ bitmap brick bump +convolutions deriv extfuncs.h +fragcoord +identity mandelbrot multinoise multitex noise +pointcoord points readtex.c readtex.h +samplers +samplers_array shaderutil.c shaderutil.h +skinning texdemo1 toyball trirast twoside +vert-or-frag-only +vert-tex |