From 8aa9a311491d4b2557ae662426bc661df09d340a Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Mon, 1 Jun 2015 00:21:50 -0400
Subject: [PATCH] simpler mipmap, sampling settimg logic

---
 core/src/processing/opengl/Texture.java | 57 ++++++++++++++-----------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/core/src/processing/opengl/Texture.java b/core/src/processing/opengl/Texture.java
index 40e6b6f10..a436e3131 100644
--- a/core/src/processing/opengl/Texture.java
+++ b/core/src/processing/opengl/Texture.java
@@ -519,35 +519,40 @@ public class Texture implements PConstants {
 
   public void usingMipmaps(boolean mipmaps, int sampling)  {
     if (mipmaps) {
-      if (glMinFilter != PGL.LINEAR_MIPMAP_NEAREST &&
-          glMinFilter != PGL.LINEAR_MIPMAP_LINEAR) {
-        if (sampling == POINT) {
-          glMagFilter = PGL.NEAREST;
-          glMinFilter = PGL.NEAREST;
-        } else if (sampling == LINEAR)  {
-          glMagFilter = PGL.NEAREST;
-          glMinFilter =
-            PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
-        } else if (sampling == BILINEAR)  {
-          glMagFilter = PGL.LINEAR;
-          glMinFilter =
-            PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
-        } else if (sampling == TRILINEAR)  {
-          glMagFilter = PGL.LINEAR;
-          glMinFilter =
-            PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_LINEAR : PGL.LINEAR;
-        } else {
-          throw new RuntimeException("Unknown texture filtering mode");
-        }
-      }
-
       usingMipmaps = true;
-    } else {
-      if (glMinFilter == PGL.LINEAR_MIPMAP_NEAREST ||
-        glMinFilter == PGL.LINEAR_MIPMAP_LINEAR) {
-        glMinFilter = PGL.LINEAR;
+      if (sampling == POINT) {
+        glMagFilter = PGL.NEAREST;
+        glMinFilter = PGL.NEAREST;
+        usingMipmaps = false;
+      } else if (sampling == LINEAR)  {
+        glMagFilter = PGL.NEAREST;
+        glMinFilter =
+          PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
+      } else if (sampling == BILINEAR)  {
+        glMagFilter = PGL.LINEAR;
+        glMinFilter =
+          PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_NEAREST : PGL.LINEAR;
+      } else if (sampling == TRILINEAR)  {
+        glMagFilter = PGL.LINEAR;
+        glMinFilter =
+          PGL.MIPMAPS_ENABLED ? PGL.LINEAR_MIPMAP_LINEAR : PGL.LINEAR;
+      } else {
+        throw new RuntimeException("Unknown texture filtering mode");
       }
+    } else {
       usingMipmaps = false;
+      if (sampling == POINT) {
+        glMagFilter = PGL.NEAREST;
+        glMinFilter = PGL.NEAREST;
+      } else if (sampling == LINEAR)  {
+        glMagFilter = PGL.NEAREST;
+        glMinFilter = PGL.LINEAR;
+      } else if (sampling == BILINEAR || sampling == TRILINEAR)  {
+        glMagFilter = PGL.LINEAR;
+        glMinFilter = PGL.LINEAR;
+      } else {
+        throw new RuntimeException("Unknown texture filtering mode");
+      }
     }
 
     bind();