rename vkDev to dev in vkhdevice

diff --git a/include/vkh.h b/include/vkh.h
index 28fe3412c7a37c593c9f66954967d9b22c4c12e6..128f8380b754b82fd18e9302d9627aea02823ff8 100644 (file)
--- a/include/vkh.h
+++ b/include/vkh.h
@@ -26,7 +26,7 @@ typedef struct _vkh_app_t*            VkhApp;
 typedef struct _vkh_device_t*   VkhDevice;
 typedef struct _vkh_image_t*    VkhImage;
 typedef struct _vkh_buffer_t*   VkhBuffer;
-typedef struct _vkh_presenter_t*    VkhPresenter;
+//typedef struct _vkh_presenter_t*    VkhPresenter;
 
 ///////////////////////////////
 VkhImage vkh_image_create       (VkhDevice pDev, VkFormat format, uint32_t width, uint32_t height, VkImageTiling tiling,

diff --git a/src/vkh_buffer.c b/src/vkh_buffer.c
index 18ae096c3298c4d503df54acfd98cebd2320799e..9f06d36b72106c9fdabe4a8e83f5276118415777 100644 (file)
--- a/src/vkh_buffer.c
+++ b/src/vkh_buffer.c
@@ -7,14 +7,14 @@ VkhBuffer vkh_buffer_create(VkhDevice pDev, VkBufferUsageFlags usage, VkMemoryPr
     VkBufferCreateInfo bufCreateInfo = {
         .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
         .usage = usage, .size = size, .sharingMode = VK_SHARING_MODE_EXCLUSIVE};
-    VK_CHECK_RESULT(vkCreateBuffer(pDev->vkDev, &bufCreateInfo, NULL, &buff->buffer));
+    VK_CHECK_RESULT(vkCreateBuffer(pDev->dev, &bufCreateInfo, NULL, &buff->buffer));
 
     VkMemoryRequirements memReq;
-    vkGetBufferMemoryRequirements(pDev->vkDev, buff->buffer, &memReq);
+    vkGetBufferMemoryRequirements(pDev->dev, buff->buffer, &memReq);
     VkMemoryAllocateInfo memAllocInfo = { .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
                                           .allocationSize = memReq.size };
     assert(memory_type_from_properties(&pDev->phyMemProps, memReq.memoryTypeBits,memoryPropertyFlags, &memAllocInfo.memoryTypeIndex));
-    VK_CHECK_RESULT(vkAllocateMemory(pDev->vkDev, &memAllocInfo, NULL, &buff->memory));
+    VK_CHECK_RESULT(vkAllocateMemory(pDev->dev, &memAllocInfo, NULL, &buff->memory));
 
     buff->alignment = memReq.alignment;
     buff->size = memAllocInfo.allocationSize;
@@ -27,27 +27,27 @@ VkhBuffer vkh_buffer_create(VkhDevice pDev, VkBufferUsageFlags usage, VkMemoryPr
 
 void vkh_buffer_destroy(VkhBuffer buff){
     if (buff->buffer)
-        vkDestroyBuffer(buff->pDev->vkDev, buff->buffer, NULL);
+        vkDestroyBuffer(buff->pDev->dev, buff->buffer, NULL);
     if (buff->memory)
-        vkFreeMemory(buff->pDev->vkDev, buff->memory, NULL);
+        vkFreeMemory(buff->pDev->dev, buff->memory, NULL);
     free(buff);
     buff = NULL;
 }
 
 
 VkResult vkh_buffer_map(VkhBuffer buff){
-    return vkMapMemory(buff->pDev->vkDev, buff->memory, 0, VK_WHOLE_SIZE, 0, &buff->mapped);
+    return vkMapMemory(buff->pDev->dev, buff->memory, 0, VK_WHOLE_SIZE, 0, &buff->mapped);
 }
 void vkh_buffer_unmap(VkhBuffer buff){
     if (!buff->mapped)
         return;
-    vkUnmapMemory(buff->pDev->vkDev, buff->memory);
+    vkUnmapMemory(buff->pDev->dev, buff->memory);
     buff->mapped = NULL;
 }
 
 VkResult vkh_buffer_bind(VkhBuffer buff)
 {
-    return vkBindBufferMemory(buff->pDev->vkDev, buff->buffer, buff->memory, 0);
+    return vkBindBufferMemory(buff->pDev->dev, buff->buffer, buff->memory, 0);
 }
 
 VkBuffer vkh_buffer_get_vkbuffer (VkhBuffer buff){

diff --git a/src/vkh_device.h b/src/vkh_device.h
index 7706b6527c1ac98c2221f546d8615d020ef7e501..d254568e53a6f292786cdb0165fd3631a256c8ce 100644 (file)
--- a/src/vkh_device.h
+++ b/src/vkh_device.h
@@ -4,9 +4,10 @@
 #include "vkh.h"
 
 typedef struct _vkh_device_t{
-    VkDevice vkDev;
+    VkPhysicalDevice    phy;
+    VkDevice            dev;
+
     VkPhysicalDeviceMemoryProperties phyMemProps;
-    VkRenderPass renderPass;
 }vkh_device_t;
 
 #endif

diff --git a/src/vkh_image.c b/src/vkh_image.c
index 08f79c956844d660391562282f5c2f292d29025c..6a9daf2d3b382bae666f9e012aef47bf43d7220d 100644 (file)
--- a/src/vkh_image.c
+++ b/src/vkh_image.c
@@ -28,15 +28,15 @@ VkhImage _vkh_image_create (VkhDevice pDev, VkImageType imageType,
                                      .arrayLayers = arrayLayers,
                                      .samples = samples };
 
-    VK_CHECK_RESULT(vkCreateImage(pDev->vkDev, &image_info, NULL, &img->image));
+    VK_CHECK_RESULT(vkCreateImage(pDev->dev, &image_info, NULL, &img->image));
 
     VkMemoryRequirements memReq;
-    vkGetImageMemoryRequirements(pDev->vkDev, img->image, &memReq);
+    vkGetImageMemoryRequirements(pDev->dev, img->image, &memReq);
     VkMemoryAllocateInfo memAllocInfo = { .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
                                           .allocationSize = memReq.size };
     assert(memory_type_from_properties(&pDev->phyMemProps, memReq.memoryTypeBits, memprops,&memAllocInfo.memoryTypeIndex));
-    VK_CHECK_RESULT(vkAllocateMemory(pDev->vkDev, &memAllocInfo, NULL, &img->memory));
-    VK_CHECK_RESULT(vkBindImageMemory(pDev->vkDev, img->image, img->memory, 0));
+    VK_CHECK_RESULT(vkAllocateMemory(pDev->dev, &memAllocInfo, NULL, &img->memory));
+    VK_CHECK_RESULT(vkBindImageMemory(pDev->dev, img->image, img->memory, 0));
     return img;
 }
 VkhImage vkh_tex2d_array_create (VkhDevice pDev,
@@ -62,7 +62,7 @@ VkhImage vkh_image_ms_create(VkhDevice pDev,
 }
 void vkh_image_create_view (VkhImage img, VkImageViewType viewType, VkImageAspectFlags aspectFlags){
     if(img->view != VK_NULL_HANDLE)
-        vkDestroyImageView  (img->pDev->vkDev,img->view,NULL);
+        vkDestroyImageView  (img->pDev->dev,img->view,NULL);
 
     VkImageViewCreateInfo viewInfo = { .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
                                          .image = img->image,
@@ -70,12 +70,12 @@ void vkh_image_create_view (VkhImage img, VkImageViewType viewType, VkImageAspec
                                          .format = img->format,
                                          .components = {VK_COMPONENT_SWIZZLE_R,VK_COMPONENT_SWIZZLE_G,VK_COMPONENT_SWIZZLE_B,VK_COMPONENT_SWIZZLE_A},
                                          .subresourceRange = {aspectFlags,0,1,0,img->layers}};
-    VK_CHECK_RESULT(vkCreateImageView(img->pDev->vkDev, &viewInfo, NULL, &img->view));
+    VK_CHECK_RESULT(vkCreateImageView(img->pDev->dev, &viewInfo, NULL, &img->view));
 }
 void vkh_image_create_sampler (VkhImage img, VkFilter magFilter, VkFilter minFilter,
                                VkSamplerMipmapMode mipmapMode, VkSamplerAddressMode addressMode){
     if(img->sampler != VK_NULL_HANDLE)
-        vkDestroySampler    (img->pDev->vkDev,img->sampler,NULL);
+        vkDestroySampler    (img->pDev->dev,img->sampler,NULL);
     VkSamplerCreateInfo samplerCreateInfo = { .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
                                               .maxAnisotropy= 1.0,
                                               .addressModeU = addressMode,
@@ -84,7 +84,7 @@ void vkh_image_create_sampler (VkhImage img, VkFilter magFilter, VkFilter minFil
                                               .magFilter    = magFilter,
                                               .minFilter    = minFilter,
                                               .mipmapMode   = mipmapMode};
-    VK_CHECK_RESULT(vkCreateSampler(img->pDev->vkDev, &samplerCreateInfo, NULL, &img->sampler));
+    VK_CHECK_RESULT(vkCreateSampler(img->pDev->dev, &samplerCreateInfo, NULL, &img->sampler));
 }
 
 void vkh_image_create_descriptor(VkhImage img, VkImageViewType viewType, VkImageAspectFlags aspectFlags, VkFilter magFilter,
@@ -175,12 +175,12 @@ void vkh_image_set_layout_subres(VkCommandBuffer cmdBuff, VkhImage image, VkImag
 void vkh_image_destroy(VkhImage img)
 {
     if(img->view != VK_NULL_HANDLE)
-        vkDestroyImageView  (img->pDev->vkDev,img->view,NULL);
+        vkDestroyImageView  (img->pDev->dev,img->view,NULL);
     if(img->sampler != VK_NULL_HANDLE)
-        vkDestroySampler    (img->pDev->vkDev,img->sampler,NULL);
+        vkDestroySampler    (img->pDev->dev,img->sampler,NULL);
 
-    vkDestroyImage                  (img->pDev->vkDev, img->image, NULL);
-    vkFreeMemory                    (img->pDev->vkDev, img->memory, NULL);
+    vkDestroyImage                  (img->pDev->dev, img->image, NULL);
+    vkFreeMemory                    (img->pDev->dev, img->memory, NULL);
 
     free(img);
     img = NULL;