diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-04-10 17:16:08 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-04-10 17:16:08 -0400 |
| commit | 04f335fd16c2a13b9425797acf5c3989cb6def7f (patch) | |
| tree | 9e92cecb0b2ac512fac1fc4ef911878849eaeb42 /progs/tests | |
| parent | c0419f190c836130932164ac47cfb53de668d423 (diff) | |
| parent | 5e361c47abf2ee20140628d327eda9b39351d415 (diff) | |
Merge branch 'radeon-rewrite' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
Diffstat (limited to 'progs/tests')
| -rw-r--r-- | progs/tests/.gitignore | 5 | ||||
| -rw-r--r-- | progs/tests/SConscript | 1 | ||||
| -rw-r--r-- | progs/tests/texcompress2.c | 1 |
3 files changed, 6 insertions, 1 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 diff --git a/progs/tests/SConscript b/progs/tests/SConscript index cfeb9d1c37..bf1e7f8a7d 100644 --- a/progs/tests/SConscript +++ b/progs/tests/SConscript @@ -105,6 +105,7 @@ progs = [ 'subtexrate', 'tex1d', 'texcmp', + 'texcompress2', 'texfilt', 'texgenmix', 'texline', diff --git a/progs/tests/texcompress2.c b/progs/tests/texcompress2.c index 3e8e9908cb..cbb8f1d3a2 100644 --- a/progs/tests/texcompress2.c +++ b/progs/tests/texcompress2.c @@ -7,7 +7,6 @@ #include <stdio.h> #include <GL/glew.h> #include <GL/glut.h> -#include <GL/glx.h> #include "readtex.c" #define IMAGE_FILE "../images/arch.rgb" |