From 6cf1f248d93d93be9cb2d6f1382d534517fb0605 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 29 Apr 2016 08:11:28 +0200 Subject: [PATCH] Revert "I don't know what 'iqa' is, but whatever it is, it's preventing us from building shaders, so bye-bye" This reverts commit 5adfc5b2a5f9415b311e3958c92dc19e19bfdbe1. --- 3rdparty/bgfx/tools/texturec/texturec.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/3rdparty/bgfx/tools/texturec/texturec.cpp b/3rdparty/bgfx/tools/texturec/texturec.cpp index 434b556af18..ba23a528339 100644 --- a/3rdparty/bgfx/tools/texturec/texturec.cpp +++ b/3rdparty/bgfx/tools/texturec/texturec.cpp @@ -19,11 +19,9 @@ #include #include -#if 0 extern "C" { #include } -#endif #define STB_IMAGE_IMPLEMENTATION #include @@ -418,7 +416,7 @@ int main(int _argc, const char* _argv[]) const bool mips = cmdLine.hasArg('m', "mips"); const bool normalMap = cmdLine.hasArg('n', "normalmap"); - //const bool iqa = cmdLine.hasArg('\0', "iqa"); + const bool iqa = cmdLine.hasArg('\0', "iqa"); uint32_t size = (uint32_t)bx::getSize(&reader); const bgfx::Memory* mem = bgfx::alloc(size); @@ -576,13 +574,11 @@ int main(int _argc, const char* _argv[]) ); void* ref = NULL; -#if 0 if (iqa) { ref = BX_ALLOC(&allocator, size); memcpy(ref, rgba, size); } -#endif imageEncodeFromRgba8(output->data, rgba, dstMip.m_width, dstMip.m_height, format); @@ -604,7 +600,6 @@ int main(int _argc, const char* _argv[]) , format ); -#if 0 static const iqa_ssim_args args = { 0.39f, // alpha @@ -625,7 +620,6 @@ int main(int _argc, const char* _argv[]) , &args ); printf("%f\n", result); -#endif BX_FREE(&allocator, ref); }