summaryrefslogtreecommitdiffstats
path: root/progs/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-273-9/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h
| * progs/demos: Silence warn_unused_result warnings.Vinson Lee2009-12-263-9/+25
| |
* | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * progs/demos: Silence compiler warning in morph3d.c.Vinson Lee2009-12-181-1/+1
| |
| * progs/demos: Use C-style comment.Vinson Lee2009-12-181-1/+1
| |
* | progs/demos: report pixel rate in million pixels / secBrian Paul2009-12-211-4/+5
| |
* | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-071-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | 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.
| * progs/demos: Fix memory leak in projtex.c.Vinson Lee2009-12-071-0/+1
| |
| * progs/demos: Fix memory leak in ray.c.Vinson Lee2009-12-031-0/+2
| | | | | | | | (cherry picked from commit 6b480dc21dd489d48685b2268e495218aea74293)
| * progs/demos: Fix memory leak in projtex.c.Vinson Lee2009-12-031-0/+3
| | | | | | | | (cherry picked from commit ee555e3d69c8820f27e71e5ebc028a768cef7d0b)
| * progs/demos: Fix memory leak in ipers.c.Vinson Lee2009-12-031-0/+2
| | | | | | | | (cherry picked from commit a1afe303deda320aadacdaf5b1c72631ca3f734f)
| * progs/demos: Fix memory leak in fslight.c.Vinson Lee2009-12-031-0/+1
| | | | | | | | (cherry picked from commit aef3218f0bb48fdb286d2008ee07e507ea8aa98e)
* | Merge commit 'mesa_7_6_branch' into mesa_7_7_branchJakob Bornecrantz2009-12-021-2/+0
|\| | | | | | | | | Conflicts: src/mesa/main/version.h
| * progs/demos: remove unused glFogCoordPointer_ext varBrian Paul2009-12-011-2/+0
| |
* | progs/demos: silence warningsBrian Paul2009-11-172-2/+3
| |
* | progs/demos: Fix memory leak in ray.c.Vinson Lee2009-11-161-0/+2
| |
* | progs/demos: Fix memory leak in projtex.c.Vinson Lee2009-11-161-0/+3
| |
* | progs/demos: Fix memory leak in ipers.c.Vinson Lee2009-11-161-0/+2
| |
* | progs/demos: Fix memory leak in fslight.c.Vinson Lee2009-11-161-0/+1
| |
* | progs/demos: add fps to multiarbKeith Whitwell2009-10-231-0/+16
| |
* | progs/demos: try different depth formats in fbo_firecube.cBrian Paul2009-10-141-8/+28
| |
* | Merge branch 'softpipe-opt'Keith Whitwell2009-09-231-0/+16
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: progs/demos/cubemap.c src/gallium/drivers/softpipe/sp_tex_sample.c src/gallium/drivers/softpipe/sp_texture.c
| * | progs/demos: add fps output to cubemapKeith Whitwell2009-08-231-0/+16
| | |
* | | progs/demos: use non-default texobj in cubemap.cBrian Paul2009-09-151-0/+5
| | |
* | | progs/demos: create a texture object in lodbias.cBrian Paul2009-09-151-0/+4
| | | | | | | | | | | | | | | | | | 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.
* | | progs/demos: added RGB invert optionBrian Paul2009-09-081-0/+22
| |/ |/|
* | mesa: gitignoreYounes Manton2009-08-261-0/+1
| |
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-08-181-4/+24
|\ \
| * | progs/demos: print more info in fbotexture.cBrian Paul2009-08-141-4/+24
| | |
* | | demos/cubemap: Add support for GL_ARB_seamless_cube_mapIan Romanick2009-08-141-16/+38
| |/ |/|
* | demos: use glEnable/DisableClientState() for vertex arraysBrian Paul2009-07-081-2/+2
| |
* | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-07-031-5/+20
|\| | | | | | | | | | | Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
| * progs/isosurf: add materials mode for glVertex + TRISTRIPKeith Whitwell2009-06-301-5/+20
| |
* | demos: Set the depth mask correctly to get the desired blendingIan Romanick2009-06-302-4/+4
| |
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-261-2/+6
|\| | | | | | | | | | | | | | | Conflicts: Makefile src/gallium/drivers/softpipe/sp_screen.c src/mesa/main/version.h
| * demos: improve argv parsing in fslight.cBrian Paul2009-06-261-2/+6
| |
* | demos: make cubemap work without EXT_fbo supportRoland Scheidegger2009-06-201-4/+13
| | | | | | | | | | use SGIS_generate_mipmap if EXT_fbo support (for manual mipmap generation) is not available.
* | Merge branch 'mesa_7_5_branch'Thomas Hellstrom2009-06-152-38/+77
|\| | | | | | | | | | | Conflicts: progs/util/extfuncs.h
| * demos: update fbotexture.c to use EXT or ARB functions exclusivelyBrian Paul2009-06-122-38/+77
| | | | | | | | | | | | | | | | | | 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).
* | demos: delete vertex array objects upon exitBrian Paul2009-05-071-0/+2
|/
* demos: silence warningBrian Paul2009-04-301-1/+1
|
* progs: add fflushes for cygwinKeith Whitwell2009-04-281-0/+2
|
* demos: Clean up allocated Textures and Display Lists when demo quitShuang He2009-04-274-0/+47
|
* shadowtex: fflush stdout for cygwinKeith Whitwell2009-04-241-0/+2
|
* demos/readpix: add option to draw triangle instead of drawpixKeith Whitwell2009-04-241-5/+62
|
* mesa/progs: fix scons build after recent demo movesKeith Whitwell2009-04-201-6/+4
|
* progs/demos: Update ignoreJakob Bornecrantz2009-04-191-0/+4
|
* demos: updated .gitignore listBrian Paul2009-04-181-6/+3
|
* demos: move demos/texobj.c to tests/Brian Paul2009-04-182-285/+0
|
* demos: move demos/occlude.c (old HP extension) to testsBrian Paul2009-04-181-234/+0
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 19:22:49 +0000