summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-25 20:43:40 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-25 20:44:35 +0100
commitadd7a65f3f20c28b4c9fc24be5751b2cdd4093b5 (patch)
treed71777c6e5298a7eb8f911c713896a20646cd26c /3rdparty
parent08d84121d4c666e6db0e7f7791f80674626babc3 (diff)
Make Android targets compile but not link, using clang compiler in NDK, since GCC will be removed in next one (nw)
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/bgfx/src/image.cpp4
-rw-r--r--3rdparty/bgfx/src/image.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/3rdparty/bgfx/src/image.cpp b/3rdparty/bgfx/src/image.cpp
index 34dcae9e54c..3a5c0d592b5 100644
--- a/3rdparty/bgfx/src/image.cpp
+++ b/3rdparty/bgfx/src/image.cpp
@@ -2211,9 +2211,9 @@ namespace bgfx
}
}
- const Memory* imageAlloc(ImageContainer& _imageContainer, TextureFormat::Enum _format, uint16_t _width, uint16_t _height, uint16_t _depth, bool _cubeMap, bool _mips)
+ const Memory* imageAlloc(ImageContainer& _imageContainer, TextureFormat::Enum _format, uint16_t _width, uint16_t _height, uint16_t _depth, bool _cubeMap, bool _mipsActive)
{
- const uint8_t numMips = _mips ? imageGetNumMips(_format, _width, _height) : 1;
+ const uint8_t numMips = _mipsActive ? imageGetNumMips(_format, _width, _height) : 1;
uint32_t size = imageGetSize(_format, _width, _height, 0, false, numMips);
const Memory* image = alloc(size);
diff --git a/3rdparty/bgfx/src/image.h b/3rdparty/bgfx/src/image.h
index 458d7e51c46..1baba0bae68 100644
--- a/3rdparty/bgfx/src/image.h
+++ b/3rdparty/bgfx/src/image.h
@@ -121,7 +121,7 @@ namespace bgfx
bool imageConvert(void* _dst, TextureFormat::Enum _dstFormat, const void* _src, TextureFormat::Enum _srcFormat, uint32_t _width, uint32_t _height);
///
- const Memory* imageAlloc(ImageContainer& _imageContainer, TextureFormat::Enum _format, uint16_t _width, uint16_t _height, uint16_t _depth = 0, bool _cubeMap = false, bool _mips = false);
+ const Memory* imageAlloc(ImageContainer& _imageContainer, TextureFormat::Enum _format, uint16_t _width, uint16_t _height, uint16_t _depth = 0, bool _cubeMap = false, bool _mipsActive = false);
///
void imageFree(const Memory* _memory);