From 079a481256d63e8498f7adf38a234bfe74bb04de Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Thu, 12 May 2016 15:17:02 -0700 Subject: [PATCH] Fix some release build warnings --- external/vulkancts/framework/vulkan/vkNullDriver.cpp | 1 + .../modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp | 1 + .../vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/external/vulkancts/framework/vulkan/vkNullDriver.cpp b/external/vulkancts/framework/vulkan/vkNullDriver.cpp index 9822b53..1beae03 100644 --- a/external/vulkancts/framework/vulkan/vkNullDriver.cpp +++ b/external/vulkancts/framework/vulkan/vkNullDriver.cpp @@ -366,6 +366,7 @@ void DescriptorPool::free (VkDescriptorSet set) DescriptorSet* const impl = reinterpret_cast((deUintptr)set.getInternal()); DE_ASSERT(m_flags & VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT); + DE_UNREF(m_flags); delete impl; diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp index 3bf0506..4479d0a 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationInvarianceTests.cpp @@ -1471,6 +1471,7 @@ tcu::TestStatus InvarianceTestInstance::iterate (void) // If this fails then we didn't read all vertices from shader and test must be changed to allow more. DE_ASSERT(numPrimitiveVertices * numPrimitives <= resultBufferMaxVertices); + DE_UNREF(numPrimitiveVertices); tcu::TestLog& log = m_context.getTestContext().getLog(); diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp index 087d852..58f6c96 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationUtil.cpp @@ -760,7 +760,7 @@ float getClampedTessLevel (const SpacingMode mode, const float tessLevel) int getRoundedTessLevel (const SpacingMode mode, const float clampedTessLevel) { - static const int MINIMUM_MAX_TESS_GEN_LEVEL = 64; //!< Minimum maxTessellationGenerationLevel defined by the spec. + static const int minimumMaxTessGenLevel = 64; //!< Minimum maxTessellationGenerationLevel defined by the spec. int result = (int)deFloatCeil(clampedTessLevel); @@ -772,7 +772,8 @@ int getRoundedTessLevel (const SpacingMode mode, const float clampedTessLevel) default: DE_ASSERT(false); } - DE_ASSERT(de::inRange(result, 1, MINIMUM_MAX_TESS_GEN_LEVEL)); + DE_ASSERT(de::inRange(result, 1, minimumMaxTessGenLevel)); + DE_UNREF(minimumMaxTessGenLevel); return result; } -- 2.7.4