diff options
author | 2019-10-13 13:50:38 +0200 | |
---|---|---|
committer | 2019-10-13 07:50:38 -0400 | |
commit | 0837e7451a84f95c29dbdb9bd6b8b931fee1635d (patch) | |
tree | 626bcbd250a7fbebdf5958a288d2f438d4f9fb5a /3rdparty/bx/tools/bin2c/bin2c.cpp | |
parent | c913ccb59d713ce0b91135520719ac5385e54358 (diff) |
WIP: sync bgfx, bx and bimg with latest upstream (#5723)
* Sync with bgfx upstream revision b91d0b6
* Sync with bx upstream revision d60912b
* Sync with bimg upstream revision bd81f60
* Add astc-codec decoder
* Rename VertexDecl to VertexLayout
* Rename UniformType enum Int1 to Sampler.
* Add NVN stub
* Fix unused-const-variable error on macOS
* Drop redundant explicit language parameters
buildoptions_cpp are only applied to c++ files and buildoptions_objcpp are only
applied to objective c++ files. As such, hardcoding -x offers no benefit while
preventing overrides (such as one needed by 3rdparty/bgfx/src/renderer_vk.cpp on
macOS) from working.
* Re-introduce -x c++ in places where C code is compiled as C++ to prevent clang from throwing a warning
* Build bgfx as Objective-C++ on macOS
It is needed due to included headers
* Enable Direct3D12 and Vulkan bgfx rendering backends
* Enable building of spirv shaders
* Properly escape /c in cmd call
* Comment out dx12 bgfx renderer
* Honor VERBOSE setting during shaders build
* Only invert hlsl shader XYZ_TO_sRGB matrix for opengl
* Add spirv shaders
* OpenGL ES needs transposed matrix too
* Metal needs transposed matrix as well
Diffstat (limited to '3rdparty/bx/tools/bin2c/bin2c.cpp')
-rw-r--r-- | 3rdparty/bx/tools/bin2c/bin2c.cpp | 98 |
1 files changed, 90 insertions, 8 deletions
diff --git a/3rdparty/bx/tools/bin2c/bin2c.cpp b/3rdparty/bx/tools/bin2c/bin2c.cpp index 2c7f48d1de0..afc64385be9 100644 --- a/3rdparty/bx/tools/bin2c/bin2c.cpp +++ b/3rdparty/bx/tools/bin2c/bin2c.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2011-2018 Branimir Karadzic. All rights reserved. + * Copyright 2011-2019 Branimir Karadzic. All rights reserved. * License: https://github.com/bkaradzic/bx#license-bsd-2-clause */ @@ -8,6 +8,8 @@ #include <bx/file.h> #include <bx/string.h> +#include <bx/debug.h> + class Bin2cWriter : public bx::WriterI { public: @@ -15,6 +17,7 @@ public: : m_mb(_allocator) , m_mw(&m_mb) , m_name(_name) + , m_outputAsCStr(false) { } @@ -24,10 +27,88 @@ public: virtual int32_t write(const void* _data, int32_t _size, bx::Error* _err) override { + m_outputAsCStr = true; + + const char* data = (const char*)_data; + for (int32_t ii = 0; ii < _size; ++ii) + { + char ch = data[ii]; + if (!bx::isPrint(ch) + && !bx::isSpace(ch) ) + { + m_outputAsCStr = false; + break; + } + } + return bx::write(&m_mw, _data, _size, _err); } - void output(bx::WriterI* m_writer) + void output(bx::WriterI* _writer) + { + if (m_outputAsCStr) + { + outputString(_writer); + } + else + { + outputHex(_writer); + } + } + + void outputString(bx::WriterI* _writer) + { + const char* data = (const char*)m_mb.more(0); + uint32_t size = uint32_t(bx::seek(&m_mw) ); + + bx::Error err; + + bx::write( + _writer + , &err + , "static const char* %.*s = /* Generated with bin2c. */\n\t\"" + , m_name.getLength() + , m_name.getPtr() + ); + + if (NULL != data) + { + bool escaped = false; + + for (uint32_t ii = 0; ii < size; ++ii) + { + char ch = data[ii]; + + if (!escaped) + { + switch (ch) + { + case '\"': bx::write(_writer, "\\\"", &err); break; + case '\n': bx::write(_writer, "\\n\"\n\t\"", &err); break; + case '\r': bx::write(_writer, "\\r", &err); break; + case '\\': escaped = true; BX_FALLTHROUGH; + default: bx::write(_writer, ch, &err); break; + } + } + else + { + switch (ch) + { + case '\n': bx::write(_writer, "\\\"\n\t\"", &err); break; + case '\r': BX_FALLTHROUGH; + case '\t': bx::write(_writer, "\\", &err); BX_FALLTHROUGH; + default : bx::write(_writer, ch, &err); break; + } + + escaped = false; + } + } + } + + bx::write(_writer, &err, "\"\n\t;\n"); + } + + void outputHex(bx::WriterI* _writer) { #define HEX_DUMP_WIDTH 16 #define HEX_DUMP_SPACE_WIDTH 96 @@ -38,9 +119,9 @@ public: bx::Error err; bx::write( - m_writer + _writer , &err - , "static const uint8_t %.*s[%d] =\n{\n" + , "static const uint8_t %.*s[%d] = /* Generated with bin2c. */\n{\n" , m_name.getLength() , m_name.getPtr() , size @@ -63,7 +144,7 @@ public: if (HEX_DUMP_WIDTH == asciiPos) { ascii[asciiPos] = '\0'; - bx::write(m_writer, &err, "\t" HEX_DUMP_FORMAT "// %s\n", hex, ascii); + bx::write(_writer, &err, "\t" HEX_DUMP_FORMAT "// %s\n", hex, ascii); data += asciiPos; hexPos = 0; asciiPos = 0; @@ -73,11 +154,11 @@ public: if (0 != asciiPos) { ascii[asciiPos] = '\0'; - bx::write(m_writer, &err, "\t" HEX_DUMP_FORMAT "// %s\n", hex, ascii); + bx::write(_writer, &err, "\t" HEX_DUMP_FORMAT "// %s\n", hex, ascii); } } - bx::write(m_writer, &err, "};\n"); + bx::write(_writer, &err, "};\n"); #undef HEX_DUMP_WIDTH #undef HEX_DUMP_SPACE_WIDTH #undef HEX_DUMP_FORMAT @@ -86,6 +167,7 @@ public: bx::MemoryBlock m_mb; bx::MemoryWriter m_mw; bx::StringView m_name; + bool m_outputAsCStr; }; void help(const char* _error = NULL) @@ -100,7 +182,7 @@ void help(const char* _error = NULL) bx::write(stdOut, &err , "bin2c, binary to C\n" - "Copyright 2011-2018 Branimir Karadzic. All rights reserved.\n" + "Copyright 2011-2019 Branimir Karadzic. All rights reserved.\n" "License: https://github.com/bkaradzic/bx#license-bsd-2-clause\n\n" ); |