summaryrefslogtreecommitdiff
path: root/progs/demos
AgeCommit message (Collapse)Author
2009-12-31Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c
2009-12-27Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
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
2009-12-26progs/demos: Silence warn_unused_result warnings.Vinson Lee
2009-12-21Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
2009-12-21Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
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-21progs/demos: report pixel rate in million pixels / secBrian Paul
2009-12-18progs/demos: Silence compiler warning in morph3d.c.Vinson Lee
2009-12-18progs/demos: Use C-style comment.Vinson Lee
2009-12-18progs/demos: fix glut initialization callsBrian Paul
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-07Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick
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-07progs/demos: Fix memory leak in projtex.c.Vinson Lee
2009-12-03progs/demos: Fix memory leak in ray.c.Vinson Lee
(cherry picked from commit 6b480dc21dd489d48685b2268e495218aea74293)
2009-12-03progs/demos: Fix memory leak in projtex.c.Vinson Lee
(cherry picked from commit ee555e3d69c8820f27e71e5ebc028a768cef7d0b)
2009-12-03progs/demos: Fix memory leak in ipers.c.Vinson Lee
(cherry picked from commit a1afe303deda320aadacdaf5b1c72631ca3f734f)
2009-12-03progs/demos: Fix memory leak in fslight.c.Vinson Lee
(cherry picked from commit aef3218f0bb48fdb286d2008ee07e507ea8aa98e)
2009-12-02Merge commit 'mesa_7_6_branch' into mesa_7_7_branchJakob Bornecrantz
Conflicts: src/mesa/main/version.h
2009-12-01progs/demos: remove unused glFogCoordPointer_ext varBrian Paul
2009-11-17progs/demos: silence warningsBrian Paul
2009-11-16progs/demos: Fix memory leak in ray.c.Vinson Lee
2009-11-16progs/demos: Fix memory leak in projtex.c.Vinson Lee
2009-11-16progs/demos: Fix memory leak in ipers.c.Vinson Lee
2009-11-16progs/demos: Fix memory leak in fslight.c.Vinson Lee
2009-10-23progs/demos: add fps to multiarbKeith Whitwell
2009-10-14progs/demos: try different depth formats in fbo_firecube.cBrian Paul
2009-09-23Merge branch 'softpipe-opt'Keith Whitwell
Conflicts: progs/demos/cubemap.c src/gallium/drivers/softpipe/sp_tex_sample.c src/gallium/drivers/softpipe/sp_texture.c
2009-09-15progs/demos: use non-default texobj in cubemap.cBrian Paul
2009-09-15progs/demos: create a texture object in lodbias.cBrian Paul
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-08progs/demos: added RGB invert optionBrian Paul
2009-08-26mesa: gitignoreYounes Manton
2009-08-23progs/demos: add fps output to cubemapKeith Whitwell
2009-08-18Merge branch 'mesa_7_5_branch'Brian Paul
2009-08-14progs/demos: print more info in fbotexture.cBrian Paul
2009-08-14demos/cubemap: Add support for GL_ARB_seamless_cube_mapIan Romanick
2009-07-08demos: use glEnable/DisableClientState() for vertex arraysBrian Paul
2009-07-03Merge branch 'mesa_7_5_branch'Jakob Bornecrantz
Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
2009-06-30demos: Set the depth mask correctly to get the desired blendingIan Romanick
2009-06-30progs/isosurf: add materials mode for glVertex + TRISTRIPKeith Whitwell
2009-06-26demos: improve argv parsing in fslight.cBrian Paul
2009-06-26Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: Makefile src/gallium/drivers/softpipe/sp_screen.c src/mesa/main/version.h
2009-06-20demos: make cubemap work without EXT_fbo supportRoland Scheidegger
use SGIS_generate_mipmap if EXT_fbo support (for manual mipmap generation) is not available.
2009-06-15Merge branch 'mesa_7_5_branch'Thomas Hellstrom
Conflicts: progs/util/extfuncs.h
2009-06-12demos: update fbotexture.c to use EXT or ARB functions exclusivelyBrian Paul
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-05-07demos: delete vertex array objects upon exitBrian Paul
2009-04-30demos: silence warningBrian Paul
2009-04-28progs: add fflushes for cygwinKeith Whitwell
2009-04-27demos: Clean up allocated Textures and Display Lists when demo quitShuang He
2009-04-24shadowtex: fflush stdout for cygwinKeith Whitwell
2009-04-24demos/readpix: add option to draw triangle instead of drawpixKeith Whitwell
2009-04-20mesa/progs: fix scons build after recent demo movesKeith Whitwell
2009-04-19progs/demos: Update ignoreJakob Bornecrantz
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 23:48:19 +0000