Fix warnings reported by GCC

Change-Id: Ie5de5794fc7ed53e1f3c4cb7b7fe38a756dab2eb

diff --git a/external/vulkancts/modules/vulkan/api/vktApiBufferViewCreateTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiBufferViewCreateTests.cpp
index 209a202..dc1b016 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiBufferViewCreateTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiBufferViewCreateTests.cpp
@@ -96,10 +96,10 @@ private:
 
 BufferViewTestInstance::BufferViewTestInstance (Context&                                       ctx,
                                                                                                BufferViewCaseParameters        createInfo)
-       : TestInstance  (ctx)\r
+       : TestInstance  (ctx)
        , m_testCase    (createInfo)
 {
-       if (m_context.getDeviceFeatures().sparseBinding == 0 && m_testCase.beforeAllocateMemory == false)\r
+       if (m_context.getDeviceFeatures().sparseBinding == 0 && m_testCase.beforeAllocateMemory == false)
                throw tcu::NotSupportedError("The test is not supported - it needs missing 'sparseBinding' feature of Vulkan");
 }
 
@@ -117,7 +117,9 @@ tcu::TestStatus BufferViewTestInstance::iterate (void)
        {
                VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,                                                                                                   //      VkStructureType                 sType;
                DE_NULL,                                                                                                                                                                //      const void*                             pNext;
-               m_testCase.beforeAllocateMemory == true ? 0 : VK_BUFFER_CREATE_SPARSE_BINDING_BIT,              //      VkBufferCreateFlags             flags;
+               (VkBufferCreateFlags)(m_testCase.beforeAllocateMemory == true
+                                                         ? 0
+                                                         : VK_BUFFER_CREATE_SPARSE_BINDING_BIT),                                                       //      VkBufferCreateFlags             flags;
                size,                                                                                                                                                                   //      VkDeviceSize                    size;
                m_testCase.usage,                                                                                                                                               //      VkBufferUsageFlags              usage;
                VK_SHARING_MODE_EXCLUSIVE,                                                                                                                              //      VkSharingMode                   sharingMode;

diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
index 7c2ed33..f112284 100644 (file)
--- a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
@@ -4042,20 +4042,20 @@ vk::Move<vk::VkSampler> ImageSampleInstanceImages::createSampler (const vk::Devi
                vk::VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
                DE_NULL,
                (vk::VkSamplerCreateFlags)0,
-               vk::mapFilterMode(sampler.magFilter),                   // magFilter
-               vk::mapFilterMode(sampler.minFilter),                   // minFilter
-               vk::mapMipmapMode(sampler.minFilter),                   // mipMode
-               vk::mapWrapMode(sampler.wrapS),                                 // addressU
-               vk::mapWrapMode(sampler.wrapT),                                 // addressV
-               vk::mapWrapMode(sampler.wrapR),                                 // addressW
-               0.0f,                                                                                   // mipLodBias
-               1,                                                                                              // maxAnisotropy
-               (compareEnabled ? vk::VK_TRUE : vk::VK_FALSE),  // compareEnable
-               compareOp,                                                                              // compareOp
-               0.0f,                                                                                   // minLod
-               0.0f,                                                                                   // maxLod
-               borderColor,                                                                    // borderColor
-               vk::VK_FALSE,                                                                   // unnormalizedCoords
+               vk::mapFilterMode(sampler.magFilter),                                                   // magFilter
+               vk::mapFilterMode(sampler.minFilter),                                                   // minFilter
+               vk::mapMipmapMode(sampler.minFilter),                                                   // mipMode
+               vk::mapWrapMode(sampler.wrapS),                                                                 // addressU
+               vk::mapWrapMode(sampler.wrapT),                                                                 // addressV
+               vk::mapWrapMode(sampler.wrapR),                                                                 // addressW
+               0.0f,                                                                                                                   // mipLodBias
+               1,                                                                                                                              // maxAnisotropy
+               (vk::VkBool32)(compareEnabled ? vk::VK_TRUE : vk::VK_FALSE),    // compareEnable
+               compareOp,                                                                                                              // compareOp
+               0.0f,                                                                                                                   // minLod
+               0.0f,                                                                                                                   // maxLod
+               borderColor,                                                                                                    // borderColor
+               vk::VK_FALSE,                                                                                                   // unnormalizedCoords
        };
        return vk::createSampler(vki, device, &createInfo);
 }