aboutsummaryrefslogtreecommitdiffstats
path: root/progs/xdemos
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-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
| * define new APP_CC configuration variable for building apps/demos/testsBrian Paul2008-09-111-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"
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-113-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
| * sync up with glxgears.c from masterBrian Paul2008-06-041-75/+121
| |
| * Remove CVS keywords.José Fonseca2008-05-261-1/+0
| |
| * Merge branch 'gallium-0.1' into gallium-tex-surfacesMichel Dänzer2008-05-211-0/+1
| |\
| | * add new binaries to ignore to make 'git status' cleanerZack Rusin2008-05-201-0/+1
| | |
| * | mesa: document a/s keysBrian Paul2008-05-071-0/+2
| | |
| * | mesa: add texturing to thread testBrian Paul2008-05-071-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.
| * added xdemos/sharedtex.c testBrian Paul2008-04-302-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.
| * Remove files of unsupported build systems.José Fonseca2008-02-251-83/+0
| |
| * Rename 'mms-config.' to 'mms.config'.Michal Krol2007-10-291-1/+1
| | | | | | | | | | It looks like Windows does not like filenames ending with a dot, in effect renaming it to 'mms-config'.
| * Ignore generated files.José Fonseca2007-10-251-2/+7
| |
* | Always pass CFLAGS when compiling or linking demosGuillaume Melquiond2008-07-301-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.
* | query/print GLSL version stringBrian Paul2008-07-241-0/+7
| |
* | fix event handling issues (such as when resizing when not animating)Brian Paul2008-06-041-10/+22
| |
* | press 'a' to toggle animationBrian Paul2008-06-041-1/+5
| |
* | code refactoring (draw_frame(0, handle_event())Brian Paul2008-06-041-71/+95
| |
* | remove references to incorrect -winwidth/-winheight, replace with -geometryBrian Paul2008-06-041-2/+1
| |
* | updated options/helpBrian Paul2008-05-071-5/+18
| |
* | Ignore xdemos/sharedtexDan Nicholson2008-05-051-0/+1
| |
* | added xdemos/sharedtex.c testBrian Paul2008-04-302-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.
* | silence warningBrian2008-04-031-1/+1
| |
* | Fix xdemos build on FreeBSD: <sys/types.h> before <netinet/tcp.h>Eric Anholt2008-03-211-1/+1
| |
* | Darwin: Config/source fixes to now build glxdemo apps and OSMesaJeremy Huddleston2008-03-101-1/+1
| | | | | | | | | | Also added darwin-fat-32bit darwin-fat-all configs and deleted old darwin-x86ppc config (cherry picked from commit 7120c0089d663a2b7e7b0c97da38f9bc233fbdd7)
* | glxgears: oops, remove accidental commit of glFinish() hack.Kristian Høgsberg2008-02-291-1/+0
| |
* | Use __DRIextension mechanism providing loader functionality to the driver.Kristian Høgsberg2008-02-291-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.
* | Ignore glxgears_pixmapDan Nicholson2008-02-171-0/+1
| |
* | Add GLXPixmap version of glxgears to show case new GLX Pixmap functionality.Kristian Høgsberg2008-02-142-0/+548
| |
* | glxinfo: Fix multisample visual reporting.Adam Jackson2008-01-221-1/+1
| | | | | | | | | | strstr() == 0 tests for the string _not_ being present. Originally Red Hat bug #351871.
* | Don't build yuvrect_client by defaultBrian2008-01-221-6/+17
| | | | | | | | Added 'extra' rule to build optional yuvrect_client, shape, xdemo programs
* | remove unused varBrian2008-01-221-1/+0
| |
* | define M_PI if neededAlexey Sokolov2008-01-221-0/+4
| |
* | remove dependency on libGLUBrian2007-11-121-2/+1
| |
* | specify app lib dependencies in Makefiles (patch 1/3)Dan Nicholson2007-10-291-7/+9
| |
* | Ignore new programsDan Nicholson2007-10-251-0/+2
| |
* | glxinfo: Try creating a GLX context using an fbconfig if no visuals are ↵Kristian Høgsberg2007-10-181-13/+46
| | | | | | | | available.
* | pbutil: Do not require GLX_SGIX_pbuffer for fbconfig only-functions.Kristian Høgsberg2007-10-172-26/+48
| |
* | glxinfo: Also print number of fbconfigs.Kristian Høgsberg2007-10-171-1/+1
| |
* | Fixup a couple of thinkos in glxinfo changes.Kristian Høgsberg2007-10-171-5/+2
| |
* | Implement support for printing glx fbconfigs in glxinfo.Kristian Høgsberg2007-10-161-31/+195
| |
* | glxinfo: Only print visuals that actually support GLX.Kristian Høgsberg2007-10-161-5/+10
| |
* | Do XSync() before resetting error handler.Kristian Høgsberg2007-10-131-0/+1
| |
* | Example of cooperative rendering into one window by two processesBrian2007-10-114-1/+687
| |
* | New glxsnoop demo to display another window's z/stencil/back buffer.Brian2007-10-112-0/+378
| |
* | Ignore more generated files in progs/Dan Nicholson2007-10-101-2/+2
| | | | | | | | | | | | | | | | Many of the directories in progs/ were missing .gitignore files or were tracking generated files. This patch is basically the process of running `make' in each directory and then finding the untracked files with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing files were also sorted.
* | add support for LDFLAGS env varDan Nicholson2007-09-281-5/+5
| |
* | Update .gitignore for tests and xdemos.Eric Anholt2007-09-241-0/+5
| |
* | clean-up (see bug 12317)Brian2007-09-101-11/+11
| |
* | xdemo case: Wei Wang's patch for bug#9759Xiang, Haihao2007-08-141-0/+5
| |