From dc121dbc2701de31f92c0da8be56cd22ff791090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Wed, 18 Jul 2018 20:30:45 -0700 Subject: [PATCH] Cleanup. --- makefile | 2 +- src/bimg_p.h | 2 +- src/image.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/makefile b/makefile index ea63344..c9a4aa0 100644 --- a/makefile +++ b/makefile @@ -308,7 +308,7 @@ texturev: .build/projects/$(BUILD_PROJECT_DIR) ## Build texturev tool. $(SILENT) $(MAKE) -C .build/projects/$(BUILD_PROJECT_DIR) texturev config=$(BUILD_TOOLS_CONFIG) $(SILENT) cp .build/$(BUILD_OUTPUT_DIR)/bin/texturev$(BUILD_TOOLS_SUFFIX)$(EXE) tools/bin/$(OS)/texturev$(EXE) -tools: geometryc shaderc texturec texturev ## Build tools. +tools: texturec ## Build tools. clean-tools: ## Clean tools projects. -$(SILENT) rm -r .build/projects/$(BUILD_PROJECT_DIR) diff --git a/src/bimg_p.h b/src/bimg_p.h index a28a2f7..9e3b400 100644 --- a/src/bimg_p.h +++ b/src/bimg_p.h @@ -43,7 +43,7 @@ namespace bimg { if (_hasMips) { - const uint32_t max = bx::uint32_max(bx::uint32_max(_width, _height), _depth); + const uint32_t max = bx::max(_width, _height, _depth); const uint32_t num = 1 + uint32_t(bx::log2(float(max) ) ); return uint8_t(num); diff --git a/src/image.cpp b/src/image.cpp index 078b7a4..d674e35 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -3913,8 +3913,8 @@ namespace bimg _imageContainer.m_depth = depth; _imageContainer.m_format = format; _imageContainer.m_orientation = Orientation::R0; - _imageContainer.m_numLayers = uint16_t(bx::uint32_max(numberOfArrayElements, 1) ); - _imageContainer.m_numMips = uint8_t(bx::uint32_max(numMips, 1) ); + _imageContainer.m_numLayers = bx::max(numberOfArrayElements, 1); + _imageContainer.m_numMips = bx::max(numMips, 1); _imageContainer.m_hasAlpha = hasAlpha; _imageContainer.m_cubeMap = numFaces > 1; _imageContainer.m_ktx = true; @@ -4079,7 +4079,7 @@ namespace bimg _imageContainer.m_format = format; _imageContainer.m_orientation = Orientation::R0; _imageContainer.m_numLayers = 1; - _imageContainer.m_numMips = uint8_t(bx::uint32_max(numMips, 1) ); + _imageContainer.m_numMips = bx::max(numMips, 1); _imageContainer.m_hasAlpha = hasAlpha; _imageContainer.m_cubeMap = numFaces > 1; _imageContainer.m_ktx = false; @@ -5377,7 +5377,7 @@ namespace bimg const uint8_t* src = (const uint8_t*)_src; - const uint32_t numLayers = bx::uint32_max(_numLayers, 1); + const uint32_t numLayers = bx::max(_numLayers, 1); const uint32_t numSides = _cubeMap ? 6 : 1; uint32_t width = _width; @@ -5433,7 +5433,7 @@ namespace bimg } const uint32_t numMips = _imageContainer.m_numMips; - const uint32_t numLayers = bx::uint32_max(_imageContainer.m_numLayers, 1); + const uint32_t numLayers = bx::max(_imageContainer.m_numLayers, 1); const uint32_t numSides = _imageContainer.m_cubeMap ? 6 : 1; for (uint8_t lod = 0; lod < numMips && _err->isOk(); ++lod)