diff options
Diffstat (limited to 'src/3rdparty/angle/src/common/angleutils.cpp')
-rw-r--r-- | src/3rdparty/angle/src/common/angleutils.cpp | 62 |
1 files changed, 42 insertions, 20 deletions
diff --git a/src/3rdparty/angle/src/common/angleutils.cpp b/src/3rdparty/angle/src/common/angleutils.cpp index 7099c21730..739d12a767 100644 --- a/src/3rdparty/angle/src/common/angleutils.cpp +++ b/src/3rdparty/angle/src/common/angleutils.cpp @@ -14,39 +14,61 @@ namespace angle { +// dirtyPointer is a special value that will make the comparison with any valid pointer fail and +// force the renderer to re-apply the state. const uintptr_t DirtyPointer = std::numeric_limits<uintptr_t>::max(); } +std::string ArrayString(unsigned int i) +{ + // We assume that UINT_MAX and GL_INVALID_INDEX are equal. + ASSERT(i != UINT_MAX); + + std::stringstream strstr; + strstr << "["; + strstr << i; + strstr << "]"; + return strstr.str(); +} + +std::string ArrayIndexString(const std::vector<unsigned int> &indices) +{ + std::stringstream strstr; + + for (auto indicesIt = indices.rbegin(); indicesIt != indices.rend(); ++indicesIt) + { + // We assume that UINT_MAX and GL_INVALID_INDEX are equal. + ASSERT(*indicesIt != UINT_MAX); + strstr << "["; + strstr << (*indicesIt); + strstr << "]"; + } + + return strstr.str(); +} + size_t FormatStringIntoVector(const char *fmt, va_list vararg, std::vector<char>& outBuffer) { + // The state of the va_list passed to vsnprintf is undefined after the call, do a copy in case + // we need to grow the buffer. + va_list varargCopy; + va_copy(varargCopy, vararg); + // Attempt to just print to the current buffer - int len = vsnprintf(&(outBuffer.front()), outBuffer.size(), fmt, vararg); + int len = vsnprintf(&(outBuffer.front()), outBuffer.size(), fmt, varargCopy); + va_end(varargCopy); + if (len < 0 || static_cast<size_t>(len) >= outBuffer.size()) { // Buffer was not large enough, calculate the required size and resize the buffer - len = vsnprintf(NULL, 0, fmt, vararg); + len = vsnprintf(nullptr, 0, fmt, vararg); outBuffer.resize(len + 1); // Print again - len = vsnprintf(&(outBuffer.front()), outBuffer.size(), fmt, vararg); + va_copy(varargCopy, vararg); + len = vsnprintf(&(outBuffer.front()), outBuffer.size(), fmt, varargCopy); + va_end(varargCopy); } ASSERT(len >= 0); return static_cast<size_t>(len); } - -std::string FormatString(const char *fmt, va_list vararg) -{ - static std::vector<char> buffer(512); - - size_t len = FormatStringIntoVector(fmt, vararg, buffer); - return std::string(&buffer[0], len); -} - -std::string FormatString(const char *fmt, ...) -{ - va_list vararg; - va_start(vararg, fmt); - std::string result = FormatString(fmt, vararg); - va_end(vararg); - return result; -} |