commit 11f74376aa025d0b853c5926fc785a4a1701dc02
author Tony Barbour <tony@LunarG.com> Mon Apr 13 15:02:52 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:48:21 2015 +0800
tree 2bb7a92e6612ed1c4595fee9606aadf8c44d6c68
parent e9f9994d4fc08dc81b940d65b8eb663fb9e79e32

vulkan.h: Rename parameters in vkCmdResolveImage calls

icd/intel/cmd_meta.c

diff --git a/icd/intel/cmd_meta.c b/icd/intel/cmd_meta.c
index 0074406..f1a7a13 100644
--- a/icd/intel/cmd_meta.c
+++ b/icd/intel/cmd_meta.c
@@ -1004,8 +1004,8 @@
     VkImageLayout                            srcImageLayout,
     VkImage                                   destImage,
     VkImageLayout                            destImageLayout,
-    uint32_t                                    rectCount,
-    const VkImageResolve*                    pRects)
+    uint32_t                                    regionCount,
+    const VkImageResolve*                    pRegions)
 {
     struct intel_cmd *cmd = intel_cmd(cmdBuffer);
     struct intel_img *src = intel_img(srcImage);
@@ -1044,23 +1044,23 @@
     format = cmd_meta_img_raw_format(cmd, src->layout.format);
     cmd_meta_set_src_for_img(cmd, src, format, VK_IMAGE_ASPECT_COLOR, &meta);
 
-    for (i = 0; i < rectCount; i++) {
-        const VkImageResolve *rect = &pRects[i];
+    for (i = 0; i < regionCount; i++) {
+        const VkImageResolve *region = &pRegions[i];
         int arraySlice;
 
-        for(arraySlice = 0; arraySlice < rect->extent.depth; arraySlice++) {
-            meta.src.lod = rect->srcSubresource.mipLevel;
-            meta.src.layer = rect->srcSubresource.arraySlice + arraySlice;
-            meta.src.x = rect->srcOffset.x;
-            meta.src.y = rect->srcOffset.y;
+        for(arraySlice = 0; arraySlice < region->extent.depth; arraySlice++) {
+            meta.src.lod = region->srcSubresource.mipLevel;
+            meta.src.layer = region->srcSubresource.arraySlice + arraySlice;
+            meta.src.x = region->srcOffset.x;
+            meta.src.y = region->srcOffset.y;
 
-            meta.dst.lod = rect->destSubresource.mipLevel;
-            meta.dst.layer = rect->destSubresource.arraySlice + arraySlice;
-            meta.dst.x = rect->destOffset.x;
-            meta.dst.y = rect->destOffset.y;
+            meta.dst.lod = region->destSubresource.mipLevel;
+            meta.dst.layer = region->destSubresource.arraySlice + arraySlice;
+            meta.dst.x = region->destOffset.x;
+            meta.dst.y = region->destOffset.y;
 
-            meta.width = rect->extent.width;
-            meta.height = rect->extent.height;
+            meta.width = region->extent.width;
+            meta.height = region->extent.height;
 
             cmd_meta_set_dst_for_img(cmd, dst, format,
                     meta.dst.lod, meta.dst.layer, &meta);