From 921ff815c775d3c2af00b34f2f36531994f657b4 Mon Sep 17 00:00:00 2001 From: Adam Martin Date: Sun, 26 Jan 2020 00:28:10 -0600 Subject: [PATCH] Added an apple specific exclusion for setting anisotropic filtering level OSX doesn't define the proper gl ext (GL_TEXTURE_MAX_ANISOTROPY_EXT) that is well supported. but never fully standardized (for over a decade.) --- client/graphics/texture-object.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/client/graphics/texture-object.cpp b/client/graphics/texture-object.cpp index 43048aff..38f4a464 100644 --- a/client/graphics/texture-object.cpp +++ b/client/graphics/texture-object.cpp @@ -91,7 +91,11 @@ namespace tec { GLint magfilter = GL_LINEAR; // TODO Add a get/set magfilter and add code to generate mipmaps glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, magfilter); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 16.0f); + +#ifndef __APPLE__ + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 16.0f); // GL_TEXTURE_MAX_ANISOTROPY_EXT is not defined on osx +#endif + err = glGetError(); if (err) { _log->trace("[Texture-Object] Error setting texture filters"); @@ -167,7 +171,11 @@ namespace tec { } glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 16.0f); + +#ifndef __APPLE__ + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 16.0f); // GL_TEXTURE_MAX_ANISOTROPY_EXT is not defined on osx +#endif + err = glGetError(); if (err) { _log->trace("[Texture-Object] Error setting texture filters");