1 files changed, 6 insertions, 101 deletions

diff --git a/src/VulkanDevice.hpp b/src/VulkanDevice.hpp
index fa9f5f4..7c3783b 100644
--- a/src/VulkanDevice.hpp
+++ b/src/VulkanDevice.hpp
@@ -11,107 +11,11 @@
 #pragma once
 
 #include "vke.h"
+#include "phyInfos.h"
 
-//#include "VulkanBuffer.hpp"
-
-namespace vks
+namespace vke
 {
-    struct vkPhyInfo{
-        VkPhysicalDevice                    phy;
-        VkPhysicalDeviceMemoryProperties    memProps;
-        VkPhysicalDeviceProperties          properties;
-        VkPhysicalDeviceFeatures            features;
-        VkPhysicalDeviceFeatures            enabledFeatures;
-        VkQueueFamilyProperties*            queues;
-        uint32_t                            queueCount;
-        std::vector<int>                    cQueues;//compute, dedicated first
-        std::vector<int>                    gQueues;//graphic, idem
-        std::vector<int>                    tQueues;//transfer, idem
-        int                                 pQueue;//presentation
-
-        std::vector<VkDeviceQueueCreateInfo> pQueueInfos;
-        std::vector<std::vector<float>>      qPriorities;
-
-        vkPhyInfo (){}
-        vkPhyInfo (VkPhysicalDevice _phy, VkSurfaceKHR surface = VK_NULL_HANDLE) {
-            phy = _phy;
-//            cQueues.clear();
-//            gQueues.clear();
-//            tQueues.clear();
-            pQueue = -1;
-//            pQueueInfos.clear();
-//            qPriorities.clear();
-
-            vkGetPhysicalDeviceProperties       (phy, &properties);
-            vkGetPhysicalDeviceMemoryProperties (phy, &memProps);
-            vkGetPhysicalDeviceFeatures         (phy, &features);
-
-            vkGetPhysicalDeviceQueueFamilyProperties (phy, &queueCount, NULL);
-            queues = (VkQueueFamilyProperties*)malloc(queueCount * sizeof(VkQueueFamilyProperties));
-            vkGetPhysicalDeviceQueueFamilyProperties (phy, &queueCount, queues);
-
-            //identify dedicated queues
-            //try to find dedicated queues first
-            VkBool32 present = VK_FALSE;
-            for (uint j=0; j<queueCount; j++){
-                switch (queues[j].queueFlags) {
-                case VK_QUEUE_GRAPHICS_BIT:
-                    if (surface){
-                        vkGetPhysicalDeviceSurfaceSupportKHR(phy, j, surface, &present);
-                        if (present && pQueue<0)
-                            pQueue = j;
-                    }
-                    gQueues.push_back (j);
-                    break;
-                case VK_QUEUE_COMPUTE_BIT:
-                    cQueues.push_back (j);
-                    break;
-                case VK_QUEUE_TRANSFER_BIT:
-                    tQueues.push_back (j);
-                    break;
-                }
-            }
-            //add queues that include flag
-            for (uint j=0; j<queueCount; j++){
-                if (queues[j].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
-                    if (surface) {
-                        vkGetPhysicalDeviceSurfaceSupportKHR(phy, j, surface, &present);
-                        if (present && pQueue<0)
-                            pQueue = j;
-                    }
-                    if (std::find(gQueues.begin(), gQueues.end(), j) == gQueues.end())
-                        gQueues.push_back(j);
-                }
-                if (queues[j].queueFlags & VK_QUEUE_COMPUTE_BIT){
-                    if (std::find(cQueues.begin(), cQueues.end(), j) == cQueues.end())
-                        cQueues.push_back(j);
-                }
-                if (queues[j].queueFlags & VK_QUEUE_TRANSFER_BIT){
-                    if (std::find(tQueues.begin(), tQueues.end(), j) == tQueues.end())
-                        tQueues.push_back(j);
-                }
-            }
-        }
-
-        void selectQueue (int qIndex, float priority = 0.f) {
-            auto it = find_if(pQueueInfos.begin(), pQueueInfos.end(), [&qIndex](const VkDeviceQueueCreateInfo& qci)
-                {return qci.queueFamilyIndex == qIndex;});
-            if (it == pQueueInfos.end()) {
-                VkDeviceQueueCreateInfo dqci = {VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO};
-                dqci.queueCount = 1;
-                dqci.queueFamilyIndex = qIndex;
-                pQueueInfos.push_back (dqci);
-                qPriorities.push_back ({priority});
-                return;
-            }
-
-            int qciIdx = std::distance(pQueueInfos.begin(), it);
-            pQueueInfos[qciIdx].queueCount ++;
-            qPriorities[qciIdx].push_back(priority);
-        }
-
-    };
-    struct VulkanDevice
+    struct device_t
     {
         VkPhysicalDevice            phy;
         VkDevice                    dev;
@@ -132,8 +36,8 @@ namespace vks
             uint32_t compute;
         } queueFamilyIndices;
 
-        VulkanDevice(vkPhyInfo phyInfos, const std::vector<const char *> &devLayers);
-        ~VulkanDevice();
+        device_t(vkPhyInfo* phyInfos, const std::vector<const char *> &devLayers);
+        ~device_t();
 
         uint32_t getMemoryType(uint32_t typeBits, VkMemoryPropertyFlags properties, VkBool32 *memTypeFound = nullptr);
         VkFormat getSuitableDepthFormat ();
@@ -148,5 +52,6 @@ namespace vks
         VkFence createFence (bool signaled = false);
         void destroyFence (VkFence fence);
         void destroySemaphore (VkSemaphore semaphore);
+        VkPipelineShaderStageCreateInfo loadShader(std::string filename, VkShaderStageFlagBits stage);
     };
 }