diff options
author | Keith Whitwell <keithw@vmware.com> | 2009-03-06 21:15:19 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2009-03-06 21:15:19 +0000 |
commit | 185ff38895cfc1376f21d892b122235ed0563922 (patch) | |
tree | a75ee02dc6035046540d23ec1299c391486a2453 /progs | |
parent | 2dd9a0197cf3d4d8ee5808c613fab9a256b9a0e6 (diff) |
fp: add some more texture, position and kill tests
Diffstat (limited to 'progs')
-rw-r--r-- | progs/fp/fp-tri.c | 20 | ||||
-rw-r--r-- | progs/fp/tex-pos-kil.txt | 8 | ||||
-rw-r--r-- | progs/fp/tex-pos.txt | 6 | ||||
-rw-r--r-- | progs/fp/tex.txt | 3 |
4 files changed, 36 insertions, 1 deletions
diff --git a/progs/fp/fp-tri.c b/progs/fp/fp-tri.c index b695901bcdd..1598739c576 100644 --- a/progs/fp/fp-tri.c +++ b/progs/fp/fp-tri.c @@ -11,6 +11,11 @@ #include <GL/glew.h> #include <GL/glut.h> +#include "readtex.c" + + +#define TEXTURE_FILE "../images/bw.rgb" + unsigned show_fps = 0; unsigned int frame_cnt = 0; void alarmhandler(int); @@ -65,6 +70,7 @@ static void args(int argc, char *argv[]) static void Init( void ) { + GLuint Texture; GLint errno; GLuint prognum; char buf[4096]; @@ -107,7 +113,19 @@ static void Init( void ) } glEnable(GL_FRAGMENT_PROGRAM_ARB); - glClearColor(.3, .3, .3, 0); + + /* Load texture */ + glGenTextures(1, &Texture); + glBindTexture(GL_TEXTURE_2D, Texture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + if (!LoadRGBMipmaps(TEXTURE_FILE, GL_RGB)) { + printf("Error: couldn't load texture image file %s\n", TEXTURE_FILE); + exit(1); + } + + glClearColor(.1, .3, .5, 0); } static void Reshape(int width, int height) diff --git a/progs/fp/tex-pos-kil.txt b/progs/fp/tex-pos-kil.txt new file mode 100644 index 00000000000..b7aaa9f7c88 --- /dev/null +++ b/progs/fp/tex-pos-kil.txt @@ -0,0 +1,8 @@ +!!ARBfp1.0 +TEMP R0; +MUL R0, fragment.position, {0.008}.x; +TEX R0, R0, texture[0], 2D; +SUB R0, R0, {0.25}.x; +KIL R0.xyzz; +MOV result.color, fragment.color; +END diff --git a/progs/fp/tex-pos.txt b/progs/fp/tex-pos.txt new file mode 100644 index 00000000000..b969f423f57 --- /dev/null +++ b/progs/fp/tex-pos.txt @@ -0,0 +1,6 @@ +!!ARBfp1.0 +TEMP R0; +MOV R0, {0.0}.x; +MUL R0.xy, fragment.position, {0.008}.x; +TEX result.color, R0, texture[0], 2D; +END diff --git a/progs/fp/tex.txt b/progs/fp/tex.txt new file mode 100644 index 00000000000..b3a885d9e07 --- /dev/null +++ b/progs/fp/tex.txt @@ -0,0 +1,3 @@ +!!ARBfp1.0 +TEX result.color, fragment.color, texture[0], 2D; +END |