diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-03-13 11:17:03 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-03-13 11:32:32 +0000 |
| commit | dbc3e8e93f6dc7540ace4d5c543204bdad0d0d71 (patch) | |
| tree | 4891948ae2f2c7f5e2eeb3b2fda63ff32109729a | |
| parent | f500f3a72c6be61ff9b8e1166f734e408d00aded (diff) | |
progs/vp: add keys for point prims, etc, and various new tests
| -rw-r--r-- | progs/vp/addimm.txt | 5 | ||||
| -rw-r--r-- | progs/vp/arl-static.txt | 7 | ||||
| -rw-r--r-- | progs/vp/arl-unused.txt | 7 | ||||
| -rw-r--r-- | progs/vp/exp-no-w.txt | 6 | ||||
| -rw-r--r-- | progs/vp/msk.txt | 7 | ||||
| -rw-r--r-- | progs/vp/vp-tris.c | 36 |
6 files changed, 64 insertions, 4 deletions
diff --git a/progs/vp/addimm.txt b/progs/vp/addimm.txt new file mode 100644 index 0000000000..f5796d7810 --- /dev/null +++ b/progs/vp/addimm.txt @@ -0,0 +1,5 @@ +!!ARBvp1.0 +TEMP R0; +ADD result.color, vertex.color, {.5}.x; +MOV result.position, vertex.position; +END diff --git a/progs/vp/arl-static.txt b/progs/vp/arl-static.txt new file mode 100644 index 0000000000..aea87b79a4 --- /dev/null +++ b/progs/vp/arl-static.txt @@ -0,0 +1,7 @@ +!!ARBvp1.0 +PARAM arr[5] = { {.0,.1,.2,.3}, {.4,.5,.6,.7}, {.8,.9,.10,.1}, {.12,.3,.4,.14}, {.5,.8,.1,.9}, {.2,0,.4,.1}, {.6,.1,.8,.9}}; +ADDRESS addr; +ARL addr.x, {3}.x; +MOV result.color, arr[addr.x]; +MOV result.position, vertex.position; +END diff --git a/progs/vp/arl-unused.txt b/progs/vp/arl-unused.txt new file mode 100644 index 0000000000..7bdbb8e86c --- /dev/null +++ b/progs/vp/arl-unused.txt @@ -0,0 +1,7 @@ +!!ARBvp1.0 +PARAM arr[5] = { {.0,.1,.2,.3}, {.4,.5,.6,.7}, {.8,.9,.10,.1}, {.12,.3,.4,.14}, {.5,.8,.1,.9}, {.2,0,.4,.1}, {.6,.1,.8,.9}}; +ADDRESS addr; +ARL addr.x, {3}.x; # not actually used +MOV result.color, arr[3]; +MOV result.position, vertex.position; +END diff --git a/progs/vp/exp-no-w.txt b/progs/vp/exp-no-w.txt new file mode 100644 index 0000000000..98ed4b7a98 --- /dev/null +++ b/progs/vp/exp-no-w.txt @@ -0,0 +1,6 @@ +!!ARBvp1.0 +TEMP R0; +EXP R0, vertex.color.x; +SUB result.color, R0.z, {1.0}.x; +MOV result.position, vertex.position; +END diff --git a/progs/vp/msk.txt b/progs/vp/msk.txt new file mode 100644 index 0000000000..9e925aca11 --- /dev/null +++ b/progs/vp/msk.txt @@ -0,0 +1,7 @@ +!!ARBvp1.0 +TEMP R0; +MOV R0.xz, vertex.color; +MOV R0.yw, {0.5}.x; +MOV result.color, R0; +MOV result.position, vertex.position; +END diff --git a/progs/vp/vp-tris.c b/progs/vp/vp-tris.c index 87cb12b984..e9b2479c63 100644 --- a/progs/vp/vp-tris.c +++ b/progs/vp/vp-tris.c @@ -16,6 +16,8 @@ static const char *filename = NULL; static GLuint nr_steps = 4; +static GLuint prim = GL_TRIANGLES; +static GLfloat psz = 1.0; static void usage( char *name ) { @@ -198,8 +200,9 @@ static void Display( void ) { glClearColor(0.3, 0.3, 0.3, 1); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + glPointSize(psz); - glBegin(GL_TRIANGLES); + glBegin(prim); { @@ -243,9 +246,34 @@ static void Key( unsigned char key, int x, int y ) (void) x; (void) y; switch (key) { - case 27: - exit(0); - break; + case 'p': + prim = GL_POINTS; + break; + case 't': + prim = GL_TRIANGLES; + break; + case 's': + psz += .5; + break; + case 'S': + if (psz > .5) + psz -= .5; + break; + case '+': + nr_steps++; + break; + case '-': + if (nr_steps) + nr_steps--; + break; + case ' ': + psz = 1.0; + prim = GL_TRIANGLES; + nr_steps = 4; + break; + case 27: + exit(0); + break; } glutPostRedisplay(); } |