Commit Graph

460 Commits

Author SHA1 Message Date
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
Brian Paul 6a495d26af demos: move streaming_rect.c demo to tests/ 2009-04-18 12:55:55 -06:00
Brian Paul 118856641f demos: move glslnoise.c demo to glsl/noise2.c 2009-04-18 12:54:27 -06:00
Brian Paul 6aa6ae8cff demos: fix error string, comment 2009-03-12 09:31:59 -06:00
Keith Whitwell 1e074dcb7b demos: use glGenerateMipmapEXT entrypoint in cubemap.c
glGenerateMipmap() is part of ARB_framebuffer_object, which many mesa
drivers don't advertise.  Add check for EXT_framebuffer_object.
2009-03-12 14:30:49 +00:00
Brian Paul 0e28e1a72f demos: in progs/demos/cubemap.c press c/f to cycle through clamp/filter modes
Also generate a mipmap for the default checker images.
2009-03-09 11:49:57 -06:00
Keith Whitwell b258320dbd engine: also print fps data to stdout
Useful for figuring out how much of a perf impact the glBitmap fps
display has on a given driver.
2009-03-06 21:00:18 +00:00
Keith Whitwell 39a1a24b3f demos/engine: respect display list mode when drawing pistons 2009-03-03 15:40:14 +00:00
Keith Whitwell e6479c6250 demos: add some fflushes for windows 2009-02-24 12:14:50 +00:00
Jakob Bornecrantz 54e20828e6 demos: Add polygon mode point to isosurf 2009-02-13 17:53:49 +01:00
José Fonseca 7ef8e4e181 progs: Prevent clash with min macro. 2009-02-12 13:54:55 +00:00
Brian Paul 5340b6dff7 Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.

Conflicts:

	progs/demos/Makefile
	src/mesa/main/state.c
	src/mesa/main/texenvprogram.c
2009-02-10 16:44:02 -07:00
Brian 028780a809 demos: remove OSMESA stuff from Makefile 2009-02-09 19:40:10 -07:00
Brian Paul e97681c7f5 mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge

Conflicts:

	Makefile
	docs/relnotes-7.4.html
	docs/relnotes.html
	src/mesa/drivers/dri/i965/brw_wm.h
	src/mesa/main/imports.c
	src/mesa/main/mtypes.h
	src/mesa/main/texcompress.c
	src/mesa/main/texenvprogram.c
	src/mesa/main/version.h
	src/mesa/vbo/vbo_exec_api.c
	src/mesa/vbo/vbo_save_draw.c
2009-02-09 09:22:22 -07:00
Brian Paul c06c74c0b8 demos: remove unused function 2009-02-04 16:33:25 -07:00
Brian Paul 906c60d0b7 demos: silence uninitialized var warning 2009-02-04 16:33:25 -07:00
José Fonseca 9aa73cfae8 progs: Get more samples building on windows. 2009-02-01 12:00:17 +00:00
José Fonseca efdb7799d3 progs: Fix isosurf. 2009-01-24 16:47:50 +00:00
José Fonseca 2e61d136c2 progs: Port most of the demos to glew.
A couple of test weren't ported due to glew breakage -- it undefines
GLAPIENTRY.
2009-01-24 16:39:49 +00:00
Brian Paul 6c14bdc72f demos: all glutDestroyWindow() upon exit to test query object clean-up 2008-12-18 14:17:06 -07:00
Brian Paul f43019b226 demos: all glutDestroyWindow() upon exit to test query object clean-up 2008-12-18 11:11:59 -07:00
Alan Hourihane c4c86bbd16 Merge commit 'origin/master' into gallium-0.2 2008-11-28 16:19:10 +00:00
Brian Paul e23122d309 demos: press SPACE to toggle fbo_firecube animation 2008-11-26 09:00:44 -07:00
Jakob Bornecrantz 51af35b7cc progs: Add ignores 2008-11-24 20:05:47 +01:00
José Fonseca 72ebf4fd03 scons: Build progs.
Just demos and trivial dirs for starters.
2008-11-21 10:44:30 +09:00