summaryrefslogtreecommitdiffstats
path: root/progs/glsl
Commit message (Collapse)AuthorAgeFilesLines
* progs/glsl: Fix memory leak in deriv.c.Vinson Lee2009-12-031-0/+1
| | | | (cherry picked from commit 0e783c7d03128aade3ca50b28a56e254fef6b6ab)
* progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c.Vinson Lee2009-12-031-1/+1
| | | | | | | tangentAtrrib is assigned the result of glGetAttribLocation. The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if tangentAttrib is a GLuint. (cherry picked from commit b8dcb79c53796f37234bd2b0f5e2845f817fc218)
* progs/glsl: Redraw upon keypress.Vinson Lee2009-12-031-1/+1
| | | | (cherry picked from commit 881f55236ad85f95745e70f8363726fa3c201f80)
* progs/glsl: Fix trirast GLSL compilation errors on Mac OS.Vinson Lee2009-12-021-3/+3
| | | | (cherry picked from commit 4b3ec2acf2cc2830b0907e4fb4db8bd1ff4a18e3)
* progs/glsl: Fix noise GLSL compilation error on Mac OS.Vinson Lee2009-12-021-1/+1
| | | | (cherry picked from commit 0d31990b4742eccdf6ae6a3b3e16c81cc863085d)
* demos/glsl: Add missing break statement to noise test.Vinson Lee2009-12-021-0/+1
| | | | (cherry picked from commit 7dfea5c0722e9da101805c15b9dd26352816bca9)
* progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.Vinson Lee2009-12-021-5/+5
| | | | (cherry picked from commit d4dc2e30dada1be425e95ba270920db6eb210982)
* progs/glsl: Add missing break statement in multinoise.c.Vinson Lee2009-12-021-0/+1
| | | | (cherry picked from commit 43080e40aa0d34423e10f1d50aad15289b2b9aec)
* progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.Vinson Lee2009-12-021-1/+1
| | | | (cherry picked from commit 04442841fb7e9138eb50ff692952ad7e8c3877d8)
* progs/glsl: Include local headers before installed headers during compilation.Vinson Lee2009-12-021-1/+1
| | | | | | Fixes compilation errors on platforms with insufficient older installed GL headers. (cherry picked from commit d17af7d1e19e637e29db47bd8f6e3e579760c530)
* progs/glsl: minor Makefile clean-upsBrian Paul2009-12-021-8/+7
| | | | (cherry picked from commit 4df2f7af5e9b2c00ead92fe0ae49ed8491aef1d0)
* Fix building of GLSL demos which use M_PIJon TURNEY2009-10-053-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.cBrian Paul2009-08-261-3/+16
|
* Merge branch 'mesa_7_5_branch'Brian Paul2009-08-262-4/+16
|\
| * progs/glsl: add special Makefile rule for samplers_arrayBrian Paul2009-08-261-1/+3
| |
| * progs/glsl: change samplers.c to better test sampler/texture indexingBrian Paul2009-08-261-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.cBrian Paul2009-08-261-8/+12
| |
* | progs/glsl: call ValidateShaderProgram()Brian Paul2009-08-251-0/+2
| |
* | progs/glsl: report compile/link times in shtest.cBrian Paul2009-08-201-0/+10
| |
* | progs/glsl: update multitex.shtest for new texture syntaxBrian Paul2009-08-201-2/+2
| |
* | progs/glsl: update shtest.c to handle 1D/3D/CUBE/RECT texturesBrian Paul2009-08-201-16/+70
| |
* | progs/glsl: tweaks to shtest.cBrian Paul2009-08-201-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.cBrian Paul2009-08-201-0/+2
| |
* | demos/glsl: remove glutInitWindowPosition() callsBrian Paul2009-08-1718-18/+0
| |
* | mesa: Add 2 new demos to .gitignore.Pauli Nieminen2009-08-151-0/+1
| |
* | glsl: re-write Makefile after I called it bad.Dave Airlie2009-08-141-157/+9
| |
* | progs/glsl: added multitex.shtest config fileBrian Paul2009-08-131-0/+6
| |
* | progs/glsl: set generic vertex attribute valuesBrian Paul2009-08-131-2/+15
| |
* | progs/glsl: add type field to shtest config filesBrian Paul2009-08-134-54/+108
| | | | | | | | Plus, texture loading.
* | glsl/tests: skinning.oDave Airlie2009-08-141-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 appBrian Paul2009-08-135-2/+609
| | | | | | | | This commit includes some sample config files (*.shtest)
* | progs/glsl: change uniform_info::type field to use GLSL vector typesBrian Paul2009-08-128-35/+35
| |
* | demos: rename InitUniforms() to SetUniformValues()Brian Paul2009-08-127-7/+14
| | | | | | | | And call new PrintUniforms() in demos.
* | demos: Fix the VBO usage in glsl/multitex.Eric Anholt2009-08-101-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 Paul2009-07-1724-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 GLEWBrian Paul2009-07-1724-344/+232
| | | | | | | | | | This is a follow-on to b799af91d5ffbee1481161fec29eb4c92b161272. Remove _func function suffix and unneeded #includes.
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-07-131-0/+1
|\|
| * demos: set 4th component of texcoord to 1.0Brian Paul2009-07-101-0/+1
| | | | | | | | Avoid potential randomness in resulting texcoords.
* | demos: indentation fixBrian Paul2009-07-081-1/+1
| |
* | demos: use glEnable/DisableClientState() for vertex arraysBrian Paul2009-07-081-1/+1
| |
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-291-1/+1
|\|
| * progs/glsl: link with GLEW libraryBrian Paul2009-06-291-1/+1
| |
* | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-06-1426-1/+105
|\|
| * progs/glsl: compile with scons and glewKeith Whitwell2009-06-2926-1/+105
| | | | | | | | Get most of these working with scons.
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-011-10/+11
|\|
| * demos: add missing dependencies for util filesBrian Paul2009-06-011-10/+11
| |
| * demos: fix multitex.c VertCoord attribute mappingBrian Paul2009-05-221-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 objectBrian Paul2009-05-221-6/+87
|/
* progs/glsl: Update ignoreJakob Bornecrantz2009-04-191-0/+3
|
* demos: added glsl/texaaline.c program and overhaul the MakefileBrian Paul2009-04-182-148/+499
|