Mirrors/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-02-17 20:52:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-07-18 20:30:45 -07:00
parent e802985376
commit dc121dbc27
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@@ -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)

2
src/bimg_p.h
View File

@@ -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);

10
src/image.cpp
View File

@@ -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<uint16_t>(numberOfArrayElements, 1);
_imageContainer.m_numMips = bx::max<uint8_t>(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<uint8_t>(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<uint32_t>(_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<uint32_t>(_imageContainer.m_numLayers, 1);
const uint32_t numSides = _imageContainer.m_cubeMap ? 6 : 1;
for (uint8_t lod = 0; lod < numMips && _err->isOk(); ++lod)