Brian Paul
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
Ian Romanick
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
Vinson Lee
7d84169865
progs/demos: Fix memory leak in projtex.c.
2009-12-07 12:31:08 -08:00
Vinson Lee
b803abbaad
progs/demos: Fix memory leak in ray.c.
...
(cherry picked from commit 6b480dc21d
2009-12-03 22:49:18 -08:00
Vinson Lee
5820dae4ec
progs/demos: Fix memory leak in projtex.c.
...
(cherry picked from commit ee555e3d69
2009-12-03 22:44:55 -08:00
Vinson Lee
fc5f07de1a
progs/demos: Fix memory leak in ipers.c.
...
(cherry picked from commit a1afe303de
2009-12-03 22:38:44 -08:00
Vinson Lee
d245a951f3
progs/demos: Fix memory leak in fslight.c.
...
(cherry picked from commit aef3218f0b
2009-12-03 22:36:37 -08:00
Jakob Bornecrantz
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
Brian Paul
ba97b98842
progs/demos: remove unused glFogCoordPointer_ext var
2009-12-01 12:23:07 -07:00
Brian Paul
1888a72765
progs/demos: silence warnings
2009-11-17 16:16:30 -07:00
Vinson Lee
6b480dc21d
progs/demos: Fix memory leak in ray.c.
2009-11-16 18:06:40 -08:00
Vinson Lee
ee555e3d69
progs/demos: Fix memory leak in projtex.c.
2009-11-16 16:31:34 -08:00
Vinson Lee
a1afe303de
progs/demos: Fix memory leak in ipers.c.
2009-11-16 15:44:52 -08:00
Vinson Lee
aef3218f0b
progs/demos: Fix memory leak in fslight.c.
2009-11-16 14:56:07 -08:00
Keith Whitwell
19403935aa
progs/demos: add fps to multiarb
2009-10-23 13:56:07 +01:00
Brian Paul
91bd87c06e
progs/demos: try different depth formats in fbo_firecube.c
2009-10-14 19:13:32 -06:00
Keith Whitwell
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
Brian Paul
0b0fc4072f
progs/demos: use non-default texobj in cubemap.c
2009-09-15 18:17:42 -06:00
Brian Paul
7f86da6c60
progs/demos: create a texture object in lodbias.c
...
Before, we were using the default texture object (name=0). This caused
the intel_generate_mipmap() path to fail since passing texture=0 to
glFramebufferTexture2DEXT() causes us to _unbind_ the texture if present.
2009-09-15 18:17:42 -06:00
Brian Paul
079ae4c38c
progs/demos: added RGB invert option
2009-09-08 16:45:07 -06:00
Younes Manton
cefe9c4f39
mesa: gitignore
2009-08-26 20:15:00 -04:00
Keith Whitwell
75312b6555
progs/demos: add fps output to cubemap
2009-08-23 23:53:41 +01:00
Brian Paul
73fc09a7bf
Merge branch 'mesa_7_5_branch'
2009-08-18 17:55:27 -06:00
Brian Paul
e8957f4800
progs/demos: print more info in fbotexture.c
2009-08-14 17:30:32 -06:00
Ian Romanick
8b0b33530c
demos/cubemap: Add support for GL_ARB_seamless_cube_map
2009-08-14 16:28:51 -07:00
Brian Paul
820436f978
demos: use glEnable/DisableClientState() for vertex arrays
2009-07-08 13:58:30 -06:00
Jakob Bornecrantz
862488075c
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/main/dlist.c
src/mesa/vbo/vbo_save_api.c
2009-07-03 18:53:58 +02:00
Ian Romanick
f359165a82
demos: Set the depth mask correctly to get the desired blending
2009-06-30 17:29:52 -07:00
Keith Whitwell
a9ae89d104
progs/isosurf: add materials mode for glVertex + TRISTRIP
2009-06-30 16:14:08 +01:00
Brian Paul
eb1eee03a6
demos: improve argv parsing in fslight.c
2009-06-26 13:16:32 -06:00
Brian Paul
a18e209edb
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/gallium/drivers/softpipe/sp_screen.c
src/mesa/main/version.h
2009-06-26 17:07:07 -06:00
Roland Scheidegger
7a5c5b9af3
demos: make cubemap work without EXT_fbo support
...
use SGIS_generate_mipmap if EXT_fbo support (for manual mipmap generation)
is not available.
2009-06-20 00:28:38 +02:00
Thomas Hellstrom
f5888d9ca5
Merge branch 'mesa_7_5_branch'
...
Conflicts:
progs/util/extfuncs.h
2009-06-15 11:43:48 +02:00
Brian Paul
fb64365642
demos: update fbotexture.c to use EXT or ARB functions exclusively
...
When the -arb option is specified we use GL_ARB_framebuffer_object intead
of GL_EXT_framebuffer_object.
For some vendors' OpenGL it's important to call the ARB entrypoints
instead of the EXT entrypoints to get correct behaviour. Use some
function pointer tricks to do this (instead of GLEW).
2009-06-12 08:15:33 -06:00
Brian Paul
56cfa4de91
demos: delete vertex array objects upon exit
2009-05-07 14:34:09 -06:00
Brian Paul
3dfe672c85
demos: silence warning
2009-04-30 17:03:54 -06:00
Keith Whitwell
fd402791f9
progs: add fflushes for cygwin
2009-04-28 18:15:17 +01:00
Shuang He
e326600609
demos: Clean up allocated Textures and Display Lists when demo quit
2009-04-27 07:13:33 -06:00
Keith Whitwell
a86ef37655
shadowtex: fflush stdout for cygwin
2009-04-24 12:16:39 +01:00
Keith Whitwell
eb5d96968f
demos/readpix: add option to draw triangle instead of drawpix
2009-04-24 10:09:14 +01:00
Keith Whitwell
d017749b3e
mesa/progs: fix scons build after recent demo moves
2009-04-20 16:17:50 +01:00
Jakob Bornecrantz
90a23e340f
progs/demos: Update ignore
2009-04-19 16:24:29 +01:00
Brian Paul
3595732f28
demos: updated .gitignore list
2009-04-18 13:18:44 -06:00
Brian Paul
d61070b659
demos: move demos/texobj.c to tests/
2009-04-18 13:12:50 -06:00
Brian Paul
30e80f6e55
demos: move demos/occlude.c (old HP extension) to tests
2009-04-18 13:10:51 -06:00
Brian Paul
22af013f85
demos: move tests/dinoshade.c to demos/
2009-04-18 13:08:48 -06:00
Brian Paul
49c3e7172d
demos: move tests/projtex.c to demos/
...
And fix compiler warnings.
2009-04-18 13:05:51 -06:00
Brian Paul
292e192093
demos: move tests/fbotexture.c to demos/
2009-04-18 13:00:48 -06:00
Brian Paul
f47495ec42
demos: move texdown.c to tests/
2009-04-18 12:58:00 -06:00
Brian Paul
dfd69a27f8
demos: move glutfx demo to tests/
2009-04-18 12:57:13 -06:00
