aboutsummaryrefslogtreecommitdiffstats
path: root/progs/samples
Commit message (Collapse)AuthorAgeFilesLines
* progs: Build samples dir with scons and glew.José Fonseca2009-02-104-11/+65
|
* Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+4
| | | | | | | | | | 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-112-87/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Ignore more generated files in progs/Dan Nicholson2008-05-201-17/+17
| | | | | | | | | | | | | | | | 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.
| * Remove files of unsupported build systems.José Fonseca2008-02-252-178/+0
| |
| * Ignore generated files.José Fonseca2007-10-251-0/+2
| |
| * Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa ↵michal2007-07-271-4/+29
| |\ | | | | | | | | | into softpipe_0_1_branch
| * | Added colormask, dither, multisample state. Implement colormasking stage.Brian2007-07-121-2/+4
| | |
* | | add a few more logicop modes, simplify codeBrian2007-11-271-52/+45
| | |
* | | specify app lib dependencies in Makefiles (patch 1/3)Dan Nicholson2007-10-291-2/+4
| | |
* | | Ignore more generated files in progs/Dan Nicholson2007-10-101-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| | |
* | | more Mingw32 fixesZhang2007-07-271-18/+3
| |/ |/|
* | Fix a number of MINGW32 issuesZhang2007-07-211-4/+29
|/
* Remove unused Imakefiles.Brian2007-04-201-101/+0
|
* Make git ignore files only generated at build time.Michel Dänzer2006-12-061-0/+0
|
* 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.
* remove stupid flagsDaniel Borca2005-05-232-8/+2
|
* assorted warning clean-ups for x86_64, etc (Mikko T.)Brian Paul2005-05-073-1/+4
|
* makefile update (readtex, showbuffer)Daniel Borca2005-01-312-8/+10
|
* minor readtex fixesBrian Paul2005-01-091-5/+5
|
* compute reasonable animate rate (Marcelo Magallon)Brian Paul2005-01-085-10/+75
|
* fix-up rules for sphere demo, which uses readtex utilityBrian Paul2005-01-081-2/+17
|
* updated makefiles for gcc 3.4.3 and bnu 2.15Daniel Borca2004-12-152-6/+6
|
* remove BeOS conditional code. oglinfo should be moved to xdemos since it's ↵Brian Paul2004-08-251-5/+0
| | | | a GLX program
* Obsolete BeOS-specific makefile.Philippe Houdoin2004-08-142-64/+6
| | | | Removed the oglinfo target from samples from BeOS build, as it depends on X.
* use OGL 1.1 color logic ops in addition to GL_EXT_blend_logic_opRoland Scheidegger2004-05-212-13/+60
|
* obsoleteBrian Paul2004-04-221-44/+0
|
* minor fixesBrian Paul2004-03-261-1/+1
|
* Tweaks for make clean / realclean.Brian Paul2004-03-261-3/+1
|
* New Makefile systemBrian Paul2004-03-261-0/+34
|
* reverted TMUs for proper multitexturingDaniel Borca2003-12-232-2/+8
|
* Minor MinGW fixesDaniel Borca2003-10-091-1/+1
|
* improved 'clean' targets (Otto Solares)Brian Paul2003-10-031-3/+3
|
* updates from Daniel BorcaBrian Paul2003-10-021-0/+67
|
* use GL_GLEXT_PROTOTYPESBrian Paul2003-09-081-2/+1
|
* files for CVS to ignoreBrian Paul2003-09-051-0/+45
|
* Updates from Daniel BorcaBrian Paul2003-08-281-1/+1
|
* DOS and glide driver updates from Daniel BorcaBrian Paul2003-08-191-7/+8
|
* DOS updates for new tree (Daniel Borca)Brian Paul2003-06-161-86/+83
|
* updated old-style makefiles for new treeBrian Paul2003-06-101-1/+1
|
* Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.Ian Romanick2003-06-054-4/+0
|
* Remove a bunch of really old/obsolete configs.Brian Paul2003-06-011-20/+6
| | | | Use the new mklib script.
* added a castBrian Paul2003-04-211-1/+1
|
* DOS updates from Daniel BorcaBrian Paul2003-03-291-2/+2
|
* DOS update (Daniel Borca)Brian Paul2003-03-081-2/+3
|
* latest DOS updates (Daniel Borca)Brian Paul2003-02-201-7/+3
|
* read/write files, not stdio (Daniel Borca)Brian Paul2003-02-041-5/+17
|
* DOS updates (Daniel Borca)Brian Paul2003-02-041-36/+89
|