diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-05-28 11:45:22 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-05-28 11:45:22 +0100 |
| commit | fdea7529ba09a615d92da5823429b49c7e565c9d (patch) | |
| tree | 67b12689c60dc2e75a5587988dd11bf36c12da9a /assetFactory/texturePacker.cpp | |
| parent | Mark main rule as always, so we can always launch it (diff) | |
| parent | Swap GLEW for more modern glad (diff) | |
| download | ilt-fdea7529ba09a615d92da5823429b49c7e565c9d.tar.bz2 ilt-fdea7529ba09a615d92da5823429b49c7e565c9d.tar.xz ilt-fdea7529ba09a615d92da5823429b49c7e565c9d.zip | |
Merge branch 'glad'
Diffstat (limited to 'assetFactory/texturePacker.cpp')
| -rw-r--r-- | assetFactory/texturePacker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/assetFactory/texturePacker.cpp b/assetFactory/texturePacker.cpp index 1d533c1..dbafc4b 100644 --- a/assetFactory/texturePacker.cpp +++ b/assetFactory/texturePacker.cpp @@ -1,8 +1,8 @@ #include "texturePacker.h" #include "collections.h" -#include <GL/glew.h> #include <algorithm> #include <cstdio> +#include <glad/gl.h> #include <glm/common.hpp> #include <numeric> #include <ostream> @@ -65,7 +65,7 @@ TexturePacker::pack(Size size) const return {}; } } - if (GLEW_ARB_texture_non_power_of_two) { + if (GL_ARB_texture_non_power_of_two) { // Crop the size back to minimum size size = std::transform_reduce( result.begin(), result.end(), inputImages.begin(), Size {}, |