From 63e17a990fb21ffb4bce71c3e52d62b7001ffc3f Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Wed, 20 Jan 2016 16:25:59 -0800 Subject: [PATCH] Fix couple of warnings --- external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp | 6 ++++++ .../vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp index 6664d05..6239472 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.cpp @@ -772,12 +772,14 @@ int TestTexture1D::getNumLevels (void) const tcu::PixelBufferAccess TestTexture1D::getLevel (int level, int layer) { DE_ASSERT(layer == 0); + DE_UNREF(layer); return m_texture.getLevel(level); } const tcu::ConstPixelBufferAccess TestTexture1D::getLevel (int level, int layer) const { DE_ASSERT(layer == 0); + DE_UNREF(layer); return m_texture.getLevel(level); } @@ -879,12 +881,14 @@ int TestTexture2D::getNumLevels (void) const tcu::PixelBufferAccess TestTexture2D::getLevel (int level, int layer) { DE_ASSERT(layer == 0); + DE_UNREF(layer); return m_texture.getLevel(level); } const tcu::ConstPixelBufferAccess TestTexture2D::getLevel (int level, int layer) const { DE_ASSERT(layer == 0); + DE_UNREF(layer); return m_texture.getLevel(level); } @@ -986,12 +990,14 @@ int TestTexture3D::getNumLevels (void) const tcu::PixelBufferAccess TestTexture3D::getLevel (int level, int layer) { DE_ASSERT(layer == 0); + DE_UNREF(layer); return m_texture.getLevel(level); } const tcu::ConstPixelBufferAccess TestTexture3D::getLevel (int level, int layer) const { DE_ASSERT(layer == 0); + DE_UNREF(layer); return m_texture.getLevel(level); } diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp index 5609bf4..87487bc 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp @@ -1957,7 +1957,7 @@ void TransferTestInstance::configCommandBuffer(void) }; const VkOffset3D nullOffset = {0u, 0u, 0u}; - const VkExtent3D imageExtent = {m_imageWidth, m_imageHeight, 1u}; + const VkExtent3D imageExtent = {(deUint32)m_imageWidth, (deUint32)m_imageHeight, 1u}; const VkOffset3D imageOffset = {(int)m_imageWidth, (int)m_imageHeight, 1}; switch(m_method) { -- 2.7.4