Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | progs/glsl: Fix trirast GLSL compilation errors on Mac OS. | Vinson Lee | 2009-12-02 | 1 | -3/+3 |
| | | | | (cherry picked from commit 4b3ec2acf2cc2830b0907e4fb4db8bd1ff4a18e3) | ||||
* | progs/glsl: Fix noise GLSL compilation error on Mac OS. | Vinson Lee | 2009-12-02 | 1 | -1/+1 |
| | | | | (cherry picked from commit 0d31990b4742eccdf6ae6a3b3e16c81cc863085d) | ||||
* | demos/glsl: Add missing break statement to noise test. | Vinson Lee | 2009-12-02 | 1 | -0/+1 |
| | | | | (cherry picked from commit 7dfea5c0722e9da101805c15b9dd26352816bca9) | ||||
* | progs/glsl: Fix multinoise GLSL compilation errors on Mac OS. | Vinson Lee | 2009-12-02 | 1 | -5/+5 |
| | | | | (cherry picked from commit d4dc2e30dada1be425e95ba270920db6eb210982) | ||||
* | progs/glsl: Add missing break statement in multinoise.c. | Vinson Lee | 2009-12-02 | 1 | -0/+1 |
| | | | | (cherry picked from commit 43080e40aa0d34423e10f1d50aad15289b2b9aec) | ||||
* | progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS. | Vinson Lee | 2009-12-02 | 1 | -1/+1 |
| | | | | (cherry picked from commit 04442841fb7e9138eb50ff692952ad7e8c3877d8) | ||||
* | progs/glsl: Include local headers before installed headers during compilation. | Vinson Lee | 2009-12-02 | 1 | -1/+1 |
| | | | | | | Fixes compilation errors on platforms with insufficient older installed GL headers. (cherry picked from commit d17af7d1e19e637e29db47bd8f6e3e579760c530) | ||||
* | progs/glsl: minor Makefile clean-ups | Brian Paul | 2009-12-02 | 1 | -8/+7 |
| | | | | (cherry picked from commit 4df2f7af5e9b2c00ead92fe0ae49ed8491aef1d0) | ||||
* | Fix building of GLSL demos which use M_PI | Jon TURNEY | 2009-10-05 | 3 | -0/+9 |
| | | | | | | Some <math.h> files do not define M_PI, in which case, provide our own definition Signed-off-by: Jon TURNEY <[email protected]> | ||||
* | progs/glsl: asst. changes in shtest.c | Brian Paul | 2009-08-26 | 1 | -3/+16 |
| | |||||
* | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-08-26 | 2 | -4/+16 |
|\ | |||||
| * | progs/glsl: add special Makefile rule for samplers_array | Brian Paul | 2009-08-26 | 1 | -1/+3 |
| | | |||||
| * | progs/glsl: change samplers.c to better test sampler/texture indexing | Brian Paul | 2009-08-26 | 1 | -4/+12 |
| | | | | | | | | | | Now the left half is yellow and the right half is red, with the gradients going in opposite directions. | ||||
* | | progs/glsl: handle window resizes in texaaline.c | Brian Paul | 2009-08-26 | 1 | -8/+12 |
| | | |||||
* | | progs/glsl: call ValidateShaderProgram() | Brian Paul | 2009-08-25 | 1 | -0/+2 |
| | | |||||
* | | 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 |
| |