diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-21 01:02:27 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-21 01:02:27 +0000 |
| commit | fb87976ef6b4445767c2057b8503681edaef154a (patch) | |
| tree | d1389e194e97714cf18da8d20d501995e67b2146 /progs | |
| parent | 8743d00571bbc4f4ec47afdc713a10b1b25b6dd6 (diff) | |
| download | external_mesa3d-fb87976ef6b4445767c2057b8503681edaef154a.zip external_mesa3d-fb87976ef6b4445767c2057b8503681edaef154a.tar.gz external_mesa3d-fb87976ef6b4445767c2057b8503681edaef154a.tar.bz2 | |
use vertex.attrib[3] instead of vertex.color
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/tests/arbvptest3.c | 5 | ||||
| -rw-r--r-- | progs/tests/arbvpwarpmesh.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/progs/tests/arbvptest3.c b/progs/tests/arbvptest3.c index 5f6d4f7..6437062 100644 --- a/progs/tests/arbvptest3.c +++ b/progs/tests/arbvptest3.c @@ -1,4 +1,3 @@ -/* Test glGenProgramsNV(), glIsProgramNV(), glLoadProgramNV() */ #include <assert.h> #include <string.h> @@ -16,7 +15,7 @@ static void Display( void ) glClearColor(0.3, 0.3, 0.3, 1); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - glEnable(GL_VERTEX_PROGRAM_NV); + glEnable(GL_VERTEX_PROGRAM_ARB); glLoadIdentity(); glRotatef(Zrot, 0, 0, 1); @@ -84,7 +83,7 @@ static void Init( void ) static const char *prog1 = "!!ARBvp1.0\n" - "MOV result.color, vertex.color;\n" + "MOV result.color, vertex.attrib[3];\n" "DP4 result.position.x, vertex.position, state.matrix.modelview.row[0];\n" "DP4 result.position.y, vertex.position, state.matrix.modelview.row[1];\n" diff --git a/progs/tests/arbvpwarpmesh.c b/progs/tests/arbvpwarpmesh.c index a9e2564..3dfe94f 100644 --- a/progs/tests/arbvpwarpmesh.c +++ b/progs/tests/arbvpwarpmesh.c @@ -187,7 +187,7 @@ static void Init( void ) "DP4 result.position.z, state.matrix.mvp.row[2], R3 ;\n" "DP4 result.position.w, state.matrix.mvp.row[3], R3 ;\n" - "MOV result.color, vertex.color;\n # copy input color to output color\n" + "MOV result.color, vertex.attrib[3];\n # copy input color to output color\n" "END"; |