From 0073b4fb3cf78fa797b0d92168a0fddf89d45732 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Tue, 22 Dec 2015 07:24:02 +0900 Subject: [PATCH] Enable draw tests and fix a few warnings --- .../modules/vulkan/draw/vktDrawBaseClass.cpp | 3 +- .../vulkan/draw/vktDrawBufferObjectUtil.cpp | 4 +- .../modules/vulkan/draw/vktDrawImageObjectUtil.cpp | 72 ++++++++++++---------- .../modules/vulkan/draw/vktDrawIndexedTest.cpp | 2 - .../vulkancts/modules/vulkan/draw/vktDrawTests.hpp | 3 +- .../vulkancts/modules/vulkan/vktTestPackage.cpp | 2 + 6 files changed, 46 insertions(+), 40 deletions(-) diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp index 98bcfa3..bedd115 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawBaseClass.cpp @@ -44,15 +44,14 @@ DrawTestsBaseClass::DrawTestsBaseClass (Context& context, const char* vertexShad : TestInstance (context) , m_colorAttachmentFormat (vk::VK_FORMAT_R8G8B8A8_UNORM) , m_topology (vk::VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP) + , m_vk (context.getDeviceInterface()) , m_vertexShaderName (vertexShaderName) , m_fragmentShaderName (fragmentShaderName) - , m_vk (context.getDeviceInterface()) { } void DrawTestsBaseClass::initialize (void) { - tcu::TestLog &log = m_context.getTestContext().getLog(); const vk::VkDevice device = m_context.getDevice(); const deUint32 queueFamilyIndex = m_context.getUniversalQueueFamilyIndex(); diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawBufferObjectUtil.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawBufferObjectUtil.cpp index 55bc209..4f69a39 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawBufferObjectUtil.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawBufferObjectUtil.cpp @@ -43,8 +43,8 @@ namespace Draw { Buffer::Buffer (const vk::DeviceInterface& vk, vk::VkDevice device, vk::Move object) - : m_object (object) - , m_allocation (DE_NULL) + : m_allocation (DE_NULL) + , m_object (object) , m_vk (vk) , m_device (device) { diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp index 2fd4d4c..890e670 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp @@ -303,6 +303,9 @@ void Image::readUsingBuffer (vk::VkQueue queue, case vk::VK_FORMAT_D24_UNORM_S8_UINT: pixelSize = (aspect == vk::VK_IMAGE_ASPECT_DEPTH_BIT) ? 3 : 1; break; + + default: + DE_FATAL("Not implemented"); } bufferSize = pixelSize*width*height*depth; } @@ -368,14 +371,14 @@ void Image::readUsingBuffer (vk::VkQueue queue, vk::VkSubmitInfo submitInfo = { - vk::VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0, // deUint32 waitSemaphoreCount; - DE_NULL, // const VkSemaphore* pWaitSemaphores; - 1, // deUint32 commandBufferCount; - ©CmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers; - 0, // deUint32 signalSemaphoreCount; - DE_NULL // const VkSemaphore* pSignalSemaphores; + vk::VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; + DE_NULL, // const void* pNext; + 0, // deUint32 waitSemaphoreCount; + DE_NULL, // const VkSemaphore* pWaitSemaphores; + 1, // deUint32 commandBufferCount; + ©CmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers; + 0, // deUint32 signalSemaphoreCount; + DE_NULL // const VkSemaphore* pSignalSemaphores; }; m_vk.queueSubmit(queue, 1, &submitInfo, DE_NULL); @@ -470,14 +473,14 @@ de::SharedPtr Image::copyToLinearImage (vk::VkQueue queue, vk::VkSubmitInfo submitInfo = { - vk::VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0, // deUint32 waitSemaphoreCount; - DE_NULL, // const VkSemaphore* pWaitSemaphores; - 1, // deUint32 commandBufferCount; - ©CmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers; - 0, // deUint32 signalSemaphoreCount; - DE_NULL // const VkSemaphore* pSignalSemaphores; + vk::VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; + DE_NULL, // const void* pNext; + 0, // deUint32 waitSemaphoreCount; + DE_NULL, // const VkSemaphore* pWaitSemaphores; + 1, // deUint32 commandBufferCount; + ©CmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers; + 0, // deUint32 signalSemaphoreCount; + DE_NULL // const VkSemaphore* pSignalSemaphores; }; m_vk.queueSubmit(queue, 1, &submitInfo, DE_NULL); @@ -651,14 +654,14 @@ void Image::upload (vk::VkQueue queue, vk::VkSubmitInfo submitInfo = { - vk::VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0, // deUint32 waitSemaphoreCount; - DE_NULL, // const VkSemaphore* pWaitSemaphores; - 1, // deUint32 commandBufferCount; - ©CmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers; - 0, // deUint32 signalSemaphoreCount; - DE_NULL // const VkSemaphore* pSignalSemaphores; + vk::VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; + DE_NULL, // const void* pNext; + 0, // deUint32 waitSemaphoreCount; + DE_NULL, // const VkSemaphore* pWaitSemaphores; + 1, // deUint32 commandBufferCount; + ©CmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers; + 0, // deUint32 signalSemaphoreCount; + DE_NULL // const VkSemaphore* pSignalSemaphores; }; m_vk.queueSubmit(queue, 1, &submitInfo, DE_NULL); @@ -700,7 +703,10 @@ void Image::uploadUsingBuffer (vk::VkQueue queue, case vk::VK_FORMAT_X8_D24_UNORM_PACK32: case vk::VK_FORMAT_D24_UNORM_S8_UINT: pixelSize = (aspect == vk::VK_IMAGE_ASPECT_DEPTH_BIT) ? 3 : 1; - break; + break; + + default: + DE_FATAL("Not implemented"); } bufferSize = pixelSize*width*height*depth; } @@ -766,14 +772,14 @@ void Image::uploadUsingBuffer (vk::VkQueue queue, vk::VkSubmitInfo submitInfo = { - vk::VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; - DE_NULL, // const void* pNext; - 0, // deUint32 waitSemaphoreCount; - DE_NULL, // const VkSemaphore* pWaitSemaphores; - 1, // deUint32 commandBufferCount; - ©CmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers; - 0, // deUint32 signalSemaphoreCount; - DE_NULL // const VkSemaphore* pSignalSemaphores; + vk::VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; + DE_NULL, // const void* pNext; + 0, // deUint32 waitSemaphoreCount; + DE_NULL, // const VkSemaphore* pWaitSemaphores; + 1, // deUint32 commandBufferCount; + ©CmdBuffer.get(), // const VkCommandBuffer* pCommandBuffers; + 0, // deUint32 signalSemaphoreCount; + DE_NULL // const VkSemaphore* pSignalSemaphores; }; m_vk.queueSubmit(queue, 1, &submitInfo, DE_NULL); diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp index 3caa6d2..edb4592 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp @@ -162,8 +162,6 @@ tcu::TestStatus DrawIndexed::iterate (void) m_vk.cmdEndRenderPass(*m_cmdBuffer); m_vk.endCommandBuffer(*m_cmdBuffer); - const vk::VkCommandBuffer cmdBuffer = *m_cmdBuffer; - vk::VkSubmitInfo submitInfo = { vk::VK_STRUCTURE_TYPE_SUBMIT_INFO, // VkStructureType sType; diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawTests.hpp b/external/vulkancts/modules/vulkan/draw/vktDrawTests.hpp index 912fefa..dd8b56f 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawTests.hpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawTests.hpp @@ -42,7 +42,8 @@ namespace vkt { namespace Draw { - tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx); + +tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx); } // Draw } // vkt diff --git a/external/vulkancts/modules/vulkan/vktTestPackage.cpp b/external/vulkancts/modules/vulkan/vktTestPackage.cpp index 164e192..04e61d6 100644 --- a/external/vulkancts/modules/vulkan/vktTestPackage.cpp +++ b/external/vulkancts/modules/vulkan/vktTestPackage.cpp @@ -66,6 +66,7 @@ #include "vktDynamicStateTests.hpp" #include "vktSSBOLayoutTests.hpp" #include "vktQueryPoolTests.hpp" +#include "vktDrawTests.hpp" #include #include @@ -317,6 +318,7 @@ void TestPackage::init (void) addChild(DynamicState::createTests (m_testCtx)); addChild(ssbo::createTests (m_testCtx)); addChild(QueryPool::createTests (m_testCtx)); + addChild(Draw::createTests (m_testCtx)); } } // vkt -- 2.7.4