diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-20 10:52:17 +1000 |
| commit | 407e8ae5b167b0193e1e5b1266a5d61ed836dfb5 (patch) | |
| tree | 2d9d05a5c3122f41a13aa8bd9ae921c1176e6b0d /progs/trivial/.gitignore | |
| parent | bdaa0341caffc353fd26bbd91865c2d86eed11c1 (diff) | |
| parent | 114bb54324f22cb53bcd14607234d0acd74d37bd (diff) | |
Merge remote branch 'main/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/radeon_ioctl.c
src/mesa/drivers/dri/radeon/radeon_screen.c
Diffstat (limited to 'progs/trivial/.gitignore')
| -rw-r--r-- | progs/trivial/.gitignore | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/progs/trivial/.gitignore b/progs/trivial/.gitignore index d77f120b96..aec4c94527 100644 --- a/progs/trivial/.gitignore +++ b/progs/trivial/.gitignore @@ -9,6 +9,7 @@ dlist-dangling dlist-degenerate dlist-edgeflag dlist-edgeflag-dangling +draw2arrays drawarrays drawelements drawrange @@ -58,11 +59,13 @@ quad-tex-2d quad-tex-3d quad-tex-alpha quad-tex-pbo +quad-tex-sub quad-unfilled quad-unfilled-clip quad-unfilled-stipple quads quadstrip +quadstrip-clip quadstrip-cont quadstrip-flat readtex.c @@ -83,12 +86,15 @@ tri-dlist tri-edgeflag tri-fbo tri-fbo-tex +tri-fbo-tex-mip tri-flat tri-flat-clip tri-fog tri-fp tri-fp-const-imm tri-lit +tri-logicop-none +tri-logicop-xor tri-mask-tri tri-orig tri-query @@ -102,12 +108,14 @@ tri-tri tri-unfilled tri-unfilled-clip tri-unfilled-edgeflag +tri-unfilled-fog tri-unfilled-smooth tri-unfilled-tri tri-unfilled-tri-lit tri-unfilled-userclip tri-unfilled-userclip-stip tri-userclip +tri-viewport tri-z tri-z-eq trifan |