diff options
| author | Ixtli <cg@325i.org> | 2010-03-03 02:46:48 +0900 |
|---|---|---|
| committer | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-24 10:19:40 -0400 |
| commit | 8ff26898431bf4507a072a12077702a13c3d4030 (patch) | |
| tree | 3f6c218d975750434e43359310bf5db20f6e7704 /crawl-ref/source/glwrapper.cc | |
| parent | ef69303d12fe064332616c431f33fc69a3c740a9 (diff) | |
| download | crawl-ref-8ff26898431bf4507a072a12077702a13c3d4030.tar.gz crawl-ref-8ff26898431bf4507a072a12077702a13c3d4030.zip | |
Moved MipMapOptions to glwrapper for modularity
Diffstat (limited to 'crawl-ref/source/glwrapper.cc')
| -rw-r--r-- | crawl-ref/source/glwrapper.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/glwrapper.cc b/crawl-ref/source/glwrapper.cc index ab23602863..b058c448d7 100644 --- a/crawl-ref/source/glwrapper.cc +++ b/crawl-ref/source/glwrapper.cc @@ -154,7 +154,7 @@ void GLStateManager::bindTexture(unsigned int texture) } void GLStateManager::loadTexture(unsigned char *pixels, unsigned int width, - unsigned int height, GenericTexture::MipMapOptions mip_opt) + unsigned int height, MipMapOptions mip_opt) { // Assumptions... const unsigned int bpp = 4; @@ -165,7 +165,7 @@ void GLStateManager::loadTexture(unsigned char *pixels, unsigned int width, glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - if (mip_opt == GenericTexture::MIPMAP_CREATE) + if (mip_opt == MIPMAP_CREATE) { glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); |