summaryrefslogtreecommitdiff
path: root/progs/xdemos
AgeCommit message (Collapse)Author
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-04progs/xdemos: fix some visual/fbconfig logic in glxinfo.cBrian Paul
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-04progs/xdemos: Silence unused value warnings in sharedtex_mt.c.Vinson Lee
(cherry picked from commit 8556fad75124e1ade9af095e112ebb6ac5cbff61)
2009-12-04progs/xdemos: Fix memory leak in pbdemo.c.Vinson Lee
(cherry picked from commit e0857962b911ef317238498305651515d83029ae)
2009-12-04progs/xdemos: Add missing break statement in offset.c.Vinson Lee
(cherry picked from commit 4ab8dbe5935d5c946cbc9af6982461073a784d07)
2009-12-03progs/xdemos: Remove duplicate code in glxinfo.c.Vinson Lee
(cherry picked from commit a4720a1a3206dd2edecf47a21fce547a79b67610)
2009-12-03progs/xdemos: Fix memory leak in glxinfo.c.Vinson Lee
(cherry picked from commit f080567f4c4018c4885c105a154cb0eb39e6234f)
2009-12-03progs/xdemos: Add assert in corender.c.Vinson Lee
(cherry picked from commit 66a4ec14c38d407256545e0cf31c98974d621fe4)
2009-11-20progs/xdemos: Fix memory leak in pbinfo.c.Vinson Lee
2009-11-20progs/xdemos: Fix memory leak in pbdemo.c.Vinson Lee
2009-11-20progs/xdemos: Fix memory leak in glxpbdemo.c.Vinson Lee
2009-11-20progs/xdemos: Remove duplicate code in glxinfo.c.Vinson Lee
2009-11-20progs/xdemos: Add assert in corender.c.Vinson Lee
2009-11-20progs/xdemos: Silence unused value warnings in sharedtex_mt.c.Vinson Lee
2009-11-20progs/xdemos: Fix memory leak in glxinfo.c.Vinson Lee
2009-11-19progs/xdemos: Add missing break statement in offset.c.Vinson Lee
2009-11-17progs/xdemos: change //-style commentsBrian Paul
2009-11-17progs/xdemos: added -lX11 -lpthread for GNU gold linkerBrian Paul
2009-10-22progs/xdemos: fix command line flag typoBrian Paul
2009-10-07progs/xdemos: test glXQueryDrawable()Brian Paul
2009-10-07progs/xdemos: fix swapped parameters to CreatePbuffer()Brian Paul
2009-08-19progs/xdemos: add multictx to .gitignoreBrian Paul
2009-08-07progs/xdemos: added multictx.c (multi-context rendering demo)Brian Paul
Create one window and render into it with two GLX contexts. Setup the rendering state differently for each context to be sure there's no state "bleeding" between contexts.
2009-08-07glxgears: make functions static, update commentsBrian Paul
2009-08-05Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: src/mesa/main/state.c
2009-08-03xdemo/glxswapcontrol: Move get_framge_usage after the swap.Pauli Nieminen
This fixes the problem that first frame would report bogus usage values. Problem was caused because get_frame_usage returned data from previous buffer swap. Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
2009-08-03xdemos/glxcontexts: Don't leak visual info when choosing visual again.Pauli Nieminen
Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
2009-07-06demos: Fix vsync checking in glxgearsIan Romanick
Of course glXGetVideoSyncSGI doesn't return the swap interval. The feature only exists in the Mesa extension... which is the whole reason I created the Mesa extension! Note that the Mesa extension allows drivers to default to a swap interval of 0. If the Mesa extension exists, use its value. Only consider the SGI extension when the Mesa extension is not available. Fixes bug #22604.
2009-07-08demos: use glEnable/DisableClientState() for vertex arraysBrian Paul
2009-06-30xdemos: Fix xdemos which default to using display :0.0 to default to $DISPLAYJon TURNEY
Fix xdemos which default to using display :0.0 to default to $DISPLAY, this is kind of irritating when testing on a display other than :0.0 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-06-23demos: fix issues in glxcontexts.cBrian Paul
The reshape() function was called when there was no GLX context so the viewport/modelview/projection setup wasn't doing anything. Move the call to reshape() into draw(). Also, remove -stereo, -fullscreen options and do some general clean-up.
2009-04-24demos: ensure display lists are destroyed for next generationAlan Hourihane
2009-03-24demos: add LDFLAGS for corender target, bug 20844Brian Paul
2009-03-17xdemos: Fix sharedtex_mt.Thomas Hellstrom
1) Don't allow multiple threads sharing current context, even if they are mutex protected. 2) Remove all XLockDisplay(), XUnLockDisplay() calls, as they were only workarounds for xcb. Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
2009-03-14mesa: .gitignoreYounes Manton
2009-03-13xdemos: Add multithreaded sharedtex_mt.Thomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
2009-03-12demos: move declaration before codeBrian Paul
2009-03-11xdemos: On termination with `esc` close the contexts correctly.Alan Hourihane
2009-02-16demos: fix glxpixmap and call glXWaitGL before calling XCopyArea.Alan Hourihane
2009-02-11demos: better error message for overlay.c, see bug 20055Brian Paul
2009-02-09mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul
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-01glxgears: No, really. Fix the dyslexia.Ian Romanick
2009-01-30Fix dyslexia.Ian Romanick
2009-01-30glxgears: Log a message if synched to vblankIan Romanick
Tries to use either GLX_MESA_swap_control or GLX_SGI_video_sync to detect whether the display is synchronized to the vertical blank. If it detects this, a message will be printed. HOPEFULLY this will prevent some of the bug reports such as "glxgears only gets 59.7fps. What's wrong with my driver?"
2008-11-15Merge commit 'origin/master' into gallium-0.2Keith Whitwell
Conflicts: src/mesa/shader/prog_print.c
2008-11-12Add glsync demo program from jbarnes for testing vblank synchronization.Eric Anholt
2008-10-27Merge commit 'origin/master' into gallium-0.2Alan Hourihane
2008-10-16glxswapcontrol: added -fullscreen optionBrian Paul
2008-10-16glxgears: for fullscreen, disable window borders the right wayBrian Paul
2008-09-21Remove CVS keywords.Keith Whitwell
Cherry-picked from gallium-0.1 Conflicts: src/glu/sgi/libnurbs/interface/bezierEval.h src/glu/sgi/libnurbs/interface/bezierPatch.h src/glu/sgi/libnurbs/interface/bezierPatchMesh.h src/glu/sgi/libnurbs/internals/dataTransform.h src/glu/sgi/libnurbs/internals/displaymode.h src/glu/sgi/libnurbs/internals/sorter.h src/glu/sgi/libnurbs/nurbtess/definitions.h src/glu/sgi/libnurbs/nurbtess/directedLine.h src/glu/sgi/libnurbs/nurbtess/gridWrap.h src/glu/sgi/libnurbs/nurbtess/monoChain.h src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h src/glu/sgi/libnurbs/nurbtess/partitionX.h src/glu/sgi/libnurbs/nurbtess/partitionY.h src/glu/sgi/libnurbs/nurbtess/polyDBG.h src/glu/sgi/libnurbs/nurbtess/polyUtil.h src/glu/sgi/libnurbs/nurbtess/primitiveStream.h src/glu/sgi/libnurbs/nurbtess/quicksort.h src/glu/sgi/libnurbs/nurbtess/rectBlock.h src/glu/sgi/libnurbs/nurbtess/sampleComp.h src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h src/glu/sgi/libnurbs/nurbtess/sampledLine.h src/glu/sgi/libnurbs/nurbtess/searchTree.h src/glu/sgi/libnurbs/nurbtess/zlassert.h src/glu/sgi/libutil/error.c src/glu/sgi/libutil/glue.c src/glu/sgi/libutil/gluint.h src/glu/sgi/libutil/project.c src/glu/sgi/libutil/registry.c src/glx/x11/glxclient.h src/glx/x11/glxext.c src/mesa/drivers/dri/ffb/ffb_dd.h src/mesa/drivers/dri/ffb/ffb_points.h src/mesa/drivers/dri/gamma/gamma_context.h src/mesa/drivers/dri/gamma/gamma_macros.h src/mesa/drivers/dri/i810/i810context.h src/mesa/drivers/dri/r128/r128_dd.h src/mesa/drivers/dri/tdfx/tdfx_dd.h