summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-10 22:09:52 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-12 20:40:15 +0100
commit137ade7226af37d073a5755b90181275664dd65c (patch)
treecf44c61e90348b9a5f07b415b96003f07fc1a8d8
parent4f9888c281ff9b4953159fba1a03f59e7dcb116b (diff)
downloadmana-137ade7226af37d073a5755b90181275664dd65c.tar.gz
mana-137ade7226af37d073a5755b90181275664dd65c.tar.bz2
mana-137ade7226af37d073a5755b90181275664dd65c.tar.xz
mana-137ade7226af37d073a5755b90181275664dd65c.zip
Leave the default values for OpenGL texture filters
The scaled wallpaper looks quite a bit better when linear texture smoothing is applied, and I could not measure a significant difference in framerate from setting the texture filter to GL_NEAREST. Hence it seems not necessary to me to introduce the smoothing as an option. The default value for GL_TEXTURE_MIN_FILTER is GL_NEAREST_MIPMAP_LINEAR and the default for GL_TEXTURE_MAG_FILTER is GL_LINEAR. These make sure that the texture is reasonably smoothed by using the weighted average of the nearest four pixels. Reviewed-by: Erik Schilling
-rw-r--r--src/resources/image.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 975bd647..a29d475d 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -496,8 +496,6 @@ Image *Image::_GLload(SDL_Surface *tmpImage)
tmpImage->pixels);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
- glTexParameteri(mTextureType, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(mTextureType, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
if (SDL_MUSTLOCK(tmpImage))
SDL_UnlockSurface(tmpImage);