use vertex.attrib[3] instead of vertex.color
authorBrian Paul <brian.paul@tungstengraphics.com>
Fri, 21 Apr 2006 01:02:27 +0000 (01:02 +0000)
committerBrian Paul <brian.paul@tungstengraphics.com>
Fri, 21 Apr 2006 01:02:27 +0000 (01:02 +0000)
progs/tests/arbvptest3.c
progs/tests/arbvpwarpmesh.c

index 5f6d4f7e99d524099d08fdb1928fe0ead3ca0b52..6437062900e5bfad764d198caf173f82bb557321 100644 (file)
@@ -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"
index a9e2564bc4c30622e6395e66e6294067edc89a54..3dfe94f7596709ac7a4a156f943bffa77f751218 100644 (file)
@@ -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";