summaryrefslogtreecommitdiffstats
path: root/progs/xdemos
Commit message (Collapse)AuthorAgeFilesLines
* glxinfo: Print drawable type in verbose modeKristian Høgsberg2010-04-141-2/+28
|
* Merge branch '7.8'Ian Romanick2010-04-041-30/+15
|\
| * xdemos: Build object files firstJeremy Huddleston2010-04-031-30/+15
| | | | | | | | | | | | This helps debugging on darwin. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| * Revert accidental commits from the xquartz treeJeremy Huddleston2010-04-011-16/+31
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 9aadc793f3db64cefa0b08f18abad424a659dacc. This reverts commit 69ea4e7718efb60b6b0d795a355cebd6712ceac1. This reverts commit dbe8b013936d977ec63d6607bfd2fc6772d29787. This reverts commit 23215ef4d60a86d9f3b3fdc08e3fdadc59e98890. This reverts commit 9495e3703062d1ddaf3161f4efc23f0b51284d9b. This reverts commit 0594cf70883b64692ba617d85f4f9b4e636e5c2b. This reverts commit 86a7978d37393ee34f876569ac06ffdb8d7289ae. This reverts commit 437902ce978cde9a0e1aa260f12dc232a8501c42.
| * xdemos: Build object files firstJeremy Huddleston2010-04-011-30/+15
| | | | | | | | | | | | This helps debugging on darwin. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| * xdemos: Fix a build failure for non-autoconf configsJeremy Huddleston2010-04-011-1/+1
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
* | Change libX11 variables to not conflict with AC_PATH_XTRADan Nicholson2010-03-231-1/+1
| | | | | | | | | | | | | | | | The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars for linking with Xlib to avoid the conflict. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
* | Use X_LIBS from pkg-config, instead of libdir, for locating libX11Jeff Smith2010-03-131-2/+2
| | | | | | | | | | Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
* | Merge branch '7.8'Michel Dänzer2010-03-122-4/+5
|\ \ | |/
| * Add programs to .gitignore in xdemosJeff Smith2010-03-121-3/+4
| | | | | | | | | | Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Brian Paul <brianp@vmware.com>
| * Add -L$(libdir) for xdemos and egl so that the right libX11 is foundJeff Smith2010-03-121-1/+1
| | | | | | | | | | Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Brian Paul <brianp@vmware.com>
* | xdemos/omlsync: improve OML WaitMsc testJesse Barnes2010-03-081-4/+6
|/ | | | | Use the divisor/remainder for the WaitForMscOML call if a wait_interval is passed. Allows for testing of the WaitMSC paths in the server & DDX.
* progs/xdemos: fix up GLX extension checkingJesse Barnes2010-03-053-27/+6
| | | | | | A few of my programs were using the client string in addition to the main extensions string to see if a feature was present. Correct this to only check for the currently available and working extensions.
* xdemos/omlsync: add waitformsc and swap interval codeJesse Barnes2010-03-051-5/+27
|
* xdemos: add OML sync testJesse Barnes2010-03-043-0/+252
| | | | Add program to test glXSwapBuffersMscOML behavior. Based on glsync.c.
* progs/xdemos: fix typo in glxinfo helpBrian Paul2010-02-261-1/+1
|
* drop header files and demos for dropped window systemsGeorge Sapountzis2010-02-263-428/+0
|
* glxinfo: Fix User error in glGetProgramivARBBrian Paul2010-02-221-4/+17
| | | | | | | | | | | | glxinfo needed fixing after commit 4bccd69. Move fragment program only parameters into their own list so that they are not queried for a vertex program. Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com> Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit b0e5dcb859692707fec8752dd21fc61fc4c3dbcc)
* glxgears_fbconfig: Use glXCreateWindow and glXDestroyWindowIan Romanick2010-02-111-5/+39
|
* glxgears_fbconfig: Use GLX 1.3 name for function poiner typesIan Romanick2010-02-111-19/+15
|
* progs/xdemos: Silence uninitialized variable warning.Vinson Lee2010-02-091-1/+1
|
* progs/xdemos: Silence uninitialized variable warning.Vinson Lee2010-02-081-1/+1
|
* glxgears: Support GLX_EXT_swap_control for querying the current swap interval.Aaron Plattner2010-01-261-3/+10
| | | | | Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Brian Paul <brianp@vmware.com>
* 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 <brianp@vmware.com>
* | 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 <jbarnes@virtuousgeek.org>
* | 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)
generated by cgit v1.1 at 2024-09-14 04:24:27 +0000