diff options
| author | Ixtli <cg@325i.org> | 2010-04-01 17:03:25 +0900 |
|---|---|---|
| committer | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-24 10:19:47 -0400 |
| commit | aec2b3cc4236f6fc7e2701d3564e54c562537a1c (patch) | |
| tree | 67361c3b3dcd6cc999aed7cea910c6415ac4e162 /crawl-ref/source/glwrapper-ogl.cc | |
| parent | 024c5583f5ff9cccba54004b47529ed9e9b03d60 (diff) | |
| download | crawl-ref-aec2b3cc4236f6fc7e2701d3564e54c562537a1c.tar.gz crawl-ref-aec2b3cc4236f6fc7e2701d3564e54c562537a1c.zip | |
Merged cgcontext into uiwrapper-sdl
Diffstat (limited to 'crawl-ref/source/glwrapper-ogl.cc')
| -rw-r--r-- | crawl-ref/source/glwrapper-ogl.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/glwrapper-ogl.cc b/crawl-ref/source/glwrapper-ogl.cc index 81fcca68c0..5a0f1b3964 100644 --- a/crawl-ref/source/glwrapper-ogl.cc +++ b/crawl-ref/source/glwrapper-ogl.cc @@ -174,6 +174,7 @@ void OGLStateManager::load_texture(unsigned char *pixels, unsigned int width, const unsigned int bpp = 4; const GLenum texture_format = GL_RGBA; const GLenum format = GL_UNSIGNED_BYTE; + // Also assume that the texture is already bound using bind_texture glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); |