commit f1eceb98219334d5540106fd024d6aee9e397802
author Tony Barbour <tony@LunarG.com> Thu Oct 15 12:42:56 2015 -0600
committer Tony Barbour <tony@LunarG.com> Mon Oct 19 09:32:27 2015 -0600
tree 4d3ef1a18e045bffeb616dcf01ccd83fcbf8be67
parent 50bc2cc2d804bd1a7ffd5788e02d456afeada8dd

Clarify parameter usage in memory_type_from_properties

demos/cube.c

diff --git a/demos/cube.c b/demos/cube.c
index 10fc17b..a57bf4f 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -407,13 +407,13 @@
     uint32_t queue_count;
 };
 
-static VkResult memory_type_from_properties(struct demo *demo, uint32_t typeBits, VkFlags properties, uint32_t *typeIndex)
+static VkResult memory_type_from_properties(struct demo *demo, uint32_t typeBits, VkFlags requirements_mask, uint32_t *typeIndex)
 {
      // Search memtypes to find first index with those properties
      for (uint32_t i = 0; i < 32; i++) {
          if ((typeBits & 1) == 1) {
              // Type is available, does it match user properties?
-             if ((demo->memory_properties.memoryTypes[i].propertyFlags & properties) == properties) {
+             if ((demo->memory_properties.memoryTypes[i].propertyFlags & requirements_mask) == requirements_mask) {
                  *typeIndex = i;
                  return VK_SUCCESS;
              }
@@ -853,7 +853,7 @@
 
     err = memory_type_from_properties(demo,
                                       mem_reqs.memoryTypeBits,
-                                      VK_MEMORY_PROPERTY_DEVICE_ONLY,
+                                      0, /* No requirements */
                                       &demo->depth.mem_alloc.memoryTypeIndex);
     assert(!err);
 
@@ -925,7 +925,7 @@
                                        struct texture_object *tex_obj,
                                        VkImageTiling tiling,
                                        VkImageUsageFlags usage,
-                                       VkFlags mem_props)
+                                       VkFlags required_props)
 {
     const VkFormat tex_format = VK_FORMAT_R8G8B8A8_UNORM;
     int32_t tex_width;
@@ -970,7 +970,7 @@
     tex_obj->mem_alloc.allocationSize = mem_reqs.size;
     tex_obj->mem_alloc.memoryTypeIndex = 0;
 
-    err = memory_type_from_properties(demo, mem_reqs.memoryTypeBits, mem_props, &tex_obj->mem_alloc.memoryTypeIndex);
+    err = memory_type_from_properties(demo, mem_reqs.memoryTypeBits, required_props, &tex_obj->mem_alloc.memoryTypeIndex);
     assert(!err);
 
     /* allocate memory */
@@ -983,7 +983,7 @@
             tex_obj->mem, 0);
     assert(!err);
 
-    if (mem_props & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) {
+    if (required_props & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) {
         const VkImageSubresource subres = {
             .aspect = VK_IMAGE_ASPECT_COLOR,
             .mipLevel = 0,