diff options
author | 2017-02-05 13:56:35 +0100 | |
---|---|---|
committer | 2017-02-05 13:56:35 +0100 | |
commit | 1607745432f50099711d7aee355111111e66ff51 (patch) | |
tree | c4eaec8008f6e0283ca652cdffb55a34eca9b9bb /3rdparty/bgfx/tools/texturec/texturec.cpp | |
parent | 193e8c8a89a4be5c63909cdbbcca4d9d6f8fee02 (diff) |
Update BGFX and BX (nw)
Diffstat (limited to '3rdparty/bgfx/tools/texturec/texturec.cpp')
-rw-r--r-- | 3rdparty/bgfx/tools/texturec/texturec.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/3rdparty/bgfx/tools/texturec/texturec.cpp b/3rdparty/bgfx/tools/texturec/texturec.cpp index 32715c4499b..e1c60ca1da4 100644 --- a/3rdparty/bgfx/tools/texturec/texturec.cpp +++ b/3rdparty/bgfx/tools/texturec/texturec.cpp @@ -59,7 +59,9 @@ BX_PRAGMA_DIAGNOSTIC_POP(); BX_PRAGMA_DIAGNOSTIC_PUSH() BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wtype-limits") +BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-parameter") BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-value") +BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4100) // error C4100: '' : unreferenced formal parameter #define MINIZ_NO_STDIO #define TINYEXR_IMPLEMENTATION #include <tinyexr/tinyexr.h> @@ -318,7 +320,7 @@ namespace bgfx return true; case TextureFormat::BGRA8: - imageSwizzleBgra8(_width, _height, _width*4, _src, _dst); + imageSwizzleBgra8(_dst, _width, _height, _width*4, _src); return true; case TextureFormat::RGBA8: @@ -684,7 +686,7 @@ int main(int _argc, const char* _argv[]) for (uint8_t lod = 1; lod < numMips; ++lod) { - imageRgba32fDownsample2x2NormalMap(dstMip.m_width, dstMip.m_height, dstMip.m_width*16, rgba, rgba); + imageRgba32fDownsample2x2NormalMap(rgba, dstMip.m_width, dstMip.m_height, dstMip.m_width*16, rgba); imageRgba32f11to01(rgbaDst, dstMip.m_width, dstMip.m_height, dstMip.m_width*16, rgba); imageGetRawData(imageContainer, 0, lod, output->data, output->size, dstMip); uint8_t* data = const_cast<uint8_t*>(dstMip.m_data); @@ -737,7 +739,7 @@ int main(int _argc, const char* _argv[]) for (uint8_t lod = 1; lod < numMips; ++lod) { - imageRgba32fLinearDownsample2x2(dstMip.m_width, dstMip.m_height, dstMip.m_width*16, rgba, rgba); + imageRgba32fLinearDownsample2x2(rgba, dstMip.m_width, dstMip.m_height, dstMip.m_width*16, rgba); imageGetRawData(imageContainer, 0, lod, output->data, output->size, dstMip); uint8_t* data = const_cast<uint8_t*>(dstMip.m_data); @@ -797,7 +799,7 @@ int main(int _argc, const char* _argv[]) for (uint8_t lod = 1; lod < numMips; ++lod) { - imageRgba8Downsample2x2(dstMip.m_width, dstMip.m_height, dstMip.m_width*4, rgba, rgba); + imageRgba8Downsample2x2(rgba, dstMip.m_width, dstMip.m_height, dstMip.m_width*4, rgba); imageGetRawData(imageContainer, 0, lod, output->data, output->size, dstMip); uint8_t* data = const_cast<uint8_t*>(dstMip.m_data); imageEncodeFromRgba8(data, rgba, dstMip.m_width, dstMip.m_height, format); |