fix filter mode calculation

inolen · Apr 23, 2016 · 18232d8 · 18232d8
1 parent 7c2cdfb
commit 18232d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/renderer/backend.h b/src/renderer/backend.h
@@ -20,6 +20,7 @@ enum PixelFormat {
 enum FilterMode {
   FILTER_NEAREST,
   FILTER_BILINEAR,
+  NUM_FILTER_MODES,
 };
 
 enum WrapMode {

diff --git a/src/renderer/gl_backend.cc b/src/renderer/gl_backend.cc
@@ -129,7 +129,7 @@ TextureHandle GLBackend::RegisterTexture(PixelFormat format, FilterMode filter,
   glGenTextures(1, &gltex);
   glBindTexture(GL_TEXTURE_2D, gltex);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
-                  filter_funcs[filter * mipmaps]);
+                  filter_funcs[mipmaps * NUM_FILTER_MODES + filter]);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter_funcs[filter]);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_modes[wrap_u]);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_modes[wrap_v]);