Fix Android release build due to unused variable
authorRicardo Garcia <rgarcia@igalia.com>
Thu, 15 Dec 2022 09:28:31 +0000 (10:28 +0100)
committerPiotr Byszewski <piotr.byszewski@mobica.com>
Mon, 19 Dec 2022 10:45:12 +0000 (10:45 +0000)
The affected variable is a static constexpr uint32_t that's only used
for an assertion in debug builds.

No test results should be affected by this change.

Components: Vulkan
VK-GL-CTS issue: 4178

Change-Id: I970b2c82760fd54be91bfe9549baa8ebc57bb0f9

external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp

index 13642f4..3552746 100644 (file)
@@ -360,8 +360,7 @@ public:
 class ProvokingVertexWithPadding : public VertexWithPadding
 {
 protected:
 class ProvokingVertexWithPadding : public VertexWithPadding
 {
 protected:
-       static constexpr uint32_t       kExpectecdCoordCount = 3u;
-       bool                                            m_lastVertex;
+       bool m_lastVertex;
 
 public:
        ProvokingVertexWithPadding (bool lastVertex)
 
 public:
        ProvokingVertexWithPadding (bool lastVertex)
@@ -400,6 +399,8 @@ public:
 
        virtual std::vector<std::vector<deUint8>> createVertexData (const std::vector<tcu::Vec2>& coords, vk::VkDeviceSize dataOffset, vk::VkDeviceSize trailingPadding, const void* paddingPattern, size_t patternSize) const override
        {
 
        virtual std::vector<std::vector<deUint8>> createVertexData (const std::vector<tcu::Vec2>& coords, vk::VkDeviceSize dataOffset, vk::VkDeviceSize trailingPadding, const void* paddingPattern, size_t patternSize) const override
        {
+               static constexpr uint32_t kExpectecdCoordCount = 3u;
+               DE_UNREF(kExpectecdCoordCount); // For release builds.
                DE_ASSERT(coords.size() == kExpectecdCoordCount);
                return VertexWithPadding::createVertexData(coords, dataOffset, trailingPadding, paddingPattern, patternSize);
        }
                DE_ASSERT(coords.size() == kExpectecdCoordCount);
                return VertexWithPadding::createVertexData(coords, dataOffset, trailingPadding, paddingPattern, patternSize);
        }