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/tiletex.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/tiletex.cc')
-rw-r--r-- | crawl-ref/source/tiletex.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/tiletex.cc b/crawl-ref/source/tiletex.cc index e1886e6cbc..5bc841abe4 100644 --- a/crawl-ref/source/tiletex.cc +++ b/crawl-ref/source/tiletex.cc @@ -37,7 +37,7 @@ void GenericTexture::unload_texture() } bool GenericTexture::load_texture(const char *filename, - GenericTexture::MipMapOptions mip_opt, + MipMapOptions mip_opt, tex_proc_func proc, bool force_power_of_two) { @@ -218,14 +218,14 @@ bool GenericTexture::load_texture(const char *filename, bool GenericTexture::load_texture(unsigned char *pixels, unsigned int new_width, unsigned int new_height, - GenericTexture::MipMapOptions mip_opt) + MipMapOptions mip_opt) { if (!pixels || !new_width || !new_height) return (false); m_width = new_width; m_height = new_height; - + GLStateManager::generateTextures(1, &m_handle); GLStateManager::bindTexture(m_handle); GLStateManager::loadTexture(pixels, m_width, m_height, mip_opt); |