MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport MT5 hasNPotSupport()

Browse Source
This commit is contained in:
MoNTE48 2020-04-20 21:27:46 +02:00
parent 8a645b1c5f
commit d4c34bfe75
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/client/tile.cpp
View File

@ -995,6 +995,27 @@ video::IImage* TextureSource::generateImage(const std::string &name)
} }
#if defined(__ANDROID__) || defined(__IOS__) #if defined(__ANDROID__) || defined(__IOS__)
static inline u16 get_GL_major_version()
{
const GLubyte *gl_version = glGetString(GL_VERSION);
return (u16) (gl_version[0] - '0');
}
/**
* Check if hardware requires npot2 aligned textures
* @return true if alignment NOT(!) requires, false otherwise
*/
bool hasNPotSupport()
{
// Only GLES2 is trusted to correctly report npot support
// Note: we cache the boolean result, the GL context will never change.
static const bool supported = get_GL_major_version() > 1 &&
glGetString(GL_EXTENSIONS) &&
strstr((char *)glGetString(GL_EXTENSIONS), "GL_OES_texture_npot");
return supported;
}
/** /**
* Check and align image to npot2 if required by hardware * Check and align image to npot2 if required by hardware
* @param image image to check for npot2 alignment * @param image image to check for npot2 alignment
@ -1002,22 +1023,13 @@ video::IImage* TextureSource::generateImage(const std::string &name)
* @return image or copy of image aligned to npot2 * @return image or copy of image aligned to npot2
*/ */
inline u16 get_GL_major_version()
{
const GLubyte *gl_version = glGetString(GL_VERSION);
return (u16) (gl_version[0] - '0');
}
video::IImage * Align2Npot2(video::IImage * image, video::IImage * Align2Npot2(video::IImage * image,
video::IVideoDriver* driver) video::IVideoDriver* driver)
{ {
if (image == NULL) if (image == NULL)
return image; return image;
// Only GLES2 is trusted to correctly report npot support if (hasNPotSupport())
// Note: we cache the boolean result. GL context will never change on Android/iOS.
if (get_GL_major_version() > 1 && glGetString(GL_EXTENSIONS) &&
strstr((char *)glGetString(GL_EXTENSIONS), "GL_OES_texture_npot"))
return image; return image;
core::dimension2d<u32> dim = image->getDimension(); core::dimension2d<u32> dim = image->getDimension();