Merge pull request #17 from lanphon/master

Use passed image handle to allocate memory.
This commit is contained in:
Pawel Lapinski
2016-12-20 09:53:32 +01:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@@ -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

View File

@@ -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