diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:14:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:31:08 +1000 |
| commit | d1a9b1f513109c975a5a7ed5a2d0c329b280afe4 (patch) | |
| tree | 5c85af47b4f5af0661acf129e3ce3f59e43cbfd9 /progs/tests/.gitignore | |
| parent | 90ffce497395d8c02fee2ea4ee4c025eede3d876 (diff) | |
| parent | 8648c2685870174cf620ef15de70ef030a8d5a20 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_tex.c
Diffstat (limited to 'progs/tests/.gitignore')
| -rw-r--r-- | progs/tests/.gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/progs/tests/.gitignore b/progs/tests/.gitignore index 0ed3a885c2..e6369de3ab 100644 --- a/progs/tests/.gitignore +++ b/progs/tests/.gitignore @@ -45,7 +45,10 @@ invert jkrahntest lineclip manytex +mapbufrange +mapvbo minmag +mipgen mipmap_limits mipmap_view multipal @@ -54,10 +57,12 @@ packedpixels pbo prog_parameter projtex +quads random readrate readtex.c readtex.h +rubberband seccolor sharedtex shader_api |