summaryrefslogtreecommitdiffstats
path: root/progs/xdemos
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-experimental' into debian-experimentalJulien Cristau2007-02-011-0/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/util/README progs/util/glstate.c progs/util/glstate.h progs/util/sampleMakefile src/glu/sgi/libnurbs/interface/bezierEval.h src/glu/sgi/libnurbs/interface/bezierPatch.cc src/glu/sgi/libnurbs/interface/bezierPatch.h src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc src/glu/sgi/libnurbs/interface/bezierPatchMesh.h src/glu/sgi/libnurbs/interface/glcurveval.cc src/glu/sgi/libnurbs/interface/glimports.h src/glu/sgi/libnurbs/interface/glinterface.cc src/glu/sgi/libnurbs/interface/glrenderer.h src/glu/sgi/libnurbs/interface/incurveeval.cc src/glu/sgi/libnurbs/interface/insurfeval.cc src/glu/sgi/libnurbs/interface/mystdio.h src/glu/sgi/libnurbs/interface/mystdlib.h src/glu/sgi/libnurbs/internals/arc.h src/glu/sgi/libnurbs/internals/arcsorter.cc src/glu/sgi/libnurbs/internals/arcsorter.h src/glu/sgi/libnurbs/internals/arctess.h src/glu/sgi/libnurbs/internals/backend.cc src/glu/sgi/libnurbs/internals/backend.h src/glu/sgi/libnurbs/internals/basiccrveval.h src/glu/sgi/libnurbs/internals/basicsurfeval.h src/glu/sgi/libnurbs/internals/bezierarc.h src/glu/sgi/libnurbs/internals/bin.cc src/glu/sgi/libnurbs/internals/bin.h src/glu/sgi/libnurbs/internals/bufpool.cc src/glu/sgi/libnurbs/internals/bufpool.h src/glu/sgi/libnurbs/internals/cachingeval.cc src/glu/sgi/libnurbs/internals/cachingeval.h src/glu/sgi/libnurbs/internals/ccw.cc src/glu/sgi/libnurbs/internals/coveandtiler.h src/glu/sgi/libnurbs/internals/curve.cc src/glu/sgi/libnurbs/internals/curve.h src/glu/sgi/libnurbs/internals/curvelist.cc src/glu/sgi/libnurbs/internals/curvelist.h src/glu/sgi/libnurbs/internals/curvesub.cc src/glu/sgi/libnurbs/internals/dataTransform.cc src/glu/sgi/libnurbs/internals/dataTransform.h src/glu/sgi/libnurbs/internals/defines.h src/glu/sgi/libnurbs/internals/displaylist.cc src/glu/sgi/libnurbs/internals/displaylist.h src/glu/sgi/libnurbs/internals/displaymode.h src/glu/sgi/libnurbs/internals/flist.cc src/glu/sgi/libnurbs/internals/flist.h src/glu/sgi/libnurbs/internals/flistsorter.cc src/glu/sgi/libnurbs/internals/flistsorter.h src/glu/sgi/libnurbs/internals/gridline.h src/glu/sgi/libnurbs/internals/gridtrimvertex.h src/glu/sgi/libnurbs/internals/gridvertex.h src/glu/sgi/libnurbs/internals/hull.cc src/glu/sgi/libnurbs/internals/hull.h src/glu/sgi/libnurbs/internals/intersect.cc src/glu/sgi/libnurbs/internals/jarcloc.h src/glu/sgi/libnurbs/internals/knotvector.h src/glu/sgi/libnurbs/internals/mapdesc.cc src/glu/sgi/libnurbs/internals/mapdesc.h src/glu/sgi/libnurbs/internals/mapdescv.cc src/glu/sgi/libnurbs/internals/maplist.cc src/glu/sgi/libnurbs/internals/maplist.h src/glu/sgi/libnurbs/internals/mesher.cc src/glu/sgi/libnurbs/internals/mesher.h src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc src/glu/sgi/libnurbs/internals/monotonizer.cc src/glu/sgi/libnurbs/internals/monotonizer.h src/glu/sgi/libnurbs/internals/myassert.h src/glu/sgi/libnurbs/internals/mycode.cc src/glu/sgi/libnurbs/internals/mystring.h src/glu/sgi/libnurbs/internals/nurbsconsts.h src/glu/sgi/libnurbs/internals/nurbstess.cc src/glu/sgi/libnurbs/internals/patch.cc src/glu/sgi/libnurbs/internals/patch.h src/glu/sgi/libnurbs/internals/patchlist.cc src/glu/sgi/libnurbs/internals/patchlist.h src/glu/sgi/libnurbs/internals/pwlarc.h src/glu/sgi/libnurbs/internals/quilt.cc src/glu/sgi/libnurbs/internals/quilt.h src/glu/sgi/libnurbs/internals/reader.cc src/glu/sgi/libnurbs/internals/reader.h src/glu/sgi/libnurbs/internals/renderhints.cc src/glu/sgi/libnurbs/internals/renderhints.h src/glu/sgi/libnurbs/internals/simplemath.h src/glu/sgi/libnurbs/internals/slicer.cc src/glu/sgi/libnurbs/internals/slicer.h src/glu/sgi/libnurbs/internals/sorter.cc src/glu/sgi/libnurbs/internals/sorter.h src/glu/sgi/libnurbs/internals/splitarcs.cc src/glu/sgi/libnurbs/internals/subdivider.h src/glu/sgi/libnurbs/internals/tobezier.cc src/glu/sgi/libnurbs/internals/trimline.cc src/glu/sgi/libnurbs/internals/trimline.h src/glu/sgi/libnurbs/internals/trimregion.cc src/glu/sgi/libnurbs/internals/trimregion.h src/glu/sgi/libnurbs/internals/trimvertex.h src/glu/sgi/libnurbs/internals/trimvertpool.cc src/glu/sgi/libnurbs/internals/trimvertpool.h src/glu/sgi/libnurbs/internals/types.h src/glu/sgi/libnurbs/internals/uarray.cc src/glu/sgi/libnurbs/internals/uarray.h src/glu/sgi/libnurbs/internals/varray.cc src/glu/sgi/libnurbs/internals/varray.h src/glu/sgi/libnurbs/nurbtess/definitions.h src/glu/sgi/libnurbs/nurbtess/directedLine.h src/glu/sgi/libnurbs/nurbtess/glimports.h src/glu/sgi/libnurbs/nurbtess/gridWrap.cc src/glu/sgi/libnurbs/nurbtess/gridWrap.h src/glu/sgi/libnurbs/nurbtess/monoChain.cc src/glu/sgi/libnurbs/nurbtess/monoChain.h src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h src/glu/sgi/libnurbs/nurbtess/mystdio.h src/glu/sgi/libnurbs/nurbtess/mystdlib.h src/glu/sgi/libnurbs/nurbtess/partitionX.cc src/glu/sgi/libnurbs/nurbtess/partitionX.h src/glu/sgi/libnurbs/nurbtess/partitionY.cc src/glu/sgi/libnurbs/nurbtess/partitionY.h src/glu/sgi/libnurbs/nurbtess/polyDBG.h src/glu/sgi/libnurbs/nurbtess/polyUtil.cc src/glu/sgi/libnurbs/nurbtess/polyUtil.h src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc src/glu/sgi/libnurbs/nurbtess/primitiveStream.h src/glu/sgi/libnurbs/nurbtess/quicksort.cc src/glu/sgi/libnurbs/nurbtess/quicksort.h src/glu/sgi/libnurbs/nurbtess/rectBlock.cc src/glu/sgi/libnurbs/nurbtess/rectBlock.h src/glu/sgi/libnurbs/nurbtess/sampleComp.cc src/glu/sgi/libnurbs/nurbtess/sampleComp.h src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h src/glu/sgi/libnurbs/nurbtess/sampledLine.cc src/glu/sgi/libnurbs/nurbtess/sampledLine.h src/glu/sgi/libnurbs/nurbtess/searchTree.cc src/glu/sgi/libnurbs/nurbtess/searchTree.h src/glu/sgi/libnurbs/nurbtess/zlassert.h src/glu/sgi/libtess/README src/glu/sgi/libtess/alg-outline src/glu/sgi/libtess/dict-list.h src/glu/sgi/libtess/dict.c src/glu/sgi/libtess/dict.h src/glu/sgi/libtess/geom.c src/glu/sgi/libtess/memalloc.c src/glu/sgi/libtess/memalloc.h src/glu/sgi/libtess/mesh.c src/glu/sgi/libtess/mesh.h src/glu/sgi/libtess/normal.h src/glu/sgi/libtess/priorityq-heap.c src/glu/sgi/libtess/priorityq-heap.h src/glu/sgi/libtess/priorityq-sort.h src/glu/sgi/libtess/priorityq.c src/glu/sgi/libtess/priorityq.h src/glu/sgi/libtess/render.c src/glu/sgi/libtess/render.h src/glu/sgi/libtess/sweep.h src/glu/sgi/libtess/tess.h src/glu/sgi/libtess/tessmono.c src/glu/sgi/libtess/tessmono.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
| * Added -clip option to test glCopyPixels beyond window bounds.Brian Paul2006-10-161-18/+17
| | | | | | | | | | Clear dest window to black before copying. Use glWindowPos2iARB().
| * LIB_DIR is now just 'lib' or 'lib64'Brian Paul2006-07-131-1/+1
| | | | | | | | | | Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno Böck.
| * call reshape() after init() to set initial projection/viewing transform (see ↵Brian Paul2006-05-171-2/+8
| | | | | | | | bug 6941)
| * bug 6941: fixed initial rendering problems in glxgearsTilman Sauerbeck2006-05-161-0/+1
| |
| * added a few extension #ifdef testsBrian Paul2006-05-151-1/+12
| |
| * usage() functionBrian Paul2006-05-151-2/+15
| |
| * Expanded output with -l option: vertex/fragment program and vertex/fragmentBrian Paul2006-05-131-24/+157
| | | | | | | | | | shader limits. Misc sync-ups with x.org copy of glxinfo.
| * Use -I$(INCDIR) to get Mesa, not system headers (Dan Schikore)Brian Paul2006-04-131-5/+5
| |
| * Added -l option for explicit locking around Xlib and GLX calls inBrian Paul2006-03-231-5/+64
| | | | | | | | threaded code. Seems to improve reliability quite a bit.
| * Added -p option to create a display connection per thread.Brian Paul2006-03-231-23/+88
| | | | | | | | | | This seems more stabile than using one display connection for all threads. Still get an occasional Xlib: unexpected async reply error, unfortunately.
| * updated some printfs, added comment about sched_yieldBrian Paul2006-03-151-3/+7
| |
| * Free visinfo object (Tilman Sauerbeck)Brian Paul2006-01-161-0/+2
| |
| * Committing in .Jouk Jansen2005-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) change compilation on VMS to use IEEE floating points 2) one more problem with _mesa_sprintf solved Modified Files: Mesa/docs/README.VMS Mesa/progs/demos/descrip.mms Mesa/progs/tests/descrip.mms Mesa/progs/util/descrip.mms Mesa/progs/xdemos/descrip.mms Mesa/src/glu/mesa/descrip.mms Mesa/src/glu/sgi/descrip.mms Mesa/src/glut/glx/descrip.mms Mesa/src/mesa/array_cache/descrip.mms Mesa/src/mesa/drivers/common/descrip.mms Mesa/src/mesa/drivers/osmesa/descrip.mms Mesa/src/mesa/drivers/x11/descrip.mms Mesa/src/mesa/glapi/descrip.mms Mesa/src/mesa/main/descrip.mms Mesa/src/mesa/main/texobj.c Mesa/src/mesa/math/descrip.mms Mesa/src/mesa/shader/descrip.mms Mesa/src/mesa/shader/grammar/descrip.mms Mesa/src/mesa/shader/slang/descrip.mms Mesa/src/mesa/swrast/descrip.mms Mesa/src/mesa/swrast_setup/descrip.mms Mesa/src/mesa/tnl/descrip.mms ----------------------------------------------------------------------
| * s/GLX_RGBA_BIT/GLX_RGBA_TYPE/ (bug 4237)Brian Paul2005-08-251-1/+1
| |
| * delete display lists upon exitBrian Paul2005-08-091-0/+3
| |
| * overlay planes testBrian Paul2005-07-192-0/+246
| |
| * Add $(CFLAGS) to the link commands. This makes 'make linux-x86Ian Romanick2005-07-021-5/+5
| | | | | | | | ARCH_FLAGS=-m32' work correctly on x86-64 systems.
| * assorted warning clean-ups for x86_64, etc (Mikko T.)Brian Paul2005-05-071-6/+6
| |
| * added wrappers/helpers for creating/destroying rendering contextsBrian Paul2005-04-062-1/+45
| |
| * changed implementation of GetAllFBConfigs()Brian Paul2005-04-061-7/+4
| |
| * Make glxgears_fbconfig compile and respect the DISPLAY setting. Add itIan Romanick2005-04-052-3/+11
| | | | | | | | to the Makefile as well.
| * use girl2.rgb by defaultDave Airlie2005-02-261-1/+1
| |
| * Add glXAllocateMemoryMESA demo app using ycbcr...Dave Airlie2005-02-262-1/+328
| | | | | | | | add girl2.rgb which is a slightly resized girl.rgb so client texturing works
| * remove trailing slash from TOP definitionDaniel Borca2005-01-171-1/+1
| |
| * new test to exercise context and window create/deleteKeith Whitwell2005-01-122-0/+610
| |
| * remove a debug lineBrian Paul2005-01-101-1/+0
| |
| * tweak output formattting, fixed uninitialized var errorBrian Paul2005-01-102-46/+48
| |
| * improved animation rateBrian Paul2005-01-091-20/+29
| |
| * rotate at a reasonable rateBrian Paul2005-01-091-16/+27
| |
| * added GetAllFBConfigs()Brian Paul2005-01-071-0/+23
| |
| * New GetAllFBConfigs() function. Some FBConfigs weren't reported before.Brian Paul2005-01-062-23/+8
| |
| * Use the GLX 1.3 pbuffer/fbconfig functions in preference to the SGIX ones.Brian Paul2005-01-044-145/+295
| | | | | | | | Added more functions to pbutil.[ch] to better isolate API differences.
| * Add a -fullscreen optionKeith Whitwell2004-12-201-1/+12
| |
| * removed unused visInfo varBrian Paul2004-12-121-3/+0
| |
| * added stereo option (Jacek Rosik)Brian Paul2004-10-261-17/+92
| |
| * wrap angle value (Philipp Klaus Krause)Brian Paul2004-10-231-0/+2
| |
| * silence warningsBrian Paul2004-09-162-2/+2
| |
| * Have the rendering contexts share textures.Brian Paul2004-09-141-9/+62
| | | | | | | | | | Put simple checker pattern on the objects. Press 'd' to delete texture, 'u' to unbind it.
| * silence a warningBrian Paul2004-08-132-3/+3
| |
| * minor fix for newest glxext.h headerBrian Paul2004-08-131-1/+1
| |
| * cvs ignore fileBrian Paul2004-08-101-0/+16
| |
| * query/print max convolution filter sizeBrian Paul2004-08-101-0/+7
| |
| * redo the event loop to make event response betterBrian Paul2004-07-021-27/+23
| |
| * s/GLX_PIXMAP_BIT_SGIX/GLX_PBUFFER_BIT_SGIX/Brian Paul2004-05-101-5/+4
| |
| * Uses either the GLX_SGI_make_current_read or GLX 1.3 interface,Ian Romanick2004-05-071-5/+23
| | | | | | | | depending on which is available.
| * obsoleteBrian Paul2004-04-221-94/+0
| |
| * minor fixesBrian Paul2004-03-261-7/+5
| |
| * Tweaks for make clean / realclean.Brian Paul2004-03-261-4/+1
| |
| * New Makefile systemBrian Paul2004-03-261-0/+79
| |