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
(cherry picked from commit 0bd8828618d95d2a83bc7475179a9227bfd22f5f)

diff --git a/executor/xeTestResultParser.cpp b/executor/xeTestResultParser.cpp
index dc0a963..bdf00c8 100644 (file)
--- 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);
                                }

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
index e6c5792..d6ae204 100644 (file)
--- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
@@ -2696,10 +2696,10 @@ void PixelValue::setValue (size_t ndx, bool value)
        DE_ASSERT(ndx < 4);
        DE_ASSERT(m_status <= 0xFFu);
 
-       m_status |= (deUint16)(0x1u << (ndx * 2));
+       m_status = (deUint16)(m_status | (deUint16)(0x1u << (ndx * 2)));
 
        if (value)
-               m_status |= (deUint16)(0x1u << (ndx * 2 + 1));
+               m_status = (deUint16)(m_status | (deUint16)(0x1u << (ndx * 2 + 1)));
        else
                m_status &= (deUint16)~(0x1u << (deUint16)(ndx * 2 + 1));
 

diff --git a/external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.cpp b/external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.cpp
index b26c315..5e1d378 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.cpp
+++ b/external/vulkancts/modules/vulkan/texture/vktSampleVerifierUtil.cpp
@@ -377,7 +377,7 @@ int calcCandidateCubemapFaces (const Vec3& r)
 
                        DE_ASSERT(faceNdx < 6);
 
-                       faceBitmap = faceBitmap | (deUint8) (1U << faceNdx);
+                       faceBitmap = (deUint8)(faceBitmap | (deUint8) (1U << faceNdx));
                }
        }