Browse Source

use vertex.attrib[3] instead of vertex.color

tags/mesa-6_5-20060712
Brian Paul 19 years ago
parent
commit
fb87976ef6
2 changed files with 3 additions and 4 deletions
  1. 2
    3
      progs/tests/arbvptest3.c
  2. 1
    1
      progs/tests/arbvpwarpmesh.c

+ 2
- 3
progs/tests/arbvptest3.c View 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"

+ 1
- 1
progs/tests/arbvpwarpmesh.c View 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";


Loading…
Cancel
Save