diff options
| author | Brian Paul <[email protected]> | 2009-07-28 08:58:25 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-07-28 08:58:25 -0600 |
| commit | d2f6d6ce49699d35d6b6a234fe17a27d99f4b267 (patch) | |
| tree | 22fcb97333ad7b6c57eb539c512a1dcc3d15a3aa /progs/trivial/.gitignore | |
| parent | 94726bc69e5f9dbefb34a38695f2f51d81ff433f (diff) | |
| parent | bc60b884110b9e41ee3082075717587cc38380b5 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
configs/default
docs/relnotes.html
src/mesa/main/version.h
Diffstat (limited to 'progs/trivial/.gitignore')
| -rw-r--r-- | progs/trivial/.gitignore | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/progs/trivial/.gitignore b/progs/trivial/.gitignore index dce733a70ae..4d6e405c500 100644 --- a/progs/trivial/.gitignore +++ b/progs/trivial/.gitignore @@ -5,10 +5,17 @@ clear-random clear-repeat clear-scissor clear-undefined +createwin +dlist-begin-call-end dlist-dangling dlist-degenerate dlist-edgeflag dlist-edgeflag-dangling +dlist-flat-tri +dlist-mat-tri +dlist-recursive-call +dlist-tri-flat-tri +dlist-tri-mat-tri draw2arrays drawarrays drawelements @@ -31,6 +38,7 @@ lineloop lineloop-clip lineloop-elts linestrip +linestrip-clip linestrip-flat-stipple linestrip-stipple linestrip-stipple-wide @@ -71,8 +79,10 @@ quadstrip-cont quadstrip-flat readtex.c readtex.h +readpixels tri tri-alpha +tri-alpha-tex tri-array-interleaved tri-blend tri-blend-color @@ -80,6 +90,7 @@ tri-blend-max tri-blend-min tri-blend-revsub tri-blend-sub +tri-clear tri-clip tri-cull tri-cull-both @@ -94,6 +105,7 @@ tri-fog tri-fp tri-fp-const-imm tri-lit +tri-lit-material tri-logicop-none tri-logicop-xor tri-mask-tri @@ -102,6 +114,7 @@ tri-orig tri-query tri-repeat tri-scissor-tri +tri-square tri-stencil tri-stipple tri-tex @@ -111,6 +124,7 @@ tri-unfilled tri-unfilled-clip tri-unfilled-edgeflag tri-unfilled-fog +tri-unfilled-point tri-unfilled-smooth tri-unfilled-tri tri-unfilled-tri-lit @@ -119,6 +133,7 @@ tri-unfilled-userclip-stip tri-userclip tri-viewport tri-z +tri-z-9 tri-z-eq trifan trifan-flat |