Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | demos: Add polygon mode point to isosurf | Jakob Bornecrantz | 2009-02-13 | 1 | -4/+10 |
| | |||||
* | demos: fix glxpixmap and call glXWaitGL before calling XCopyArea. | Alan Hourihane | 2009-02-16 | 1 | -0/+1 |
| | |||||
* | progs: Prevent clash with min macro. | José Fonseca | 2009-02-12 | 1 | -0/+3 |
| | |||||
* | demos: minor updates for shader_api.c test | Brian Paul | 2009-02-11 | 1 | -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 20055 | Brian Paul | 2009-02-11 | 1 | -1/+2 |
| | |||||
* | Merge commit 'origin/gallium-master-merge' | Brian Paul | 2009-02-10 | 366 | -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-merge | Brian Paul | 2009-02-10 | 6 | -11/+158 |
| |\ | |||||
| | * | progs: Build samples dir with scons and glew. | José Fonseca | 2009-02-10 | 5 | -12/+67 |
| | | | |||||
| | * | progs: Build rebook with scons too. | José Fonseca | 2009-02-10 | 2 | -0/+92 |
| | | | |||||
| * | | mesa: merge gallium-0.2 into gallium-master-merge | Brian Paul | 2009-02-09 | 362 | -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é Fonseca | 2009-02-01 | 10 | -55/+82 |
| | | | |||||
| | * | progs: Fix isosurf. | José Fonseca | 2009-01-24 | 1 | -6/+4 |
| | | | |||||
| | * | progs: Port most of the demos to glew. | José Fonseca | 2009-01-24 | 12 | -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é Fonseca | 2009-01-24 | 1 | -0/+1 |
| | | | |||||
| | * | progs: Port vp-tris to glew. | José Fonseca | 2009-01-23 | 4 | -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é Fonseca | 2009-01-23 | 1 | -0/+3 |
| | | | |||||
| | * | progs/trivial: Use glew where needed. | José Fonseca | 2009-01-23 | 40 | -39/+119 |
| | | | | | | | | | | | | Builds on windows now. | ||||
| | * | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2009-01-22 | 3 | -0/+443 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln | ||||
| | * | | progs: Ignores | Jakob Bornecrantz | 2009-01-21 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge commit 'origin/gallium-0.2' into gallium-xlib-rework | Keith Whitwell | 2009-01-19 | 7 | -2/+149 |
| | |\ \ | |||||
| | | * | | egl: eglinfo load i915 driver | Jakob Bornecrantz | 2009-01-19 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | egl: Make eglscreen sleep for five seconds | Jakob Bornecrantz | 2009-01-18 | 1 | -0/+3 |
| | | | | | |||||
| | | * | | egl: Add eglscreen to help debug egl mesa screen | Jakob Bornecrantz | 2009-01-18 | 3 | -0/+123 |
| | | | | | |||||
| | | * | | egl: Make eglinfo print screen info | Jakob Bornecrantz | 2009-01-17 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | mesa: add new samplers_array test | Alan Hourihane | 2009-01-14 | 2 | -0/+18 |
| | | | | | |||||
| | | * | | progs: List tri-clear. | José Fonseca | 2009-01-14 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | trivial: clear with random color | Keith Whitwell | 2009-01-14 | 2 | -0/+133 |
| | |/ / | |||||
| | * | | mesa: Update .gitignore | Younes Manton | 2009-01-10 | 1 | -0/+1 |
| | | | | |||||
| | * | | progs/glsl: Add ignores | Jakob Bornecrantz | 2009-01-05 | 1 | -0/+2 |
| | | | | |||||
| | * | | progs/glsl: Remove double target def for vert-or-frag-only | Jakob Bornecrantz | 2009-01-05 | 1 | -1/+0 |
| | | | | |||||
| | * | | demos: remove redundant Makefile lines from prev merge | Brian | 2009-01-03 | 1 | -8/+0 |
| | | | | |||||
| | * | | mesa: replace CC with APP_CC in progs/glsl/Makefile | Brian Paul | 2009-01-02 | 1 | -6/+6 |
| | | | | |||||
| | * | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2009-01-02 | 2 | -0/+365 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c | ||||
| | * \ \ | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-12-30 | 1 | -16/+28 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/config.h | ||||
| | * \ \ \ | Merge commit 'origin/gallium-0.1' into gallium-0.2 | José Fonseca | 2008-12-22 | 1 | -5/+5 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/Makefile | ||||
| | | * | | | | Ignore new tests executables. | José Fonseca | 2008-12-21 | 1 | -5/+20 |
| | | | | | | | |||||
| | | * | | | | scons: Build progs. | José Fonseca | 2008-12-12 | 4 | -0/+281 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just demos and trivial dirs for starters. Conflicts: .gitignore | ||||
| | * | | | | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-12-19 | 1 | -0/+8 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | mesa: s/CC/APP_CC/ in progs/glsl/Makefile | Brian Paul | 2008-12-19 | 1 | -5/+5 |
| | | | | | | | | |||||
| | * | | | | | | demos: all glutDestroyWindow() upon exit to test query object clean-up | Brian Paul | 2008-12-18 | 1 | -2/+3 |
| | | | | | | | | |||||
| | * | | | | | | demos: add test of vertex-only and fragment-only shader programs | Brian Paul | 2008-12-18 | 2 | -0/+200 |
| | | | | | | | | |||||
| | * | | | | | | util: check for frag/vertShader=0 before attaching | Brian Paul | 2008-12-18 | 1 | -2/+7 |
| | | | | | | | | |||||
| | * | | | | | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-12-16 | 2 | -46/+136 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-15 | 4 | -0/+284 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Brian Paul | 2008-12-10 | 3 | -0/+272 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | mesa: more trivial tests | Keith Whitwell | 2008-12-10 | 3 | -0/+272 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix conflict breakage | Alan Hourihane | 2008-12-08 | 1 | -4/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-08 | 2 | -1/+292 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile | ||||
| | * | | | | | | | | | mesa: Update some .gitignore files. | Younes Manton | 2008-12-02 | 2 | -0/+17 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-11-28 | 1 | -3/+12 |
| | |\ \ \ \ \ \ \ \ \ |