Hash :
5ae64c94
Author :
Date :
2018-04-06T11:27:03
Fix writing hex values in ImmutableStringBuilder The old code was accidentally using letters offset by 10 when writing out hex values >= 10. Now the letters a to f are used as they should. This is one issue that changed shader output when ImmutableString was introduced, so it is a potential cause for a regression detailed in bug 824062, though this has not been verified. BUG=chromium:824062 TEST=angle_unittests Change-Id: Idb871dffba32a3ab20df0fe17b4b1a98ec00b7fa Reviewed-on: https://chromium-review.googlesource.com/999480 Commit-Queue: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
//
// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// ImmutableStringBuilder.h: Stringstream-like utility for building pool allocated strings where the
// maximum length is known in advance.
//
#ifndef COMPILER_TRANSLATOR_IMMUTABLESTRINGBUILDER_H_
#define COMPILER_TRANSLATOR_IMMUTABLESTRINGBUILDER_H_
#include "compiler/translator/ImmutableString.h"
namespace sh
{
class ImmutableStringBuilder
{
public:
ImmutableStringBuilder(size_t maxLength)
: mPos(0u), mMaxLength(maxLength), mData(AllocateEmptyPoolCharArray(maxLength))
{
}
ImmutableStringBuilder &operator<<(const ImmutableString &str);
ImmutableStringBuilder &operator<<(const char *str);
ImmutableStringBuilder &operator<<(const char &c);
// This invalidates the ImmutableStringBuilder, so it should only be called once.
operator ImmutableString();
template <typename T>
void appendHex(T number)
{
ASSERT(mData != nullptr);
ASSERT(mPos + sizeof(T) * 2u <= mMaxLength);
int index = static_cast<int>(sizeof(T)) * 2 - 1;
// Loop through leading zeroes.
while (((number >> (index * 4)) & 0xfu) == 0 && index > 0)
{
--index;
}
// Write the rest of the hex digits.
while (index >= 0)
{
char digit = static_cast<char>((number >> (index * 4)) & 0xfu);
char digitChar = (digit < 10) ? (digit + '0') : (digit + ('a' - 10));
mData[mPos++] = digitChar;
--index;
}
return;
}
private:
inline static char *AllocateEmptyPoolCharArray(size_t strLength)
{
size_t requiredSize = strLength + 1u;
return reinterpret_cast<char *>(GetGlobalPoolAllocator()->allocate(requiredSize));
}
size_t mPos;
size_t mMaxLength;
char *mData;
};
} // namespace sh
#endif // COMPILER_TRANSLATOR_IMMUTABLESTRINGBUILDER_H_