Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | progs/glsl: report compile/link times in shtest.c | Brian Paul | 2009-08-20 | 1 | -0/+10 |
| | |||||
* | progs/glsl: update multitex.shtest for new texture syntax | Brian Paul | 2009-08-20 | 1 | -2/+2 |
| | |||||
* | progs/glsl: update shtest.c to handle 1D/3D/CUBE/RECT textures | Brian Paul | 2009-08-20 | 1 | -16/+70 |
| | |||||
* | progs/glsl: tweaks to shtest.c | Brian Paul | 2009-08-20 | 1 | -2/+3 |
| | | | | | | 1. Larger sphere to match cube size 2. Allow -geometry option to override window size 3. Cube samplers | ||||
* | progs/glsl: more comments in shtest.c | Brian Paul | 2009-08-20 | 1 | -0/+2 |
| | |||||
* | demos/glsl: remove glutInitWindowPosition() calls | Brian Paul | 2009-08-17 | 18 | -18/+0 |
| | |||||
* | mesa: Add 2 new demos to .gitignore. | Pauli Nieminen | 2009-08-15 | 1 | -0/+1 |
| | |||||
* | glsl: re-write Makefile after I called it bad. | Dave Airlie | 2009-08-14 | 1 | -157/+9 |
| | |||||
* | progs/glsl: added multitex.shtest config file | Brian Paul | 2009-08-13 | 1 | -0/+6 |
| | |||||
* | progs/glsl: set generic vertex attribute values | Brian Paul | 2009-08-13 | 1 | -2/+15 |
| | |||||
* | progs/glsl: add type field to shtest config files | Brian Paul | 2009-08-13 | 4 | -54/+108 |
| | | | | Plus, texture loading. | ||||
* | glsl/tests: skinning.o | Dave Airlie | 2009-08-14 | 1 | -2/+2 |
| | | | | | worst Makefile ever. not sure what is going on here, hopefully this fixes tinderbox | ||||
* | progs/glsl: new shtest program, a simple shader test harness app | Brian Paul | 2009-08-13 | 5 | -2/+609 |
| | | | | This commit includes some sample config files (*.shtest) | ||||
* | progs/glsl: change uniform_info::type field to use GLSL vector types | Brian Paul | 2009-08-12 | 8 | -35/+35 |
| | |||||
* | demos: rename InitUniforms() to SetUniformValues() | Brian Paul | 2009-08-12 | 7 | -7/+14 |
| | | | | And call new PrintUniforms() in demos. | ||||
* | demos: Fix the VBO usage in glsl/multitex. | Eric Anholt | 2009-08-10 | 1 | -3/+3 |
| | | | | | | | The fix for 965 to be noisy when apps sent pointers instead of VBO offsets caught this app in the act of doing exactly that. Bug #23203 | ||||
* | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-07-17 | 24 | -356/+245 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile progs/glsl/multitex.c src/mesa/main/enums.c src/mesa/main/state.c src/mesa/main/texenvprogram.c src/mesa/main/version.h | ||||
| * | progs/glsl: finish conversion to GLEW | Brian Paul | 2009-07-17 | 24 | -344/+232 |
| | | | | | | | | | | This is a follow-on to b799af91d5ffbee1481161fec29eb4c92b161272. Remove _func function suffix and unneeded #includes. | ||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-07-13 | 1 | -0/+1 |
|\| | |||||
| * | demos: set 4th component of texcoord to 1.0 | Brian Paul | 2009-07-10 | 1 | -0/+1 |
| | | | | | | | | Avoid potential randomness in resulting texcoords. | ||||
* | | demos: indentation fix | Brian Paul | 2009-07-08 | 1 | -1/+1 |
| | | |||||
* | | demos: use glEnable/DisableClientState() for vertex arrays | Brian Paul | 2009-07-08 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-06-29 | 1 | -1/+1 |
|\| | |||||
| * | progs/glsl: link with GLEW library | Brian Paul | 2009-06-29 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Jakob Bornecrantz | 2009-06-14 | 26 | -1/+105 |
|\| | |||||
| * | progs/glsl: compile with scons and glew | Keith Whitwell | 2009-06-29 | 26 | -1/+105 |
| | | | | | | | | Get most of these working with scons. | ||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-06-01 | 1 | -10/+11 |
|\| | |||||
| * | demos: add missing dependencies for util files | Brian Paul | 2009-06-01 | 1 | -10/+11 |
| | | |||||
| * | demos: fix multitex.c VertCoord attribute mapping | Brian Paul | 2009-05-22 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | If the multitex.vert shader uses the VertCoord generic vertex attribute instead of the pre-defined gl_Vertex attribute, we need to make sure that VertCoord gets bound to generic vertex attribute zero. That's because we need to call glVertexAttrib2fv(0, xy) after all the other vertex attributes have been set since setting generic attribute 0 triggers vertex submission. Before, we wound up issuing the vertex attributes in the order 0, 1, 2 which caused the first vertex to be submitted before all the attributes were set. Now, the attributes are set in 1, 2, 0 order. | ||||
* | | demos: extend glsl/multitex.c to use a vertex buffer object | Brian Paul | 2009-05-22 | 1 | -6/+87 |
|/ | |||||
* | progs/glsl: Update ignore | Jakob Bornecrantz | 2009-04-19 | 1 | -0/+3 |
| | |||||
* | demos: added glsl/texaaline.c program and overhaul the Makefile | Brian Paul | 2009-04-18 | 2 | -148/+499 |
| | |||||
* | demos: move glslnoise.c demo to glsl/noise2.c | Brian Paul | 2009-04-18 | 2 | -0/+209 |
| | |||||
* | demos: new glsl/array.c demo | Brian Paul | 2009-04-17 | 2 | -0/+269 |
| | | | | Test variable indexing into a uniform array in a vertex shader. | ||||
* | demos: set init window size, not pos | Brian Paul | 2009-04-16 | 1 | -1/+1 |
| | |||||
* | demos: fix aspect ratio in Reshape() | Brian Paul | 2009-04-09 | 1 | -1/+2 |
| | |||||
* | progs: Ignores | Jakob Bornecrantz | 2009-04-02 | 1 | -0/+1 |
| | |||||
* | demos: added progs/glsl/linktest.c to test linking of separate compilation units | Brian Paul | 2009-04-01 | 2 | -0/+265 |
| | |||||
* | progs/glsl: Ignore | Jakob Bornecrantz | 2009-03-12 | 1 | -0/+1 |
| | |||||
* | demos: add progs/glsl/shadow_sampler.c to test GLSL shadow2D(), etc. | Brian Paul | 2009-02-28 | 2 | -0/+342 |
| | | | | | Heh, I wrote this program a long time ago but just discovered today that it wasn't in git. | ||||
* | mesa: merge gallium-0.2 into gallium-master-merge | Brian Paul | 2009-02-09 | 7 | -58/+302 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Ignores | Jakob Bornecrantz | 2009-01-21 | 1 | -0/+1 |
| | | |||||
| * | mesa: add new samplers_array test | Alan Hourihane | 2009-01-14 | 2 | -0/+18 |
| | | |||||
| * | 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 |