Skip to content

Commit

Permalink
Added an apple specific exclusion for setting anisotropic filtering l…
Browse files Browse the repository at this point in the history
…evel

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.)
  • Loading branch information
adam4813 authored and milesrout committed Jan 27, 2020
1 parent 1ea23c8 commit 921ff81
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions client/graphics/texture-object.cpp
Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit 921ff81

Please sign in to comment.