Simplified return code

Author: robertosfield

src/vsg/state/Image.cpp

@@ -228,15 +228,7 @@ VkResult Image::compile(Device* device)
 
 VkResult Image::compile(Context& context)
 {
-    try
-    {
-        return compile(*context.deviceMemoryBufferPools);
-    }
-    catch (...)
-    {
-        vsg::info("Image::compile(Context& context)");
-        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
-    }
+    return compile(*context.deviceMemoryBufferPools);
 }
 
 VkResult Image::compile(MemoryBufferPools& memoryBufferPools)
@@ -255,13 +247,10 @@ VkResult Image::compile(MemoryBufferPools& memoryBufferPools)
     if (deviceMemory)
     {
         vd.requiresDataCopy = data.valid();
-        bind(deviceMemory, offset);
+        return bind(deviceMemory, offset);
     }
     else
     {
-        // throw Exception{"Error: Image failed to reserve slot from deviceMemoryBufferPools.", VK_ERROR_OUT_OF_DEVICE_MEMORY};
-        result = VK_ERROR_OUT_OF_DEVICE_MEMORY;
+        return VK_ERROR_OUT_OF_DEVICE_MEMORY;
     }
-
-    return result;
 }

src/vsg/state/ImageInfo.cpp

@@ -420,11 +420,6 @@ VkDeviceSize ImageInfo::computeDataSize() const
     if (imageView && imageView->image)
     {
         auto& image = imageView->image;
-
-        // VkExtent3D extent = {0, 0, 0};
-        // uint32_t mipLevels = 0;
-        // uint32_t arrayLayers = 0;
-
         if (image->data) return image->data->computeValueCountIncludingMipmaps();
     }
     return 0;

src/vsg/vk/Device.cpp

@@ -233,14 +233,12 @@ VkDeviceSize Device::availableMemory(bool includeMemoryPools) const
         }
     }
 
-    VkDeviceSize minimumMargin = 0; //1024*1024*1024;
-
     for (auto& heapIndex : compatibleHeaps)
     {
         VkDeviceSize heapAvailable = memoryBudget.heapBudget[heapIndex] - memoryBudget.heapUsage[heapIndex];
         if (heapAvailable > minimumMargin)
         {
-            available += (heapAvailable - minimumMargin);
+            available += heapAvailable;
         }
     }