Merge branch '256-fix-renderpass-build-warnings' into 'vulkan-cts-1.0'

fix renderpass test's build warnings, fixes #256

See merge request !394

diff --git a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
index 07a1aaa..9ebe800 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
+++ b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
@@ -2673,9 +2673,9 @@ public:
        };
 
                        PixelStatus                     (Status color, Status depth, Status stencil)
-               : m_status      ((deUint8)(color << COLOR_OFFSET)
-                                       | (deUint8)((deUint8)depth << DEPTH_OFFSET)
-                                       | (deUint8)((deUint8)stencil << STENCIL_OFFSET))
+                               : m_status      ((deUint8)((color << COLOR_OFFSET)
+                                       | (depth << DEPTH_OFFSET)
+                                       | (stencil << STENCIL_OFFSET)))
        {
        }
 
@@ -2686,7 +2686,8 @@ public:
        void    setColorStatus          (Status status)
        {
                DE_ASSERT(getColorStatus() == STATUS_UNDEFINED);
-               m_status |= (deUint8)(status << COLOR_OFFSET);
+               deUint8 statusFlags = (deUint8)(status << COLOR_OFFSET);
+               m_status |= statusFlags;
        }
 
        void    setDepthStatus          (Status status)