diff options
| author | Alexander Galazin <alexander.galazin@arm.com> | 2017-07-05 17:09:38 +0200 |
|---|---|---|
| committer | Alexander Galazin <Alexander.Galazin@arm.com> | 2017-07-06 03:38:09 -0400 |
| commit | 0bd8828618d95d2a83bc7475179a9227bfd22f5f (patch) | |
| tree | c2b365ab63b5893a03aaabcd7cd3b52355ca3e70 /executor | |
| parent | 939b0b243e9675c78a6ce12848bc82a9a594761c (diff) | |
| download | VK-GL-CTS-0bd8828618d95d2a83bc7475179a9227bfd22f5f.tar.gz VK-GL-CTS-0bd8828618d95d2a83bc7475179a9227bfd22f5f.tar.bz2 VK-GL-CTS-0bd8828618d95d2a83bc7475179a9227bfd22f5f.zip | |
Fix gcc 5.4 warnings
gcc 5.4 (default in Ubuntu 16.04) reports conversion to int
warnings/errors for bitwise or and assign operator.
GCC bug: 40752
Components: Framework, Vulkan
Change-Id: Ia857c44cf54d5571d857e1fada0e2aaa8f4b950d
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/xeTestResultParser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/executor/xeTestResultParser.cpp b/executor/xeTestResultParser.cpp index dc0a96374..bdf00c836 100644 --- a/executor/xeTestResultParser.cpp +++ b/executor/xeTestResultParser.cpp @@ -847,10 +847,10 @@ void TestResultParser::handleData (void) switch (phase) { - case 0: outPtr[0] |= (deUint8)(decodedBits<<2); break; - case 1: outPtr[0] |= (deUint8)(decodedBits>>4); outPtr[1] |= (deUint8)((decodedBits&0xF)<<4); break; - case 2: outPtr[1] |= (deUint8)(decodedBits>>2); outPtr[2] |= (deUint8)((decodedBits&0x3)<<6); break; - case 3: outPtr[2] |= decodedBits; break; + case 0: outPtr[0] |= (deUint8)(decodedBits<<2); break; + case 1: outPtr[0] = (deUint8)(outPtr[0] | (deUint8)(decodedBits>>4)); outPtr[1] = (deUint8)(outPtr[1] | (deUint8)((decodedBits&0xF)<<4)); break; + case 2: outPtr[1] = (deUint8)(outPtr[1] | (deUint8)(decodedBits>>2)); outPtr[2] = (deUint8)(outPtr[2] | (deUint8)((decodedBits&0x3)<<6)); break; + case 3: outPtr[2] |= decodedBits; break; default: DE_ASSERT(false); } |