commit 5938c0e3950b5d9a15e54d798ba488b34a36eae4
author Adam Sawicki <adam.sawicki@amd.com> Thu Jan 24 17:30:36 2019 +0100
committer Adam Sawicki <adam.sawicki@amd.com> Thu Jan 24 17:30:36 2019 +0100
tree 840e758ec1ea06ed4bca8c1bfb6333eab272302b
parent 5df580a997c7c1a4568fc445895f8de045d433ce

Minor refactoring in function VmaBlockMetadata_Generic::CreateAllocationRequest.

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index f3ce342..9c262ec 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -7959,9 +7959,7 @@
     {

         // Brute-force algorithm. TODO: Come up with something better.

 

-        pAllocationRequest->sumFreeSize = VK_WHOLE_SIZE;

-        pAllocationRequest->sumItemSize = VK_WHOLE_SIZE;

-

+        bool found = false;

         VmaAllocationRequest tmpAllocRequest = {};

         tmpAllocRequest.type = VmaAllocationRequestType::Normal;

         for(VmaSuballocationList::iterator suballocIt = m_Suballocations.begin();

@@ -7985,21 +7983,23 @@
                     &tmpAllocRequest.sumFreeSize,

                     &tmpAllocRequest.sumItemSize))

                 {

-                    tmpAllocRequest.item = suballocIt;

-

-                    if(tmpAllocRequest.CalcCost() < pAllocationRequest->CalcCost() ||

-                        strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT)

+                    if(strategy == VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT)

                     {

                         *pAllocationRequest = tmpAllocRequest;

+                        pAllocationRequest->item = suballocIt;

+                        break;

+                    }

+                    if(!found || tmpAllocRequest.CalcCost() < pAllocationRequest->CalcCost())

+                    {

+                        *pAllocationRequest = tmpAllocRequest;

+                        pAllocationRequest->item = suballocIt;

+                        found = true;

                     }

                 }

             }

         }

 

-        if(pAllocationRequest->sumItemSize != VK_WHOLE_SIZE)

-        {

-            return true;

-        }

+        return found;

     }

 

     return false;