From afc04a5d0e208e127e39308e0cf2ab58b751a2a3 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Fri, 28 Sep 2018 14:23:47 +0200 Subject: [PATCH] gs-texture: Use util::math functions --- source/gs-texture.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/gs-texture.cpp b/source/gs-texture.cpp index 720c3b13..ebc27e90 100644 --- a/source/gs-texture.cpp +++ b/source/gs-texture.cpp @@ -21,6 +21,7 @@ #include #include #include +#include "util-math.h" extern "C" { #pragma warning(push) @@ -39,12 +40,11 @@ gs::texture::texture(uint32_t width, uint32_t height, gs_color_format format, ui throw std::logic_error("height must be at least 1"); if (mip_levels == 0) throw std::logic_error("mip_levels must be at least 1"); - if (!mip_data) - throw std::logic_error("mip_data is invalid"); + //if (!mip_data) + // throw std::logic_error("mip_data is invalid"); if (mip_levels > 1 || ((texture_flags & flags::BuildMipMaps) == flags::BuildMipMaps)) { - bool isPOT = (pow(2, (int64_t)floor(log(width) / log(2))) == width) - && (pow(2, (int64_t)floor(log(height) / log(2))) == height); + bool isPOT = util::math::is_power_of_two(width) && util::math::is_power_of_two(height); if (!isPOT) throw std::logic_error("mip mapping requires power of two dimensions"); }