diff options
author | Keith Whitwell <keithw@vmware.com> | 2009-04-17 15:54:57 +0100 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2009-04-20 16:12:11 +0100 |
commit | 70588fc83c5aa75754f7b090a63727f4791618ed (patch) | |
tree | 54e1cb18c6b14716bb7bad81822617191c04db01 /progs/tests | |
parent | c7c76ba561197b15cf9ad9028335fbc8c2c48890 (diff) |
tests/mipmap_view: add linear/nearest key
Diffstat (limited to 'progs/tests')
-rw-r--r-- | progs/tests/mipmap_view.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/progs/tests/mipmap_view.c b/progs/tests/mipmap_view.c index 16f3584f70..85fc67ac79 100644 --- a/progs/tests/mipmap_view.c +++ b/progs/tests/mipmap_view.c @@ -22,6 +22,7 @@ static int TexWidth = 256, TexHeight = 256; static int WinWidth = 1044, WinHeight = 900; static GLfloat Bias = 0.0; static GLboolean ScaleQuads = GL_FALSE; +static GLboolean Linear = GL_FALSE; static GLint Win = 0; @@ -53,6 +54,15 @@ Display(void) glColor3f(1,1,1); + if (Linear) { + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + } + else { + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + } + y = WinHeight - 300; x = 4; @@ -132,6 +142,9 @@ Key(unsigned char key, int x, int y) case 'B': Bias += 10; break; + case 'l': + Linear = !Linear; + break; case '0': case '1': case '2': @@ -222,8 +235,6 @@ Init(void) /* mipmapping required for this extension */ - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glGetFloatv(GL_MAX_TEXTURE_LOD_BIAS_EXT, &maxBias); |