From e7eba6fab89e6d79b641c9638a838f0ccc660502 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Mon, 10 Aug 2020 17:11:31 +0100 Subject: [PATCH] Updated physical device --- src/main.cpp | 61 +--------------------------------------------------- 1 file changed, 1 insertion(+), 60 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 73b307bc8..b0747a1fd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -173,7 +173,6 @@ class VulkanCompute #endif this->mInstance = vk::createInstance(computeInstanceCreateInfo); - this->instance = static_cast(this->mInstance); #if DEBUG if (validLayerNames.size() > 0) { @@ -243,65 +242,7 @@ class VulkanCompute // C API Vulkan // */ - /* - Vulkan this->device creation - */ - // Physical this->device (always use first) - // - /******** Vulkan Device Creation C API ********************* - uint32_t deviceCount = 0; - VK_CHECK_RESULT( - vkEnumeratePhysicalDevices(this->instance, &deviceCount, nullptr)); - - std::vector physicalDevices(deviceCount); - VK_CHECK_RESULT(vkEnumeratePhysicalDevices( - this->instance, &deviceCount, physicalDevices.data())); - - this->physicalDevice = physicalDevices[0]; - - VkPhysicalDeviceProperties deviceProperties; - vkGetPhysicalDeviceProperties(this->physicalDevice, &deviceProperties); - LOG("GPU: %s\n", deviceProperties.deviceName); - - // Request a single compute this->queue - //const float defaultQueuePriority(0.0f); - VkDeviceQueueCreateInfo queueCreateInfo = {}; - uint32_t queueFamilyCount; - vkGetPhysicalDeviceQueueFamilyProperties( - this->physicalDevice, &queueFamilyCount, nullptr); - - std::vector queueFamilyProperties( - queueFamilyCount); - vkGetPhysicalDeviceQueueFamilyProperties(this->physicalDevice, - &queueFamilyCount, - queueFamilyProperties.data()); - - const float defaultQueuePriority(0.0f); - for (uint32_t i = 0; - i < static_cast(queueFamilyProperties.size()); - i++) { - if (queueFamilyProperties[i].queueFlags & VK_QUEUE_COMPUTE_BIT) { - this->queueFamilyIndex = i; - queueCreateInfo.sType = - VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; - queueCreateInfo.queueFamilyIndex = i; - queueCreateInfo.queueCount = 1; - queueCreateInfo.pQueuePriorities = &defaultQueuePriority; - break; - } - } - // Create logical this->device - VkDeviceCreateInfo deviceCreateInfo = {}; - deviceCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; - deviceCreateInfo.queueCreateInfoCount = 1; - deviceCreateInfo.pQueueCreateInfos = &queueCreateInfo; - VK_CHECK_RESULT(vkCreateDevice( - this->physicalDevice, &deviceCreateInfo, nullptr, &this->device)); - - // Get a compute this->queue - vkGetDeviceQueue(this->device, this->queueFamilyIndex, 0, &this->queue); - **********************************************************/ - + this->instance = static_cast(this->mInstance); this->physicalDevice = this->mPhysicalDevice; this->device = this->mDevice; this->queue = this->mComputeQueue;