opus-tango/IntroductionToVulkan
1
0
Fork 0
mirror of https://github.com/opus-tango/IntroductionToVulkan.git synced 2026-03-20 03:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from lanphon/master

Browse Source 
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
parent ace944f547 35ff9cc8f0
commit 38d58f4fae
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/Tutorial06/Tutorial06.cpp
View File

@@ -242,7 +242,7 @@ namespace ApiWithoutSecrets {
bool Tutorial06::AllocateImageMemory( VkImage image, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory ) { bool Tutorial06::AllocateImageMemory( VkImage image, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory ) {
VkMemoryRequirements image_memory_requirements; VkMemoryRequirements image_memory_requirements;
vkGetImageMemoryRequirements( GetDevice(), Vulkan.Image.Handle, &image_memory_requirements ); vkGetImageMemoryRequirements( GetDevice(), image, &image_memory_requirements );
VkPhysicalDeviceMemoryProperties memory_properties; VkPhysicalDeviceMemoryProperties memory_properties;
vkGetPhysicalDeviceMemoryProperties( GetPhysicalDevice(), &memory_properties ); vkGetPhysicalDeviceMemoryProperties( GetPhysicalDevice(), &memory_properties );
@@ -1219,4 +1219,4 @@ namespace ApiWithoutSecrets {
} }
} }
} // namespace ApiWithoutSecrets } // namespace ApiWithoutSecrets

4
Project/Tutorial07/Tutorial07.cpp
View File

@@ -242,7 +242,7 @@ namespace ApiWithoutSecrets {
bool Tutorial07::AllocateImageMemory( VkImage image, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory ) { bool Tutorial07::AllocateImageMemory( VkImage image, VkMemoryPropertyFlagBits property, VkDeviceMemory *memory ) {
VkMemoryRequirements image_memory_requirements; VkMemoryRequirements image_memory_requirements;
vkGetImageMemoryRequirements( GetDevice(), Vulkan.Image.Handle, &image_memory_requirements ); vkGetImageMemoryRequirements( GetDevice(), image, &image_memory_requirements );
VkPhysicalDeviceMemoryProperties memory_properties; VkPhysicalDeviceMemoryProperties memory_properties;
vkGetPhysicalDeviceMemoryProperties( GetPhysicalDevice(), &memory_properties ); vkGetPhysicalDeviceMemoryProperties( GetPhysicalDevice(), &memory_properties );
@@ -1361,4 +1361,4 @@ namespace ApiWithoutSecrets {
} }
} }
} // namespace ApiWithoutSecrets } // namespace ApiWithoutSecrets