oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Drop ENABLE_GLES option

Browse source 
ENABLE_GLES predates forking Irrlicht. Its primary use was to distinguish Irrlicht-ogles from upstream version as Minetest could be compiled with either.
That's not necessary anymore and gets in the way sometimes.
This commit is contained in:
sfan5 2023-03-05 15:10:44 +01:00
parent c26e122485
commit 9d736e8b8b
14 changed files with 33 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/client/tile.cpp
View file

@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <algorithm>
#include <ICameraSceneNode.h>
#include <IVideoDriver.h>
#include "util/string.h"
#include "util/container.h"
#include "util/thread.h"
@ -617,9 +618,7 @@ u32 TextureSource::generateTexture(const std::string &name)
video::ITexture *tex = NULL;
if (img != NULL) {
#if ENABLE_GLES
img = Align2Npot2(img, driver);
#endif
// Create texture from resulting image
tex = driver->addTexture(name.c_str(), img);
guiScalingCache(io::path(name.c_str()), driver, img);
@ -819,9 +818,7 @@ void TextureSource::rebuildTexture(video::IVideoDriver *driver, TextureInfo &ti)
// shouldn't really need to be done, but can't hurt
std::set<std::string> source_image_names;
video::IImage *img = generateImage(ti.name, source_image_names);
#if ENABLE_GLES
img = Align2Npot2(img, driver);
#endif
// Create texture from resulting image
video::ITexture *t = NULL;
if (img) {
@ -1055,8 +1052,6 @@ video::IImage* TextureSource::generateImage(const std::string &name, std::set<st
return baseimg;
}
#if ENABLE_GLES
/**
* Check and align image to npot2 if required by hardware
* @param image image to check for npot2 alignment
@ -1094,8 +1089,6 @@ video::IImage *Align2Npot2(video::IImage *image,
return targetimage;
}
#endif
static std::string unescape_string(const std::string &str, const char esc = '\\')
{
std::string out;