summaryrefslogtreecommitdiffstats
path: root/progs
Commit message (Collapse)AuthorAgeFilesLines
* progs: Prevent clash with min macro.José Fonseca2009-02-121-0/+3
|
* demos: minor updates for shader_api.c testBrian Paul2009-02-111-4/+4
| | | | | | | | Mesa's glGetUniformLocation() does support array indexes. Minor code reformatting. It would be great if this program were converted into a glean test...
* demos: better error message for overlay.c, see bug 20055Brian Paul2009-02-111-1/+2
|
* Merge commit 'origin/gallium-master-merge'Brian Paul2009-02-10366-10728/+24506
|\ | | | | | | | | | | | | | | | | | | | | | | This is the big merge of the gallium-0.2 branch into master. gallium-master-merge was just the staging area for it. Both gallium-0.2 and gallium-master-merge are considered closed now. Conflicts: progs/demos/Makefile src/mesa/main/state.c src/mesa/main/texenvprogram.c
| * Merge commit 'origin/gallium-0.2' into gallium-master-mergeBrian Paul2009-02-106-11/+158
| |\
| | * progs: Build samples dir with scons and glew.José Fonseca2009-02-105-12/+67
| | |
| | * progs: Build rebook with scons too.José Fonseca2009-02-102-0/+92
| | |
| * | mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-09362-10720/+24351
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * progs: Get more samples building on windows.José Fonseca2009-02-0110-55/+82
| | |
| | * progs: Fix isosurf.José Fonseca2009-01-241-6/+4
| | |
| | * progs: Port most of the demos to glew.José Fonseca2009-01-2412-18/+26
| | | | | | | | | | | | | | | A couple of test weren't ported due to glew breakage -- it undefines GLAPIENTRY.
| | * scons: Build the progs into seperate dirs as well.José Fonseca2009-01-241-0/+1
| | |
| | * progs: Port vp-tris to glew.José Fonseca2009-01-234-30/+17
| | | | | | | | | | | | | | | There was some wglGetProcAddress calls to setup extensions already, but including glext caused many compilation errors in MinGW.
| | * progs: Ignore more output executables.José Fonseca2009-01-231-0/+3
| | |
| | * progs/trivial: Use glew where needed.José Fonseca2009-01-2340-39/+119
| | | | | | | | | | | | Builds on windows now.
| | * Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-223-0/+443
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln
| | * | progs: IgnoresJakob Bornecrantz2009-01-211-0/+1
| | | |
| | * | Merge commit 'origin/gallium-0.2' into gallium-xlib-reworkKeith Whitwell2009-01-197-2/+149
| | |\ \
| | | * | egl: eglinfo load i915 driverJakob Bornecrantz2009-01-191-1/+2
| | | | |
| | | * | egl: Make eglscreen sleep for five secondsJakob Bornecrantz2009-01-181-0/+3
| | | | |
| | | * | egl: Add eglscreen to help debug egl mesa screenJakob Bornecrantz2009-01-183-0/+123
| | | | |
| | | * | egl: Make eglinfo print screen infoJakob Bornecrantz2009-01-171-1/+2
| | | | |
| | | * | mesa: add new samplers_array testAlan Hourihane2009-01-142-0/+18
| | | | |
| | | * | progs: List tri-clear.José Fonseca2009-01-141-0/+1
| | | | |
| | * | | trivial: clear with random colorKeith Whitwell2009-01-142-0/+133
| | |/ /
| | * | mesa: Update .gitignoreYounes Manton2009-01-101-0/+1
| | | |
| | * | progs/glsl: Add ignoresJakob Bornecrantz2009-01-051-0/+2
| | | |
| | * | progs/glsl: Remove double target def for vert-or-frag-onlyJakob Bornecrantz2009-01-051-1/+0
| | | |
| | * | demos: remove redundant Makefile lines from prev mergeBrian2009-01-031-8/+0
| | | |
| | * | mesa: replace CC with APP_CC in progs/glsl/MakefileBrian Paul2009-01-021-6/+6
| | | |
| | * | Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-022-0/+365
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
| | * \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-301-16/+28
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/config.h
| | * \ \ \ Merge commit 'origin/gallium-0.1' into gallium-0.2José Fonseca2008-12-221-5/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/Makefile
| | | * | | | Ignore new tests executables.José Fonseca2008-12-211-5/+20
| | | | | | |
| | | * | | | scons: Build progs.José Fonseca2008-12-124-0/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just demos and trivial dirs for starters. Conflicts: .gitignore
| | * | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-191-0/+8
| | |\ \ \ \ \
| | * | | | | | mesa: s/CC/APP_CC/ in progs/glsl/MakefileBrian Paul2008-12-191-5/+5
| | | | | | | |
| | * | | | | | demos: all glutDestroyWindow() upon exit to test query object clean-upBrian Paul2008-12-181-2/+3
| | | | | | | |
| | * | | | | | demos: add test of vertex-only and fragment-only shader programsBrian Paul2008-12-182-0/+200
| | | | | | | |
| | * | | | | | util: check for frag/vertShader=0 before attachingBrian Paul2008-12-181-2/+7
| | | | | | | |
| | * | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-162-46/+136
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-154-0/+284
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge commit 'origin/gallium-0.1' into gallium-0.2Brian Paul2008-12-103-0/+272
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | mesa: more trivial testsKeith Whitwell2008-12-103-0/+272
| | | | | | | | | |
| | * | | | | | | | fix conflict breakageAlan Hourihane2008-12-081-4/+0
| | | | | | | | | |
| | * | | | | | | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-082-1/+292
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile
| | * | | | | | | | | mesa: Update some .gitignore files.Younes Manton2008-12-022-0/+17
| | | | | | | | | | |
| | * | | | | | | | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-281-3/+12
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | remove some redundant rules from prev mergeBrian Paul2008-11-241-7/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-241-0/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile