Merge pull request #254 from MennoVink/master

adam-sawicki-a · web-flow · commit 228a1b68ae58 · 2022-03-28T10:08:52.000+02:00
C4062 fix
diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h
@@ -5879,9 +5879,14 @@ class VmaMappingHysteresis
     void PostMinorCounter()
     {
         if(m_MinorCounter < m_MajorCounter)
+        {
             ++m_MinorCounter;
+        }
         else if(m_MajorCounter > 0)
-            --m_MajorCounter, --m_MinorCounter;
+        {
+            --m_MajorCounter;
+            --m_MinorCounter;
+        }
     }
 };
 
@@ -13841,6 +13846,9 @@ bool VmaDefragmentationContext_T::ComputeDefragmentation_Extensive(VmaBlockVecto
         }
         break;
     }
+    case StateExtensive::Operation::Cleanup:
+        // Cleanup is handled below so that other operations may reuse the cleanup code. This case is here to prevent the unhandled enum value warning (C4062).
+        break;
     }
 
     if (vectorState.operation == StateExtensive::Operation::Cleanup)

Original file line number	Diff line number	Diff line change
`@@ -5879,9 +5879,14 @@ class VmaMappingHysteresis`
`5879`	`5879`	`void PostMinorCounter()`
`5880`	`5880`	`{`
`5881`	`5881`	`if(m_MinorCounter < m_MajorCounter)`
	`5882`	`+ {`
`5882`	`5883`	`++m_MinorCounter;`
	`5884`	`+ }`
`5883`	`5885`	`else if(m_MajorCounter > 0)`
`5884`		`- --m_MajorCounter, --m_MinorCounter;`
	`5886`	`+ {`
	`5887`	`+ --m_MajorCounter;`
	`5888`	`+ --m_MinorCounter;`
	`5889`	`+ }`
`5885`	`5890`	`}`
`5886`	`5891`	`};`
`5887`	`5892`
`@@ -13841,6 +13846,9 @@ bool VmaDefragmentationContext_T::ComputeDefragmentation_Extensive(VmaBlockVecto`
`13841`	`13846`	`}`
`13842`	`13847`	`break;`
`13843`	`13848`	`}`
	`13849`	`+ case StateExtensive::Operation::Cleanup:`
	`13850`	`+ // Cleanup is handled below so that other operations may reuse the cleanup code. This case is here to prevent the unhandled enum value warning (C4062).`
	`13851`	`+ break;`
`13844`	`13852`	`}`
`13845`	`13853`
`13846`	`13854`	`if (vectorState.operation == StateExtensive::Operation::Cleanup)`