summaryrefslogtreecommitdiffstats
path: root/progs/xdemos
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-221-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c src/gallium/auxiliary/pipebuffer/Makefile src/gallium/auxiliary/pipebuffer/SConscript src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/tgsi/tgsi_scan.c src/gallium/drivers/i915/i915_surface.c src/gallium/drivers/i915/i915_texture.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_prim_vbuf.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/winsys/drm/intel/gem/intel_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c src/mesa/state_tracker/st_cb_clear.c
| * glxgears: unbind current context before "destroying" itMarcin Slusarz2010-01-181-0/+1
| | | | | | | | | | | | | | glXDestroyContext does not destroy the context if it's still connected to some window. Unbind context from window to test it. Signed-off-by: Brian Paul <[email protected]>
* | progs/xdemos: add z/Z keys for scaling the renderingBrian Paul2010-01-221-0/+10
| |
* | Merge branch 'mesa_7_7_branch'Jakob Bornecrantz2010-01-142-1/+2
|\| | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
| * progs/xdemos: Remove unnecessary header from corender.c.Vinson Lee2010-01-111-1/+0
| |
| * progs/demos: Check upper bounds of input in manywin.c.Vinson Lee2010-01-101-0/+2
| |
* | Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesaJesse Barnes2010-01-114-41/+274
|\ \ | |/ |/| | | | | | | Conflicts due to DRI1 removal: src/mesa/drivers/dri/intel/intel_context.c src/mesa/drivers/dri/intel/intel_screen.c
| * xdemos/glsync: handle no sync method betterJesse Barnes2010-01-081-8/+4
| | | | | | | | Print out count, finish rendering, etc. Makes the -sn option more useful.
| * xdemos/glsync: check glXMakeCurrent return valueJesse Barnes2010-01-081-1/+5
| | | | | | | | Since this program is used for testing, catching this case can be helpful.
| * xdemos/glsync: Make glsync test draw a rectangleJesse Barnes2010-01-081-34/+49
| | | | | | | | | | Doing simple buffer clears isn't enough to actually allocate render buffers, we need to do real drawing.
| * xdemos/glsync: Add swap interval support to glsync testJesse Barnes2010-01-081-3/+17
| |
| * DRI2: add OML_sync_control supportJesse Barnes2010-01-083-0/+204
| | | | | | | | | | | | | | | | Add OML_sync_control support, along with a simple program for testing it. This means adding support for the DRI2GetMSC, DRI2WaitMSC and DRI2WaitSBC requests. Signed-off-by: Jesse Barnes <[email protected]>
* | progs/xdemos: Check for string overflow.Vinson Lee2010-01-061-3/+29
| |
* | progs/xdemos: Check for string overflow.Vinson Lee2010-01-061-0/+4
| |
* | progs/xdemos: Remove comma at end of enumerator list.Vinson Lee2010-01-061-1/+1
| |
* | progs/xdemos: Use temporary variables.Vinson Lee2010-01-061-2/+2
| | | | | | | | This was missed from the previous commit to glxheads.c.
* | progs/xdemos: Prevent possible string overflow.Vinson Lee2010-01-061-1/+27
|/
* 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/xdemos: Use C-style comment.Vinson Lee2009-12-191-1/+1
| |
* | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-151-2/+2
|\| | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c
| * progs/xdemos: Silence compiler warnings in glxinfo.c.Vinson Lee2009-12-121-2/+2
| |
* | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-071-3/+12
|\| | | | | | | | | | | | | | | | | | | | | | | 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/xdemos: fix some visual/fbconfig logic in glxinfo.cBrian Paul2009-12-041-3/+12
| | | | | | | | | | | | | | 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.
| * progs/xdemos: Silence unused value warnings in sharedtex_mt.c.Vinson Lee2009-12-041-4/+4
| | | | | | | | (cherry picked from commit 8556fad75124e1ade9af095e112ebb6ac5cbff61)
| * progs/xdemos: Fix memory leak in pbdemo.c.Vinson Lee2009-12-041-0/+1
| | | | | | | | (cherry picked from commit e0857962b911ef317238498305651515d83029ae)
| * progs/xdemos: Add missing break statement in offset.c.Vinson Lee2009-12-041-0/+1
| | | | | | | | (cherry picked from commit 4ab8dbe5935d5c946cbc9af6982461073a784d07)
| * progs/xdemos: Remove duplicate code in glxinfo.c.Vinson Lee2009-12-031-2/+0
| | | | | | | | (cherry picked from commit a4720a1a3206dd2edecf47a21fce547a79b67610)
| * progs/xdemos: Fix memory leak in glxinfo.c.Vinson Lee2009-12-031-1/+3
| | | | | | | | (cherry picked from commit f080567f4c4018c4885c105a154cb0eb39e6234f)
| * progs/xdemos: Add assert in corender.c.Vinson Lee2009-12-031-0/+1
| | | | | | | | (cherry picked from commit 66a4ec14c38d407256545e0cf31c98974d621fe4)
* | progs/xdemos: Fix memory leak in pbinfo.c.Vinson Lee2009-11-201-0/+1
| |
* | progs/xdemos: Fix memory leak in pbdemo.c.Vinson Lee2009-11-201-0/+1
| |
* | progs/xdemos: Fix memory leak in glxpbdemo.c.Vinson Lee2009-11-201-0/+1
| |
* | progs/xdemos: Remove duplicate code in glxinfo.c.Vinson Lee2009-11-201-2/+0
| |
* | progs/xdemos: Add assert in corender.c.Vinson Lee2009-11-201-0/+1
| |
* | progs/xdemos: Silence unused value warnings in sharedtex_mt.c.Vinson Lee2009-11-201-4/+4
| |
* | progs/xdemos: Fix memory leak in glxinfo.c.Vinson Lee2009-11-201-1/+3
| |
* | progs/xdemos: Add missing break statement in offset.c.Vinson Lee2009-11-191-0/+1
| |
* | progs/xdemos: change //-style commentsBrian Paul2009-11-171-1/+1
| |
* | progs/xdemos: added -lX11 -lpthread for GNU gold linkerBrian Paul2009-11-171-0/+3
|/
* progs/xdemos: fix command line flag typoBrian Paul2009-10-221-1/+1
|
* progs/xdemos: test glXQueryDrawable()Brian Paul2009-10-071-0/+15
|
* progs/xdemos: fix swapped parameters to CreatePbuffer()Brian Paul2009-10-071-1/+1
|
* progs/xdemos: add multictx to .gitignoreBrian Paul2009-08-191-0/+1
|
* progs/xdemos: added multictx.c (multi-context rendering demo)Brian Paul2009-08-072-0/+586
| | | | | | 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.
* glxgears: make functions static, update commentsBrian Paul2009-08-071-10/+3
|
* Merge branch 'mesa_7_5_branch'Brian Paul2009-08-052-2/+6
|\ | | | | | | | | | | Conflicts: src/mesa/main/state.c
| * xdemo/glxswapcontrol: Move get_framge_usage after the swap.Pauli Nieminen2009-08-031-2/+3
| | | | | | | | | | | | | | | | 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 <[email protected]>
| * xdemos/glxcontexts: Don't leak visual info when choosing visual again.Pauli Nieminen2009-08-031-0/+3
| | | | | | | | Signed-off-by: Pauli Nieminen <[email protected]>
* | demos: use glEnable/DisableClientState() for vertex arraysBrian Paul2009-07-081-4/+4
|/
* demos: Fix vsync checking in glxgearsIan Romanick2009-07-061-19/+16
| | | | | | | | | | 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.