Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_7_branch' | Jakob Bornecrantz | 2010-01-14 | 2 | -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 Lee | 2010-01-11 | 1 | -1/+0 |
| | | |||||
| * | progs/demos: Check upper bounds of input in manywin.c. | Vinson Lee | 2010-01-10 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa | Jesse Barnes | 2010-01-11 | 4 | -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 better | Jesse Barnes | 2010-01-08 | 1 | -8/+4 |
| | | | | | | | | Print out count, finish rendering, etc. Makes the -sn option more useful. | ||||
| * | xdemos/glsync: check glXMakeCurrent return value | Jesse Barnes | 2010-01-08 | 1 | -1/+5 |
| | | | | | | | | Since this program is used for testing, catching this case can be helpful. | ||||
| * | xdemos/glsync: Make glsync test draw a rectangle | Jesse Barnes | 2010-01-08 | 1 | -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 test | Jesse Barnes | 2010-01-08 | 1 | -3/+17 |
| | | |||||
| * | DRI2: add OML_sync_control support | Jesse Barnes | 2010-01-08 | 3 | -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 Lee | 2010-01-06 | 1 | -3/+29 |
| | | |||||
* | | progs/xdemos: Check for string overflow. | Vinson Lee | 2010-01-06 | 1 | -0/+4 |
| | | |||||
* | | progs/xdemos: Remove comma at end of enumerator list. | Vinson Lee | 2010-01-06 | 1 | -1/+1 |
| | | |||||
* | | progs/xdemos: Use temporary variables. | Vinson Lee | 2010-01-06 | 1 | -2/+2 |
| | | | | | | | | This was missed from the previous commit to glxheads.c. | ||||
* | | progs/xdemos: Prevent possible string overflow. | Vinson Lee | 2010-01-06 | 1 | -1/+27 |
|/ | |||||
* | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Brian Paul | 2009-12-21 | 1 | -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 Lee | 2009-12-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-12-15 | 1 | -2/+2 |
|\| | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c | ||||
| * | progs/xdemos: Silence compiler warnings in glxinfo.c. | Vinson Lee | 2009-12-12 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-12-07 | 1 | -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.c | Brian Paul | 2009-12-04 | 1 | -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 Lee | 2009-12-04 | 1 | -4/+4 |
| | | | | | | | | (cherry picked from commit 8556fad75124e1ade9af095e112ebb6ac5cbff61) | ||||
| * | progs/xdemos: Fix memory leak in pbdemo.c. | Vinson Lee | 2009-12-04 | 1 | -0/+1 |
| | | | | | | | | (cherry picked from commit e0857962b911ef317238498305651515d83029ae) | ||||
| * | progs/xdemos: Add missing break statement in offset.c. | Vinson Lee | 2009-12-04 | 1 | -0/+1 |
| | | | | | | | | (cherry picked from commit 4ab8dbe5935d5c946cbc9af6982461073a784d07) | ||||
| * | progs/xdemos: Remove duplicate code in glxinfo.c. | Vinson Lee | 2009-12-03 | 1 | -2/+0 |
| | | | | | | | | (cherry picked from commit a4720a1a3206dd2edecf47a21fce547a79b67610) | ||||
| * | progs/xdemos: Fix memory leak in glxinfo.c. | Vinson Lee | 2009-12-03 | 1 | -1/+3 |
| | | | | | | | | (cherry picked from commit f080567f4c4018c4885c105a154cb0eb39e6234f) | ||||
| * | progs/xdemos: Add assert in corender.c. | Vinson Lee | 2009-12-03 | 1 | -0/+1 |
| | | | | | | | | (cherry picked from commit 66a4ec14c38d407256545e0cf31c98974d621fe4) | ||||
* | | progs/xdemos: Fix memory leak in pbinfo.c. | Vinson Lee | 2009-11-20 | 1 | -0/+1 |
| | | |||||
* | | progs/xdemos: Fix memory leak in pbdemo.c. | Vinson Lee | 2009-11-20 | 1 | -0/+1 |
| | | |||||
* | | progs/xdemos: Fix memory leak in glxpbdemo.c. | Vinson Lee | 2009-11-20 | 1 | -0/+1 |
| | | |||||
* | | progs/xdemos: Remove duplicate code in glxinfo.c. | Vinson Lee | 2009-11-20 | 1 | -2/+0 |
| | | |||||
* | | progs/xdemos: Add assert in corender.c. | Vinson Lee | 2009-11-20 | 1 | -0/+1 |
| | | |||||
* | | progs/xdemos: Silence unused value warnings in sharedtex_mt.c. | Vinson Lee | 2009-11-20 | 1 | -4/+4 |
| | | |||||
* | | progs/xdemos: Fix memory leak in glxinfo.c. | Vinson Lee | 2009-11-20 | 1 | -1/+3 |
| | | |||||
* | | progs/xdemos: Add missing break statement in offset.c. | Vinson Lee | 2009-11-19 | 1 | -0/+1 |
| | | |||||
* | | progs/xdemos: change //-style comments | Brian Paul | 2009-11-17 | 1 | -1/+1 |
| | | |||||
* | | progs/xdemos: added -lX11 -lpthread for GNU gold linker | Brian Paul | 2009-11-17 | 1 | -0/+3 |
|/ | |||||
* | progs/xdemos: fix command line flag typo | Brian Paul | 2009-10-22 | 1 | -1/+1 |
| | |||||
* | progs/xdemos: test glXQueryDrawable() | Brian Paul | 2009-10-07 | 1 | -0/+15 |
| | |||||
* | progs/xdemos: fix swapped parameters to CreatePbuffer() | Brian Paul | 2009-10-07 | 1 | -1/+1 |
| | |||||
* | progs/xdemos: add multictx to .gitignore | Brian Paul | 2009-08-19 | 1 | -0/+1 |
| | |||||
* | progs/xdemos: added multictx.c (multi-context rendering demo) | Brian Paul | 2009-08-07 | 2 | -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 comments | Brian Paul | 2009-08-07 | 1 | -10/+3 |
| | |||||
* | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-08-05 | 2 | -2/+6 |
|\ | | | | | | | | | | | Conflicts: src/mesa/main/state.c | ||||
| * | xdemo/glxswapcontrol: Move get_framge_usage after the swap. | Pauli Nieminen | 2009-08-03 | 1 | -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 Nieminen | 2009-08-03 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Pauli Nieminen <[email protected]> | ||||
* | | demos: use glEnable/DisableClientState() for vertex arrays | Brian Paul | 2009-07-08 | 1 | -4/+4 |
|/ | |||||
* | demos: Fix vsync checking in glxgears | Ian Romanick | 2009-07-06 | 1 | -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. | ||||
* | xdemos: Fix xdemos which default to using display :0.0 to default to $DISPLAY | Jon TURNEY | 2009-06-30 | 4 | -5/+6 |
| | | | | | | | 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 <[email protected]> | ||||
* | demos: fix issues in glxcontexts.c | Brian Paul | 2009-06-23 | 1 | -114/+46 |
| | | | | | | | | 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. | ||||
* | demos: ensure display lists are destroyed for next generation | Alan Hourihane | 2009-04-24 | 1 | -0/+4 |
| |