9eb7fc6661
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
2009-12-21 18:35:54 -07:00
b57abd3bea
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
configure.ac
progs/demos/morph3d.c
progs/demos/textures.c
progs/glsl/shtest.c
progs/glsl/texaaline.c
progs/tests/packedpixels.c
progs/xdemos/corender.c
src/mesa/main/version.h
2009-12-21 18:23:53 -07:00
07b54fe35b
progs/redbook: Silence compiler warnings.
2009-12-21 15:20:01 -08:00
fdae39c289
progs/perf: added check for GL_ARB_framebuffer_object
2009-12-21 13:49:25 -07:00
79e74cda73
progs/demos: report pixel rate in million pixels / sec
2009-12-21 13:49:25 -07:00
d26cdaaa23
progs/osmes: add missing libGL dependency, remove unneeded lines
2009-12-21 13:37:11 -07:00
66e779c22b
i965g: back out unintentional changes to gears
2009-12-21 19:19:01 +00:00
a5585cb533
Merge commit 'origin/master' into i965g-restart
...
Conflicts:
SConstruct
configs/default
configs/linux-dri
2009-12-21 19:18:41 +00:00
0dd9513874
progs/tests: Silence compiler warnings.
2009-12-20 01:01:00 -08:00
d87d71036c
progs/trivial: Use C-style comments.
2009-12-19 00:28:01 -08:00
3340fd65fb
progs/xdemos: Use C-style comment.
2009-12-19 00:00:56 -08:00
695adf41e2
progs/demos: Silence compiler warning in morph3d.c.
2009-12-18 23:46:14 -08:00
121ff55d81
progs/glsl: Use C-style comments.
2009-12-18 23:38:15 -08:00
41377942d3
progs/demos: Use C-style comment.
2009-12-18 23:34:28 -08:00
263f4322e7
progs/demos: fix glut initialization calls
...
Remove glutInitWindowPosition() calls to play nicer with window managers.
Move glutInitWindowSize() calls before glutInit() so the the default window
size can be overridden by the -geometry cmd line option.
2009-12-18 13:58:14 -07:00
b1ed72ebe2
Move the remaining format pf_get_* functions to u_format.h.
...
Previously they depended on format blocks, but after removing those
they started depending on format encoding.
2009-12-17 23:41:57 +01:00
0a8d508854
progs/trivial: Silence compiler warnings.
2009-12-14 18:11:57 -08:00
588e9f69c4
progs/trivial: Silence compiler warnings in tri-blend-min.c.
2009-12-12 15:47:17 -08:00
786899f153
progs/trivial: Silence compiler warnings in tri-blend-max.c
2009-12-12 14:20:17 -08:00
15c6558a2e
progs/xdemos: Silence compiler warnings in glxinfo.c.
2009-12-12 02:06:51 -08:00
d5be33477e
progs/tests: Silence compiler warnings in vpeval.c.
2009-12-12 01:34:33 -08:00
44d6ab6de5
progs/tests: Silence compiler warnings in cva.c.
2009-12-12 01:11:56 -08:00
9e2eee4ab2
progs/redbook: Silence compiler warnings in aaindex.c.
2009-12-12 01:02:16 -08:00
a087eb590d
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/intel/intel_span.c
2009-12-11 10:04:07 -07:00
b605f4ff11
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
2009-12-11 09:22:00 -07:00
1cf60c9810
progs/samples: Byte swap individual members of struct _rawImageRec.
2009-12-10 15:41:13 -08:00
bc0509bba8
progs/util: Byte swap individual members of struct _rawImageRec.
2009-12-10 13:24:15 -08:00
edf11da7f8
progs/demos/gloss: press 'n' to advance by one frame
2009-12-09 16:23:30 -07:00
288ea9770a
progs/demos: call glutDestroyWindow() in gloss.c
2009-12-09 14:53:53 -07:00
b5e256c76d
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/main/version.h
2009-12-08 11:57:24 +02:00
0d4a05445c
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
2009-12-08 10:16:14 +02:00
3e8b2fda21
progs/test: Initialize variable in prog_parameter.
...
Silences uninitialized variable compiler warning.
2009-12-07 18:40:37 -08:00
8fc433fa0f
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
progs/demos/projtex.c
progs/xdemos/glxinfo.c
src/mesa/main/version.h
To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
2009-12-07 17:16:10 -08:00
7d84169865
progs/demos: Fix memory leak in projtex.c.
2009-12-07 12:31:08 -08:00
0311d9ccf4
progs/glsl: updates to deriv.c test
...
Pass window size into the shader so scaling the window doesn't effect
the colors.
2009-12-07 09:03:41 -07:00
8796dbf519
progs/glsl: added texture mapping to bump demo
...
Press 't' to toggle texture map.
2009-12-07 07:46:02 -07:00
978b80c8e3
progs/tests: Add tests to Makefile.
...
(cherry picked from commit 76d2ec3a0a
2009-12-05 21:20:54 -08:00
d13c603e37
Add 'texture leak' test.
2009-12-05 17:59:49 +01:00
1446f30875
progs/samples: Fix memory leak if malloc fails in rgbtoppm.c.
2009-12-05 01:43:29 -08:00
412aeeed1c
progs/samples: Fix memory leak if fopen fails in rgbtoppm.c.
2009-12-05 01:38:14 -08:00
6212c8103a
progs/samples: Add rgbtoppm to Makefile.
2009-12-05 01:28:47 -08:00
2cd2341ce8
progs/tests: Removed unused variable from texdown.c.
2009-12-05 01:23:05 -08:00
d642edd2d1
progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.
...
The return type of glGetUniformLocationARB is GLint, not GLuint.
2009-12-05 01:11:26 -08:00
8d2f3434c5
progs/fp: Redraw upon keypress.
2009-12-04 23:31:39 -08:00
4fb5ae7233
progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.
...
(cherry picked from commit 11905da883
2009-12-04 17:35:00 -08:00
5683d7d43f
progs/util: Fix memory leak if fail to load/compile shader
...
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit c475079ef2
2009-12-04 17:32:48 -08:00
e5bc2a19bd
progs/fp: Add tri-inv.c to Makefile.
2009-12-04 17:29:53 -08:00
ca7cd3ade0
progs/xdemos: fix some visual/fbconfig logic in glxinfo.c
...
The fbAttribSingle/Double arrays had wrong GLX_DOUBLEBUFFER values.
We only need to use the glXChooseFBConfig() code when glXChooseVisual()
fails (but I don't know when that would happen).
Other recent commits errantly removed some code in this area too.
2009-12-04 08:09:57 -07:00
12a440abfb
progs/xdemos: Silence unused value warnings in sharedtex_mt.c.
...
(cherry picked from commit 8556fad751
2009-12-04 00:04:38 -08:00
4bf96ebdae
progs/xdemos: Fix memory leak in pbdemo.c.
...
(cherry picked from commit e0857962b9
2009-12-04 00:03:14 -08:00
ba3fedf246
progs/xdemos: Add missing break statement in offset.c.
...
(cherry picked from commit 4ab8dbe593
2009-12-04 00:01:20 -08:00
8350648401
progs/xdemos: Remove duplicate code in glxinfo.c.
...
(cherry picked from commit a4720a1a32
2009-12-03 23:59:47 -08:00
7324c22024
progs/xdemos: Fix memory leak in glxinfo.c.
...
(cherry picked from commit f080567f4c
2009-12-03 23:59:11 -08:00
68d206fafa
progs/xdemos: Add assert in corender.c.
...
(cherry picked from commit 66a4ec14c3
2009-12-03 23:22:47 -08:00
69ed1147a8
progs/vp: Fix memory leak in vp-tris.c.
...
(cherry picked from commit 760cf71572
2009-12-03 23:20:18 -08:00
efb582fde7
progs/tests: Fix memory leak in texdown.c if malloc fails.
...
(cherry picked from commit e3cfd78969
2009-12-03 23:17:26 -08:00
b210739aad
progs/redbook: Fix memory leak in quadric.c.
...
(cherry picked from commit 47b5f584a6
2009-12-03 23:12:59 -08:00
b1a87a3e0b
progs/glsl: Fix memory leak in deriv.c.
...
(cherry picked from commit 0e783c7d03
2009-12-03 22:54:35 -08:00
25fd168f03
progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c.
...
tangentAtrrib is assigned the result of glGetAttribLocation.
The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if
tangentAttrib is a GLuint.
(cherry picked from commit b8dcb79c53
2009-12-03 22:51:43 -08:00
b803abbaad
progs/demos: Fix memory leak in ray.c.
...
(cherry picked from commit 6b480dc21d
2009-12-03 22:49:18 -08:00
5820dae4ec
progs/demos: Fix memory leak in projtex.c.
...
(cherry picked from commit ee555e3d69
2009-12-03 22:44:55 -08:00
fc5f07de1a
progs/demos: Fix memory leak in ipers.c.
...
(cherry picked from commit a1afe303de
2009-12-03 22:38:44 -08:00
d245a951f3
progs/demos: Fix memory leak in fslight.c.
...
(cherry picked from commit aef3218f0b
2009-12-03 22:36:37 -08:00
56de7e222e
progs/trivial: Redraw upon keypress.
...
(cherry picked from commit 9553a42f63
2009-12-03 17:27:24 -08:00
34a0b22a74
progs/trivial: Redraw upon keypress.
...
(cherry picked from commit 3790c6a13b
2009-12-03 17:25:00 -08:00
9e29242331
progs/glsl: Redraw upon keypress.
...
(cherry picked from commit 881f55236a
2009-12-03 17:17:24 -08:00
a0ac8fc7d8
progs/util: Exit RawImageGetData early if malloc fails.
...
Prevents a null pointer deference later on.
(cherry picked from commit e26135a744
2009-12-03 17:14:08 -08:00
0a6acecb35
progs/util: Fix memory leak if malloc fails in RawImageOpen.
...
(cherry picked from commit d36cb2396c
2009-12-03 17:08:48 -08:00
305d4f147e
progs/util: Fix memory leak if fopen fails in RawImageOpen.
...
(cherry picked from commit d9508e8df9
2009-12-03 17:03:26 -08:00
772e004781
progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.
...
(cherry picked from commit 786d539511
2009-12-03 16:57:17 -08:00
f1172c4030
progs/util: Fix memory leak if LoadRGBImage fails.
...
(cherry picked from commit 041cd0e110
2009-12-03 16:24:03 -08:00
84de1672d3
progs/util: Fix memory if LoadRGBMipmaps2 fails.
...
(cherry picked from commit 28b8e4bcd7
2009-12-03 16:15:22 -08:00
4ca8e1680e
progs/util: Fix memory leak if LoadYUVImage fails.
...
(cherry picked from commit 0e790ac353
2009-12-03 16:03:22 -08:00
d6a993135f
progs/fp: Redraw upon keypress.
...
(cherry picked from commit cde6643724
2009-12-03 15:59:56 -08:00
005242f166
prog/tests: Fix MSVC build.
...
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 9c3197ef0a
2009-12-03 15:53:13 -08:00
d3208678c2
progs/tests: fix MSVC build.
...
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit a8ed066858
2009-12-03 15:50:36 -08:00
97cbf4943a
progs/tests: Fix MSVC build.
...
(cherry picked from commit 50e113e375
2009-12-03 15:45:18 -08:00
a99bf51bc8
progs/tests: Fix MSVC build.
...
(cherry picked from commit 952bf63e2c
2009-12-03 15:35:10 -08:00
28474e1225
progs/tests: Use rand() instead of random().
...
Forgot these on previous commit.
(cherry picked from commit 166957abeb
2009-12-03 15:34:38 -08:00
bb6e3af939
progs/tests: Use rand() instead of random().
...
More portable. Same implementation on Linux.
(cherry picked from commit 699260b195
2009-12-03 15:32:45 -08:00
a38776419b
progs/tests: Fix MSVC build.
...
(cherry picked from commit f7455ad7af
2009-12-03 15:29:01 -08:00
791b754687
prog/tests: Fix MSVC build.
...
(cherry picked from commit 60b6c74583
2009-12-03 15:24:43 -08:00
89e747920f
prog/tests: Fix MSVC build.
...
(cherry picked from commit 96fd13c1a0
2009-12-03 15:15:12 -08:00
5a25adb646
progs/tests: fix MSVC build.
...
(cherry picked from commit 9c778a90ea
2009-12-03 15:11:25 -08:00
3910e88ebf
prog/tests: Fix MSVC build.
...
(cherry picked from commit ea862ec8ff
2009-12-03 15:05:44 -08:00
52081f0a2c
progs/trivial: readback and print Z value in tri-z-eq.c
2009-12-03 11:43:19 -07:00
235c0c8134
progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS.
...
(cherry picked from commit b98db7bf69
2009-12-02 20:28:54 -08:00
0a107d36c2
progs/glsl: Fix trirast GLSL compilation errors on Mac OS.
...
(cherry picked from commit 4b3ec2acf2
2009-12-02 20:20:12 -08:00
b094683e7c
progs/glsl: Fix noise GLSL compilation error on Mac OS.
...
(cherry picked from commit 0d31990b47
2009-12-02 20:16:51 -08:00
592c8522a2
demos/glsl: Add missing break statement to noise test.
...
(cherry picked from commit 7dfea5c072
2009-12-02 20:16:41 -08:00
8f4d3613da
progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
...
(cherry picked from commit d4dc2e30da
2009-12-02 20:06:20 -08:00
9ed77d12b1
progs/glsl: Add missing break statement in multinoise.c.
...
(cherry picked from commit 43080e40aa
2009-12-02 20:06:11 -08:00
832593772d
progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.
...
(cherry picked from commit 04442841fb
2009-12-02 19:55:48 -08:00
2a5cd95e24
progs/glsl: Include local headers before installed headers during compilation.
...
Fixes compilation errors on platforms with insufficient older installed
GL headers.
(cherry picked from commit d17af7d1e1
2009-12-02 19:39:25 -08:00
ccea09cd3a
progs/glsl: minor Makefile clean-ups
...
(cherry picked from commit 4df2f7af5e
2009-12-02 19:39:11 -08:00
67a0628ab2
progs: Ignore Mac OS dSYM directories.
...
(cherry picked from commit a420056750
2009-12-02 15:22:34 -08:00
0c75854cc1
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
src/mesa/main/version.h
2009-12-02 14:52:51 +01:00
ba97b98842
progs/demos: remove unused glFogCoordPointer_ext var
2009-12-01 12:23:07 -07:00
b9f4a0bd2b
Simplify hackery added to fix AIX build.
...
Borrow an idiom from the GNU build system which can handle `for'
loops over empty lists.
2009-12-01 10:27:27 -08:00
650e02003f
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
2009-11-30 17:47:07 -08:00
344a2a9abb
progs/trivial: added two simple texture tests
...
One draws a series of quads with different textures.
The other draws with one texture which is changed with glTexSubImage2D().
2009-11-30 15:31:34 -07:00
cddc7e3a9c
brw: add dumping to gem winsys
2009-11-30 15:37:27 +00:00
da0883114b
shaderutil: Fix detection of shaders
...
Check for versions >= 2.0 (because some drivers return 3.0), and return
GL_FALSE if shaders are not detected.
2009-11-23 18:33:50 -08:00
e19195c185
progs/xdemos: Fix memory leak in pbinfo.c.
2009-11-20 15:52:53 -08:00
e0857962b9
progs/xdemos: Fix memory leak in pbdemo.c.
2009-11-20 15:48:29 -08:00
538a8df652
progs/xdemos: Fix memory leak in glxpbdemo.c.
2009-11-20 15:18:19 -08:00
a4720a1a32
progs/xdemos: Remove duplicate code in glxinfo.c.
2009-11-20 15:06:56 -08:00
66a4ec14c3
progs/xdemos: Add assert in corender.c.
2009-11-20 15:03:16 -08:00
3fafe2b969
progs/vp: add param and imm test
2009-11-19 19:50:19 -08:00
7e5cd3eb14
progs/fp: add simple imm, param tests
2009-11-19 16:53:02 -08:00
8f24e863c3
progs: Fix quoting issue with empty set of PROGRAM_DIRS.
...
Quotes are important to make sure the argument to test -n really
is the empty string, but that requires stringifying PROGRAM_DIRS.
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-19 09:26:39 -07:00
8556fad751
progs/xdemos: Silence unused value warnings in sharedtex_mt.c.
2009-11-20 13:09:42 -08:00
f080567f4c
progs/xdemos: Fix memory leak in glxinfo.c.
2009-11-20 13:01:22 -08:00
02c3e0b82d
progs/tests: Silence unused value warnings in sharedtex.c.
2009-11-20 12:49:50 -08:00
48deddaa6f
progs/tests: Initialize variable in getprocaddress.c.
2009-11-20 12:34:21 -08:00
e26135a744
progs/util: Exit RawImageGetData early if malloc fails.
...
Prevents a null pointer deference later on.
2009-11-20 12:11:55 -08:00
c88b18a4df
progs/slang: Check for ftell failure in vstest.c.
2009-11-20 11:34:21 -08:00
d36cb2396c
progs/util: Fix memory leak if malloc fails in RawImageOpen.
2009-11-20 11:22:13 -08:00
b98db7bf69
progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS.
2009-11-19 23:56:07 -08:00
760cf71572
progs/vp: Fix memory leak in vp-tris.c.
2009-11-19 22:59:01 -08:00
9553a42f63
progs/trivial: Redraw upon keypress.
2009-11-19 22:52:05 -08:00
881f55236a
progs/glsl: Redraw upon keypress.
2009-11-19 22:46:19 -08:00
4ab8dbe593
progs/xdemos: Add missing break statement in offset.c.
2009-11-19 14:20:26 -08:00
3790c6a13b
progs/trivial: Redraw upon keypress.
2009-11-19 13:03:12 -08:00
e3cfd78969
progs/tests: Fix memory leak in texdown.c if malloc fails.
2009-11-18 17:30:50 -08:00
cde6643724
progs/fp: Redraw upon keypress.
2009-11-18 14:41:40 -08:00
4b3ec2acf2
progs/glsl: Fix trirast GLSL compilation errors on Mac OS.
2009-11-18 14:02:20 -08:00
0d31990b47
progs/glsl: Fix noise GLSL compilation error on Mac OS.
2009-11-18 13:50:49 -08:00
d4dc2e30da
progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
2009-11-18 12:49:31 -08:00
04442841fb
progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.
2009-11-17 23:15:25 -08:00
89e20ab3ae
progs/glsl: use ShadersSupported()
2009-11-17 19:22:29 -07:00
6acb82dab0
progs/util: warn when GLSL not supported
2009-11-17 19:22:11 -07:00
773de83d3c
progs/tests: Fix memory leak in arbgpuprog.c.
2009-11-17 15:24:40 -08:00
fc3c5ffcc8
progs/xdemos: change //-style comments
2009-11-17 16:16:30 -07:00
b08f447547
progs/glsl: change //-style comments
2009-11-17 16:16:30 -07:00
1888a72765
progs/demos: silence warnings
2009-11-17 16:16:30 -07:00
e8eec93854
progs/slang: Fix potential null pointer dereference in cltest.c.
2009-11-17 14:22:35 -08:00
47b5f584a6
progs/redbook: Fix memory leak in quadric.c.
2009-11-17 14:10:35 -08:00
d9508e8df9
progs/util: Fix memory leak if fopen fails in RawImageOpen.
2009-11-17 13:49:31 -08:00
d888bbc45a
progs/xdemos: added -lX11 -lpthread for GNU gold linker
2009-11-17 13:40:00 -07:00
11905da883
progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.
2009-11-17 12:00:22 -08:00
b8dcb79c53
progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c.
...
tangentAtrrib is assigned the result of glGetAttribLocation.
The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if
tangentAttrib is a GLuint.
2009-11-17 11:37:48 -08:00
786d539511
progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.
2009-11-17 11:04:24 -08:00
041cd0e110
progs/util: Fix memory leak if LoadRGBImage fails.
2009-11-17 10:11:50 -08:00
0e783c7d03
progs/glsl: Fix memory leak in deriv.c.
2009-11-17 09:54:54 -08:00
28b8e4bcd7
progs/util: Fix memory if LoadRGBMipmaps2 fails.
2009-11-17 08:29:36 -08:00
0e790ac353
progs/util: Fix memory leak if LoadYUVImage fails.
2009-11-16 18:24:06 -08:00
6b480dc21d
progs/demos: Fix memory leak in ray.c.
2009-11-16 18:06:40 -08:00
ee555e3d69
progs/demos: Fix memory leak in projtex.c.
2009-11-16 16:31:34 -08:00
a1afe303de
progs/demos: Fix memory leak in ipers.c.
2009-11-16 15:44:52 -08:00
aef3218f0b
progs/demos: Fix memory leak in fslight.c.
2009-11-16 14:56:07 -08:00
fcf8dea36c
progs/tests: silence warning
2009-11-16 11:33:45 -07:00
a420056750
progs: Ignore Mac OS dSYM directories.
2009-11-14 21:39:31 -08:00
43080e40aa
progs/glsl: Add missing break statement in multinoise.c.
2009-11-12 16:21:49 -08:00
98c2b53381
trivial: make tri-orig more closely match the original version of tri...
2009-11-11 18:51:57 -08:00
7dfea5c072
demos/glsl: Add missing break statement to noise test.
2009-11-11 17:39:58 -08:00
2ff4f5a7fe
progs/tests: add alpha/blend testing to packedpixels.c
2009-11-11 12:25:08 -07:00
b30876658b
progs/es1: Port eglgears to OpenGL ES 1.1.
...
This demo requires EGL_MESA_screen_surface to run.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-10 11:24:53 -07:00
381cbc7192
progs/es1: Port egltri to OpenGL ES 1.1.
...
This demo requires EGL_MESA_screen_surface to run.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-10 11:24:39 -07:00
0b9f0ba706
progs/es: Add .gitignore.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-10 11:23:47 -07:00
8353162a4c
progs/trivial: Ignores
2009-11-06 18:40:23 +00:00
5a24c66915
trivial: add vbo-tri, an even simpler version of tri.c
2009-11-06 09:34:02 +00:00
5b85cada60
progs/es: OpenGL ES 1.x and 2.X demo programs.
...
The demo programs are written by Brian Paul, and cherry-picked from
opengl-es branch. Several minor issues such as a linking problem are
fixed.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-11-05 20:04:21 -07:00
898de4a9d5
Merge branch 'mesa_7_6_branch'
...
Conflicts:
src/mesa/drivers/windows/gdi/mesa.def
2009-11-04 17:57:20 -07:00
60c328db2d
progs/tests: Fix MSVC build.
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-04 15:56:14 -07:00
c475079ef2
progs/util: Fix memory leak if fail to load/compile shader
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-03 14:49:41 -07:00
a017ad2861
progs/tests: debug code for getting texture component sizes
2009-11-03 10:01:10 -07:00
4bced42341
Merge branch 'mesa_7_6_branch'
2009-11-03 09:54:09 -07:00
9c3197ef0a
prog/tests: Fix MSVC build.
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-30 15:30:13 -06:00
a8ed066858
progs/tests: fix MSVC build.
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-30 09:40:04 -06:00
02b9fb9c80
progs/tests: fixes for drawbuffers.c
...
Disable GL_DEPTH_TEST before glDrawPixels.
Show color buffer 0 on left, color buffer 1 on right.
2009-10-29 14:46:35 -06:00
1e2c517026
progs/tests: also test GL_BGRA format in getteximage.c
2009-10-29 10:50:26 -06:00
635ea87374
progs/tests: added test for GL_EXT_texture_compression_s3tc support
2009-10-28 21:50:51 -06:00
1f196b786d
Merge branch 'texformat-rework'
...
Conflicts:
src/mesa/drivers/dri/radeon/radeon_fbo.c
src/mesa/drivers/dri/s3v/s3v_tex.c
src/mesa/drivers/dri/s3v/s3v_xmesa.c
src/mesa/drivers/dri/trident/trident_context.c
src/mesa/main/debug.c
src/mesa/main/mipmap.c
src/mesa/main/texformat.c
src/mesa/main/texgetimage.c
2009-10-28 21:24:11 -06:00
3bee7610be
progs/tests: added new blitfb.c test
...
Tests glBlitFramebuffer() between two texture/renderbuffer surfaces.
In particular, blit from level[1] of a cube map face to a 2D texture.
Used to find/fix bug in intel do_copy_texsubimage().
See commit aef1ab1073f3e30d699b99dae17518ed48b57c72
2009-10-27 17:00:31 -06:00
498fcfd315
progs/tests: added new blitfb.c test
...
Tests glBlitFramebuffer() between two texture/renderbuffer surfaces.
In particular, blit from level[1] of a cube map face to a 2D texture.
Used to find/fix bug in intel do_copy_texsubimage().
See commit aef1ab1073f3e30d699b99dae17518ed48b57c72
2009-10-27 16:46:20 -06:00
50e113e375
progs/tests: Fix MSVC build.
2009-10-26 15:03:52 -06:00
d8ded352ec
progs/tests: disable blending while drawing text
2009-10-25 18:10:45 -06:00
51bc12d623
progs/tests: fix sub texture offsets
2009-10-24 11:08:01 -06:00
49d402e275
Merge remote branch 'origin/mesa_7_6_branch'
...
Conflicts:
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.h
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/drivers/dri/intel/intel_tex_image.c
2009-10-23 15:21:05 -07:00
b01937a3c9
progs/tests: print requested/internal format info
2009-10-23 14:52:10 -06:00
952bf63e2c
progs/tests: Fix MSVC build.
2009-10-23 13:49:13 -06:00
19403935aa
progs/demos: add fps to multiarb
2009-10-23 13:56:07 +01:00
ab9d1011f5
Merge branch 'mesa_7_6_branch'
2009-10-22 18:38:19 -06:00
61a96a2ac7
progs/xdemos: fix command line flag typo
2009-10-22 17:11:59 -06:00
5e77b61e39
Merge branch 'mesa_7_6_branch' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa
2009-10-22 12:02:31 -04:00
4e2bdd6635
progs/egl: Add support for pixmap and pbuffer surface to xeglgears.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-22 09:33:27 -06:00
82ffc5884c
progs/tests: draw Z values as luminance, no pixel zoom
2009-10-21 21:51:19 -06:00
5283a3fb25
progs/trivial: check if GL_ARB_occlusion_query is supported
2009-10-20 16:22:03 -06:00
166957abeb
progs/tests: Use rand() instead of random().
...
Forgot these on previous commit.
2009-10-16 11:42:13 +01:00
699260b195
progs/tests: Use rand() instead of random().
...
More portable. Same implementation on Linux.
2009-10-16 11:39:29 +01:00
60b6c74583
prog/tests: Fix MSVC build.
2009-10-16 11:36:09 +01:00
5b7d9053a0
progs/egl: put declarations before code
2009-10-15 13:00:03 -06:00
31f7e8efb2
progs/Makefile: remove extra quoting
...
This reverts part of commit 115edf24a9
2009-10-14 09:37:53 -06:00
91bd87c06e
progs/demos: try different depth formats in fbo_firecube.c
2009-10-14 19:13:32 -06:00
115edf24a9
Fix build when PROGRAM_DIRS is empty.
...
SUBDIRS just takes PROGRAM_DIRS value. If PROGRAM_DIRS gets set
to the empty string (as can happen when building only OSMesa), a
'for' loop will lack anything to iterate over, causing a parse
error.
This fixes the issue by making sure SUBDIRS is the null string
when PROGRAM_DIRS is, and wrapping the for loops in if's, causing
them only to execute if there are directories to iterate over.
2009-10-13 16:22:09 -06:00
9fd7e9ef05
Merge branch 'mesa_7_6_branch'
2009-10-14 09:40:05 -06:00
ce3801ab87
Merge branch 'mesa_7_6_branch'
2009-10-14 09:22:30 -06:00
ea862ec8ff
prog/tests: Fix MSVC build.
2009-10-14 07:52:39 -06:00
96fd13c1a0
prog/tests: Fix MSVC build.
2009-10-12 18:05:23 -06:00
cbf46ed670
progs/perf: Fix MSVC build.
2009-10-10 10:45:16 -06:00
76d2ec3a0a
progs/tests: Add tests to Makefile.
2009-10-09 07:24:37 -06:00
023bab675a
progs/perf: Ignores!
2009-10-09 14:00:15 +01:00
d54e9f54d0
progs: Remove unused empty file.
2009-10-09 11:08:17 +01:00
f7455ad7af
progs/tests: Fix MSVC build.
2009-10-08 08:08:11 -06:00
5b4c0b864a
Merge branch 'mesa_7_6_branch'
2009-10-07 20:39:22 +02:00
f36425b569
progs/xdemos: test glXQueryDrawable()
2009-10-07 09:41:38 -06:00
846a6b0695
progs/xdemos: fix swapped parameters to CreatePbuffer()
2009-10-07 09:41:38 -06:00
4b3cbecb3a
progs/test: Fix MSVC build.
2009-10-07 07:54:31 -06:00
9c778a90ea
progs/tests: fix MSVC build.
2009-10-06 16:02:47 -06:00
017fae04ec
progs/perf: Fix MSVC build.
2009-10-06 09:13:14 -06:00
55770d09c1
Merge branch 'mesa_7_6_branch'
...
Conflicts:
src/gallium/auxiliary/util/u_cpu_detect.c
2009-10-05 14:42:08 -06:00
a15d9ca9cc
Fix building of GLSL demos which use M_PI
...
Some <math.h> files do not define M_PI, in which case, provide our own definition
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-10-05 11:07:23 -06:00
bb659f6e53
progs/tests: additional debug code
2009-10-01 16:43:22 -06:00
15c57648cd
objviewer: remove disabled code
2009-10-01 13:14:50 -06:00
9745e26adb
objviewer: mouse/keyboard info in README file
2009-10-01 13:14:50 -06:00
8d93a4c639
objview: clean up drawing VBO code
2009-10-01 13:14:50 -06:00
c7c62521fb
objview: set skybox texture filter
2009-10-01 13:14:50 -06:00
336994e54c
objview: check GL version/extension
2009-10-01 13:14:49 -06:00
ca1bda552d
progs/objviewer: Wavefront .obj file loader/viewer demo
...
Adapted from code written by Nate Robins. See README.txt.
2009-10-01 13:14:48 -06:00
e82b02c7e8
progs/egl: Make demo3 work again.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-09-30 08:15:30 -06:00
28c2190336
progs/egl: Check EGL_MESA_screen_surface is supported in demo2.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-09-30 08:15:30 -06:00
e0b2848f4f
progs/egl: Fix a crash in demo1.
...
The variable "configs" in main() is used without initialization.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-09-30 08:15:30 -06:00
fa8df0c40d
progs/egl: Replace EGL_i915 by EGL_DEFAULT_DISPLAY.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-09-30 08:15:30 -06:00
6920a355c1
progs/perf: Include local headers before installed headers.
...
Fixes compilation errors on platforms with older installed GL headers.
2009-09-28 09:03:26 -06:00
653ae04bea
progs/tests: print usage info upon SPACE/u
2009-09-28 08:44:43 -06:00
c8de476189
progs/tests: re-indent mipmap_limits.c
2009-09-28 08:44:43 -06:00
6c6896bd25
progs/tests: disable texturing before printing text
2009-09-27 18:02:02 -06:00
bcca927562
progs/rbug: Link to math
2009-09-26 12:36:01 -07:00
c9ddd6f810
progs/perf: glGenerateMipmap() test
2009-09-24 19:38:04 -06:00
09a23ac3c1
progs/perf: fix warnings in readpixels test
2009-09-24 16:52:14 +01:00
d93f022936
progs/perf: fix typo in sconscript
2009-09-24 16:50:27 +01:00
6e0b56edf8
progs/perf: accept GL3.x also
2009-09-24 16:43:15 +01:00
fa0816b17c
progs/perf: added glReadPixels benchmark
2009-09-23 14:05:05 -06:00
489f8bc86f
progs/perf: also request a stencil buffer
2009-09-23 14:05:05 -06:00
a0549f6634
progs/perf: Actually bind the newly created vbo.
2009-09-23 20:24:35 +02:00
890679d432
Merge branch 'softpipe-opt'
...
Conflicts:
progs/demos/cubemap.c
src/gallium/drivers/softpipe/sp_tex_sample.c
src/gallium/drivers/softpipe/sp_texture.c
2009-09-23 17:37:28 +01:00
aae77319c0
progs/perf: set TexSubImage4=FALSE
2009-09-23 08:06:37 -06:00
d04fa73cec
progs/perf: added glCopyTex[Sub]Image2D test
2009-09-22 15:39:05 -06:00
da0e4e557b
progs/perf: test glGetTexImage() also
2009-09-22 12:26:12 -06:00
67d7021ae0
progs/perf: add missing texture enable in fbobind.c
2009-09-22 11:15:11 -06:00
ed113da12e
progs/perf: added fbobind.c test to test FBO binding speed
2009-09-22 11:15:11 -06:00
cfb0f2489d
progs/perf: added PerfExtensionSupported() helper
2009-09-22 11:15:11 -06:00
0ec26cce36
teximage: add more tests, image formats
...
Add a test which creates a new texture from scratch before uploading.
Add more image formats.
Don't run all tests on all image formats.
2009-09-22 18:00:11 +01:00
bae2d58827
progs/perf: add another VBO test for Create/Draw/Destroy pattern
...
Report both MB/sec and draw/sec.
2009-09-22 09:53:35 -06:00
7e5004b298
progs/perf: simplify the code
2009-09-22 09:43:08 -06:00
aa80851e16
progs/perf: fix comment
2009-09-22 09:29:27 -06:00
32979ae15f
progs/perf: updated comments
2009-09-22 07:50:12 -06:00
6a09c9d2d8
progs/perf: make teximage results easier to read, more reproducible
...
Always run the same tests on different drivers, give zero results
where test image is too big for driver.
Add a newline between groups of tests.
2009-09-22 12:35:56 +01:00
89f2799dac
progs/perf: reset row_length after subimage test
...
Also test fewer sizes in teximage generally.
2009-09-22 11:58:09 +01:00
Brian Paul
Vinson Lee
Keith Whitwell
Michal Krol
Andre Maasikas
Ian Romanick
Michel Dänzer
José Fonseca
Jakob Bornecrantz
Tom Fogal
Chia-I Wu
Eric Anholt
Alex Deucher
Nicolai Hähnle
Jon TURNEY
Jakob Bornecrantz