summaryrefslogtreecommitdiff
path: root/progs/xdemos
AgeCommit message (Collapse)AuthorFilesLines
2009-03-17xdemos: Fix sharedtex_mt.Thomas Hellstrom1-70/+33
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 Manton1-0/+1
2009-03-13xdemos: Add multithreaded sharedtex_mt.Thomas Hellstrom2-0/+524
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
2009-03-12demos: move declaration before codeBrian Paul1-1/+1
2009-03-11xdemos: On termination with `esc` close the contexts correctly.Alan Hourihane1-1/+1
2009-02-16demos: fix glxpixmap and call glXWaitGL before calling XCopyArea.Alan Hourihane1-0/+1
2009-02-11demos: better error message for overlay.c, see bug 20055Brian Paul1-1/+2
2009-02-09mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul3-159/+235
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 Romanick1-1/+1
2009-01-30Fix dyslexia.Ian Romanick1-1/+1
2009-01-30glxgears: Log a message if synched to vblankIan Romanick1-0/+74
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 Whitwell3-0/+275
Conflicts: src/mesa/shader/prog_print.c
2008-11-12Add glsync demo program from jbarnes for testing vblank synchronization.Eric Anholt3-0/+275
2008-10-27Merge commit 'origin/master' into gallium-0.2Alan Hourihane2-16/+127
2008-10-16glxswapcontrol: added -fullscreen optionBrian Paul1-14/+77
2008-10-16glxgears: for fullscreen, disable window borders the right wayBrian Paul1-2/+50
2008-09-21Remove CVS keywords.Keith Whitwell1-1/+0
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
2008-09-18Merge commit 'origin/master' into gallium-0.2Keith Whitwell1-1/+0
Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
2008-09-13remove invalid XDestroyWindow() callGuillaume Melquiond1-1/+0
2008-09-11Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell1-15/+15
Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c
2008-09-11define new APP_CC configuration variable for building apps/demos/testsBrian Paul1-11/+11
For Cell, need to use different compilers for the libraries vs. the demos/tests to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell3-145/+220
A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
2008-07-30Always pass CFLAGS when compiling or linking demosGuillaume Melquiond1-4/+4
To ensure that the correct architecture flags are used, always pass the user's CFLAGS when compiling or linking the demos. Fixes #16860.
2008-07-24query/print GLSL version stringBrian Paul1-0/+7
2008-06-04sync up with glxgears.c from masterBrian Paul1-75/+121
2008-06-04fix event handling issues (such as when resizing when not animating)Brian Paul1-10/+22
2008-06-04press 'a' to toggle animationBrian Paul1-1/+5
2008-06-04code refactoring (draw_frame(0, handle_event())Brian Paul1-71/+95
2008-06-04remove references to incorrect -winwidth/-winheight, replace with -geometryBrian Paul1-2/+1
2008-05-26Remove CVS keywords.José Fonseca1-1/+0
2008-05-21Merge branch 'gallium-0.1' into gallium-tex-surfacesMichel Dänzer1-0/+1
2008-05-20add new binaries to ignore to make 'git status' cleanerZack Rusin1-0/+1
2008-05-07updated options/helpBrian Paul1-5/+18
2008-05-07mesa: document a/s keysBrian Paul1-0/+2
2008-05-07mesa: add texturing to thread testBrian Paul1-67/+237
Run with -t to enable texture mapping. Press 't' to update the texture image. When the texture is changed in one thread it should also get updated in the other threads since textures are shared by all contexts.
2008-05-05Ignore xdemos/sharedtexDan Nicholson1-0/+1
2008-04-30added xdemos/sharedtex.c testBrian Paul2-0/+325
Test that modifications to a texture object in one rendering context are seen in a second rendering context. Press 't' to change the texture's image/colors.
2008-04-30added xdemos/sharedtex.c testBrian Paul2-0/+325
Test that modifications to a texture object in one rendering context are seen in a second rendering context. Press 't' to change the texture's image/colors.
2008-04-03silence warningBrian1-1/+1
2008-03-21Fix xdemos build on FreeBSD: <sys/types.h> before <netinet/tcp.h>Eric Anholt1-1/+1
2008-03-10Darwin: Config/source fixes to now build glxdemo apps and OSMesaJeremy Huddleston1-1/+1
Also added darwin-fat-32bit darwin-fat-all configs and deleted old darwin-x86ppc config (cherry picked from commit 7120c0089d663a2b7e7b0c97da38f9bc233fbdd7)
2008-02-29glxgears: oops, remove accidental commit of glFinish() hack.Kristian Høgsberg1-1/+0
2008-02-29Use __DRIextension mechanism providing loader functionality to the driver.Kristian Høgsberg1-0/+1
Instead of passing in a fixed struct, the loader now passes in a list of __DRIextension structs, to advertise the functionality it can provide to the driver. Each extension is individually versioned and can be extended or phased out as the interface develops.
2008-02-25Remove files of unsupported build systems.José Fonseca1-83/+0
2008-02-17Ignore glxgears_pixmapDan Nicholson1-0/+1
2008-02-14Add GLXPixmap version of glxgears to show case new GLX Pixmap functionality.Kristian Høgsberg2-0/+548
2008-01-22glxinfo: Fix multisample visual reporting.Adam Jackson1-1/+1
strstr() == 0 tests for the string _not_ being present. Originally Red Hat bug #351871.
2008-01-22Don't build yuvrect_client by defaultBrian1-6/+17
Added 'extra' rule to build optional yuvrect_client, shape, xdemo programs
2008-01-22remove unused varBrian1-1/+0
2008-01-22define M_PI if neededAlexey Sokolov1-0/+4