X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=progs%2Ftests%2Ftexrect.c;h=10061ee5869e6ededeb146ea1bf091bb02f7e6c1;hb=a04af335a42ce3b28e59ff9b85b2bd433a9d7b12;hp=c20251801c77c2e0351fff116f1a0c7b4e04a928;hpb=27358a24a0113a62492923abe35e8660ed7335ef;p=mesa.git diff --git a/progs/tests/texrect.c b/progs/tests/texrect.c index c20251801c7..10061ee5869 100644 --- a/progs/tests/texrect.c +++ b/progs/tests/texrect.c @@ -1,4 +1,3 @@ -/* $Id: texrect.c,v 1.3 2003/05/20 09:54:58 keithw Exp $ */ /* GL_NV_texture_rectangle test * @@ -7,12 +6,13 @@ */ -#define GL_GLEXT_PROTOTYPES #include #include #include #include +#include #include +#include "readtex.h" #define TEXTURE_0_FILE "../images/girl.rgb" #define TEXTURE_1_FILE "../images/reflect.rgb" @@ -20,9 +20,14 @@ #define TEX0 1 #define TEX7 8 #define ANIMATE 10 +#define CLAMP 20 +#define CLAMP_TO_EDGE 21 +#define CLAMP_TO_BORDER 22 +#define LINEAR_FILTER 30 +#define NEAREST_FILTER 31 #define QUIT 100 -static GLboolean Animate = GL_TRUE; +static GLboolean Animate = GL_FALSE; static GLint NumUnits = 2; static GLboolean TexEnabled[8]; static GLint Width[8], Height[8]; /* image sizes */ @@ -33,7 +38,7 @@ static GLfloat Xrot = 00.0, Yrot = 00.0, Zrot = 0.0; static void Idle( void ) { - Zrot += 1.0; + Zrot = glutGet(GLUT_ELAPSED_TIME) * 0.01; glutPostRedisplay(); } @@ -41,7 +46,7 @@ static void Idle( void ) static void DrawObject(void) { GLint i; - GLfloat d = 0; /* set this >0 to test clamping */ + GLfloat d = 10; /* so we can see how borders are handled */ glColor3f(.1, .1, .1); /* modulate this */ @@ -56,11 +61,11 @@ static void DrawObject(void) glVertex2f(-1.0, -1.0); for (i = 0; i < NumUnits; i++) - glMultiTexCoord2fARB(GL_TEXTURE0_ARB + i, Width[i]+d, -3); + glMultiTexCoord2fARB(GL_TEXTURE0_ARB + i, Width[i]+d, -d); glVertex2f(1.0, -1.0); for (i = 0; i < NumUnits; i++) - glMultiTexCoord2fARB(GL_TEXTURE0_ARB + i, Width[i]+d, Height[i]+3); + glMultiTexCoord2fARB(GL_TEXTURE0_ARB + i, Width[i]+d, Height[i]+d); glVertex2f(1.0, 1.0); for (i = 0; i < NumUnits; i++) @@ -102,9 +107,10 @@ static void Reshape( int width, int height ) static void ModeMenu(int entry) { + GLint i; if (entry >= TEX0 && entry < TEX0 + NumUnits) { /* toggle */ - GLint i = entry - TEX0; + i = entry - TEX0; TexEnabled[i] = !TexEnabled[i]; glActiveTextureARB(GL_TEXTURE0_ARB + i); if (TexEnabled[i]) { @@ -125,6 +131,42 @@ static void ModeMenu(int entry) else glutIdleFunc(NULL); } + else if (entry==CLAMP) { + for (i = 0; i < NumUnits; i++) { + glActiveTextureARB(GL_TEXTURE0_ARB + i); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_WRAP_T, GL_CLAMP); + } + } + else if (entry==CLAMP_TO_EDGE) { + for (i = 0; i < NumUnits; i++) { + glActiveTextureARB(GL_TEXTURE0_ARB + i); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + } + } + else if (entry==CLAMP_TO_BORDER) { + for (i = 0; i < NumUnits; i++) { + glActiveTextureARB(GL_TEXTURE0_ARB + i); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER); + } + } + else if (entry==NEAREST_FILTER) { + for (i = 0; i < NumUnits; i++) { + glActiveTextureARB(GL_TEXTURE0_ARB + i); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + } + } + else if (entry==LINEAR_FILTER) { + for (i = 0; i < NumUnits; i++) { + glActiveTextureARB(GL_TEXTURE0_ARB + i); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + } + } + else if (entry==QUIT) { exit(0); } @@ -138,6 +180,19 @@ static void Key( unsigned char key, int x, int y ) (void) x; (void) y; switch (key) { + case 'z': + Zrot -= 1.0; + break; + case 'Z': + Zrot += 1.0; + break; + case 'a': + Animate = !Animate; + if (Animate) + glutIdleFunc(Idle); + else + glutIdleFunc(NULL); + break; case 27: exit(0); break; @@ -172,6 +227,7 @@ static void SpecialKey( int key, int x, int y ) static void Init( int argc, char *argv[] ) { + const GLenum wrap = GL_CLAMP; GLuint texObj[8]; GLint size, i; @@ -212,6 +268,8 @@ static void Init( int argc, char *argv[] ) GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_WRAP_S, wrap); + glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_WRAP_T, wrap); if (i == 0) { GLubyte *img = LoadRGBImage(TEXTURE_0_FILE, &Width[0], &Height[0], @@ -270,6 +328,7 @@ int main( int argc, char *argv[] ) glutInitWindowPosition( 0, 0 ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE ); glutCreateWindow(argv[0] ); + glewInit(); Init( argc, argv ); @@ -288,6 +347,11 @@ int main( int argc, char *argv[] ) glutAddMenuEntry(s, TEX0 + i); } glutAddMenuEntry("Toggle Animation", ANIMATE); + glutAddMenuEntry("GL_CLAMP", CLAMP); + glutAddMenuEntry("GL_CLAMP_TO_EDGE", CLAMP_TO_EDGE); + glutAddMenuEntry("GL_CLAMP_TO_BORDER", CLAMP_TO_BORDER); + glutAddMenuEntry("GL_NEAREST", NEAREST_FILTER); + glutAddMenuEntry("GL_LINEAR", LINEAR_FILTER); glutAddMenuEntry("Quit", QUIT); glutAttachMenu(GLUT_RIGHT_BUTTON);