summaryrefslogtreecommitdiffstats
path: root/progs/glsl/multitex.c
Commit message (Collapse)AuthorAgeFilesLines
* progs/glsl: change uniform_info::type field to use GLSL vector typesBrian Paul2009-08-121-2/+2
|
* demos: rename InitUniforms() to SetUniformValues()Brian Paul2009-08-121-1/+2
| | | | 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-171-31/+29
|\ | | | | | | | | | | | | | | | | | | | | 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-171-19/+16
| | | | | | | | | | This is a follow-on to b799af91d5ffbee1481161fec29eb4c92b161272. Remove _func function suffix and unneeded #includes.
* | 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'Jakob Bornecrantz2009-06-141-0/+2
|\|
| * progs/glsl: compile with scons and glewKeith Whitwell2009-06-291-0/+2
| | | | | | | | Get most of these working with scons.
| * 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
|/
* demos: update multitex.c GLSL demo to use vertex arrays or glVertex-modeBrian Paul2009-02-021-21/+67
| | | | Press 'a' to toggle drawing mode.
* remove .txt suffix from shader source filesBrian Paul2008-08-161-2/+2
|
* new multi-texture GLSL testBrian Paul2008-05-201-0/+285
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 17:22:56 +0000