Initialize qQueuePriorities with queueCount values.

diff --git a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
index 1c82f84..8a476d8 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
@@ -308,6 +308,7 @@ tcu::TestStatus createDeviceTest (Context& context)
        const deUint32                                  queueFamilyIndex                = 0;
        const deUint32                                  queueCount                              = 1;
        const deUint32                                  queueIndex                              = 0;
+       const float                                             queuePriority                   = 1.0f;
        const VkDeviceQueueCreateInfo   deviceQueueCreateInfo   =
        {
                VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
@@ -315,7 +316,7 @@ tcu::TestStatus createDeviceTest (Context& context)
                (VkDeviceQueueCreateFlags)0u,
                queueFamilyIndex,                                               //queueFamilyIndex;
                queueCount,                                                             //queueCount;
-               DE_NULL,                                                                //pQueuePriorities;
+               &queuePriority,                                                 //pQueuePriorities;
        };
        const VkDeviceCreateInfo                deviceCreateInfo        =
        {
@@ -353,6 +354,7 @@ tcu::TestStatus createMultipleDevicesTest (Context& context)
        const deUint32                                                                          queueFamilyIndex                = 0;
        const deUint32                                                                          queueCount                              = 1;
        const deUint32                                                                          queueIndex                              = 0;
+       const float                                                                                     queuePriority                   = 1.0f;
        const VkDeviceQueueCreateInfo                                           deviceQueueCreateInfo   =
        {
                VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
@@ -360,7 +362,7 @@ tcu::TestStatus createMultipleDevicesTest (Context& context)
                (VkDeviceQueueCreateFlags)0u,                                   //flags;
                queueFamilyIndex,                                                               //queueFamilyIndex;
                queueCount,                                                                             //queueCount;
-               DE_NULL,                                                                                //pQueuePriorities;
+               &queuePriority,                                                                 //pQueuePriorities;
        };
        const VkDeviceCreateInfo                                                        deviceCreateInfo                =
        {
@@ -437,6 +439,7 @@ tcu::TestStatus createDeviceWithUnsupportedExtensionsTest (Context& context)
        const InstanceDriver                    instanceDriver                  (platformInterface, instance.get());
        const char*                                             enabledExtensions[]             = {"VK_UNSUPPORTED_EXTENSION", "THIS_IS_NOT_AN_EXTENSION", "VK_DONT_SUPPORT_ME"};
        const VkPhysicalDevice                  physicalDevice                  = chooseDevice(instanceDriver, instance.get(), context.getTestContext().getCommandLine());
+       const float                                             queuePriority                   = 1.0f;
        const VkDeviceQueueCreateInfo   deviceQueueCreateInfo   =
        {
                VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
@@ -444,7 +447,7 @@ tcu::TestStatus createDeviceWithUnsupportedExtensionsTest (Context& context)
                (VkDeviceQueueCreateFlags)0u,
                0,                                                                              //queueFamiliIndex;
                1,                                                                              //queueCount;
-               DE_NULL,                                                                //pQueuePriorities;
+               &queuePriority,                                                 //pQueuePriorities;
        };
        const VkDeviceCreateInfo                deviceCreateInfo                =
        {

diff --git a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
index 01d2bd0..c55fc40 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
@@ -388,6 +388,8 @@ struct Device
 
        static Move<VkDevice> create (const Environment&, const Resources& res, const Parameters&)
        {
+               const float     queuePriority   = 1.0;
+
                const VkDeviceQueueCreateInfo   queues[]        =
                {
                        {
@@ -396,7 +398,7 @@ struct Device
                                (VkDeviceQueueCreateFlags)0,
                                res.queueFamilyIndex,
                                1u,                                                                     // queueCount
-                               DE_NULL,                                                        // pQueuePriorities
+                               &queuePriority,                                         // pQueuePriorities
                        }
                };
                const VkDeviceCreateInfo        deviceInfo      =

diff --git a/external/vulkancts/modules/vulkan/vktTestCase.cpp b/external/vulkancts/modules/vulkan/vktTestCase.cpp
index 5095c9c..dd4f7d3 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktTestCase.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestCase.cpp
@@ -68,6 +68,7 @@ Move<VkDevice> createDefaultDevice (const InstanceInterface& vki, VkPhysicalDevi
 {
        VkDeviceQueueCreateInfo         queueInfo;
        VkDeviceCreateInfo                      deviceInfo;
+       const float                                     queuePriority   = 1.0f;
 
        deMemset(&queueInfo,    0, sizeof(queueInfo));
        deMemset(&deviceInfo,   0, sizeof(deviceInfo));
@@ -77,7 +78,7 @@ Move<VkDevice> createDefaultDevice (const InstanceInterface& vki, VkPhysicalDevi
        queueInfo.flags                                                 = (VkDeviceQueueCreateFlags)0u;
        queueInfo.queueFamilyIndex                              = queueIndex;
        queueInfo.queueCount                                    = 1u;
-       queueInfo.pQueuePriorities                              = DE_NULL;
+       queueInfo.pQueuePriorities                              = &queuePriority;
 
        deviceInfo.sType                                                = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
        deviceInfo.pNext                                                = DE_NULL;