summaryrefslogtreecommitdiffstats
path: root/progs
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-1110-68/+521
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-117-64/+64
| | | | | | | | | | 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"
| * simple quad drawing testBrian Paul2008-09-112-0/+259
| |
| * press 'c' to toggle Z clear value between 0/1Brian Paul2008-09-111-4/+21
| |
| * press 'f' to cycle through depth test funcsBrian Paul2008-09-111-0/+26
| |
| * mesa: added test for very long fixed-function vertex programsBrian Paul2008-08-282-0/+152
| |
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-11314-10553/+20041
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add NV_vertex_program specific tests.Michal Krol2008-08-192-0/+11
| |
| * Add support for NVIDIA programs.Michal Krol2008-08-191-10/+31
| |
| * Port vp to Windows.Michal Krol2008-08-193-3/+171
| |
| * pick first modeAlan Hourihane2008-08-172-2/+2
| |
| * choose a 1024x768 resolutionAlan Hourihane2008-08-171-1/+1
| |
| * add edge detection to that exampleZack Rusin2008-07-211-0/+13
| |
| * mesa: call glutDestroyWindow() on exitBrian Paul2008-07-091-0/+2
| |
| * egl: Add egltriJakob Bornecrantz2008-07-043-2/+277
| | | | | | | | First tri for EGL drivers with mesa screen ext
| * Fix CRLF line endings.José Fonseca2008-06-2450-6059/+6059
| |
| * tests: Added a test for a strange bug in texstore_a8Jakob Bornecrantz2008-06-183-0/+196
| |
| * added ARCH_FLAGSseventh guardian2008-06-161-5/+5
| |
| * git: Updated .gitignore filesJakob Bornecrantz2008-06-162-0/+13
| |
| * trivial: Update clear-undefinedJakob Bornecrantz2008-06-131-0/+7
| |
| * trival: Added test for undefined context of bufferJakob Bornecrantz2008-06-132-0/+131
| |
| * add some glsl example testing different arrays of uniformsZack Rusin2008-06-125-0/+131
| |
| * trivial: add test for integer vertex arraysKeith Whitwell2008-06-112-0/+118
| |
| * trivial: add trifan testsKeith Whitwell2008-06-106-0/+706
| |
| * trivial: add poly-flat-clip testsKeith Whitwell2008-06-103-4/+150
| |
| * trivial: add tristrip-flat to makefileKeith Whitwell2008-06-101-0/+1
| |
| * sync up with glxgears.c from masterBrian Paul2008-06-041-75/+121
| |
| * egl: single triangle testBrian Paul2008-06-042-1/+368
| |
| * egl: fix X visual selectionBrian Paul2008-06-041-7/+9
| |
| * egl: query/print EGL_NATIVE_VISUAL_IDBrian Paul2008-06-041-9/+7
| | | | | | | | Other whitespace/etc clean-ups.
| * egl: Added peglgears, gears that uses pbuffersJakob Bornecrantz2008-06-042-2/+457
| |
| * egl: updated egl.h include pathsBrian Paul2008-06-046-9/+12
| |
| * egl: bind the OpenGL APIBrian Paul2008-05-301-0/+2
| |
| * egl: new version of gears demo that uses Xlib+EGL (and full OpenGL for now)Brian Paul2008-05-302-1/+613
| |
| * egl: query/print EGL_CLIENT_APISBrian Paul2008-05-281-0/+3
| |
| * Merge branch 'gallium-vertex-linear' into gallium-0.1Jakob Bornecrantz2008-05-281-1/+1
| |\ | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_pt_varray.c
| | * vp-tris: use test name as window nameKeith Whitwell2008-05-231-1/+1
| | |
| * | egl: Fix warning in eglgearsJakob Bornecrantz2008-05-281-1/+1
| | |
| * | egl: Make demo3 compileJakob Bornecrantz2008-05-281-0/+1
| | |
| * | include eglext.h, define EGL_EGLEXT_PROTOTYPESBrian Paul2008-05-271-1/+4
| | |
| * | updates for EGL 1.4Brian Paul2008-05-272-20/+42
| | |
| * | Remove CVS keywords.José Fonseca2008-05-2626-30/+0
| | |
| * | Merge branch 'gallium-tex-surface' into gallium-0.1Jakob Bornecrantz2008-05-266-6/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/include/pipe/p_util.h
| | * \ Merge branch 'gallium-i915-current' into gallium-0.1Jakob Bornecrantz2008-05-236-6/+12
| | |\ \
| | | * | egl: Updated EGL samples to use new i915 EGL winsysJakob Bornecrantz2008-05-146-6/+12
| | | | |
| * | | | Merge branch 'gallium-0.1' into gallium-tex-surfacesMichel Dänzer2008-05-2119-32/+574
| |\| | |
| | * | | fix assorted bugs, works nowBrian2008-05-211-12/+13
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 55d4f32fc211dbc37bd28c0e67da5ce5e0da5777)
| | * | | add new binaries to ignore to make 'git status' cleanerZack Rusin2008-05-204-1/+28
| | | | |
| | * | | Ignore more generated files in progs/Dan Nicholson2008-05-2011-18/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 a simple but nice example of convolution filters in glslZack Rusin2008-05-204-1/+475
| | | | | | | | | | | | | | | | | | | | shows basics of image processing with glsl