Merge pull request #17 from lanphon/master

Ekzuzy · web-flow · commit 38d58f4fae92 · 2016-12-20T09:53:32.000+01:00
Use passed image handle to allocate memory.
diff --git a/Project/Tutorial06/Tutorial06.cpp b/Project/Tutorial06/Tutorial06.cpp
@@ -242,7 +242,7 @@ namespace ApiWithoutSecrets {
 
   bool Tutorial06::AllocateImageMemory( VkImage image, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory ) {
     VkMemoryRequirements image_memory_requirements;
-    vkGetImageMemoryRequirements( GetDevice(), Vulkan.Image.Handle, &image_memory_requirements );
+    vkGetImageMemoryRequirements( GetDevice(), image, &image_memory_requirements );
 
     VkPhysicalDeviceMemoryProperties memory_properties;
     vkGetPhysicalDeviceMemoryProperties( GetPhysicalDevice(), &memory_properties );
@@ -1219,4 +1219,4 @@ namespace ApiWithoutSecrets {
     }
   }
 
-} // namespace ApiWithoutSecrets
+} // namespace ApiWithoutSecrets
diff --git a/Project/Tutorial07/Tutorial07.cpp b/Project/Tutorial07/Tutorial07.cpp
@@ -242,7 +242,7 @@ namespace ApiWithoutSecrets {
 
   bool Tutorial07::AllocateImageMemory( VkImage image, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory ) {
     VkMemoryRequirements image_memory_requirements;
-    vkGetImageMemoryRequirements( GetDevice(), Vulkan.Image.Handle, &image_memory_requirements );
+    vkGetImageMemoryRequirements( GetDevice(), image, &image_memory_requirements );
 
     VkPhysicalDeviceMemoryProperties memory_properties;
     vkGetPhysicalDeviceMemoryProperties( GetPhysicalDevice(), &memory_properties );
@@ -1361,4 +1361,4 @@ namespace ApiWithoutSecrets {
     }
   }
 
-} // namespace ApiWithoutSecrets
+} // namespace ApiWithoutSecrets

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ namespace ApiWithoutSecrets {`
`242`	`242`
`243`	`243`	`bool Tutorial06::AllocateImageMemory( VkImage image, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory ) {`
`244`	`244`	`VkMemoryRequirements image_memory_requirements;`
`245`		`- vkGetImageMemoryRequirements( GetDevice(), Vulkan.Image.Handle, &image_memory_requirements );`
	`245`	`+ vkGetImageMemoryRequirements( GetDevice(), image, &image_memory_requirements );`
`246`	`246`
`247`	`247`	`VkPhysicalDeviceMemoryProperties memory_properties;`
`248`	`248`	`vkGetPhysicalDeviceMemoryProperties( GetPhysicalDevice(), &memory_properties );`
`@@ -1219,4 +1219,4 @@ namespace ApiWithoutSecrets {`
`1219`	`1219`	`}`
`1220`	`1220`	`}`
`1221`	`1221`
`1222`		`-} // namespace ApiWithoutSecrets`
	`1222`	`+} // namespace ApiWithoutSecrets`