From 1f1b26bceb2a0bea92734d911a7282119ca684bf Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Mon, 6 Jul 2015 17:47:18 -0700
Subject: [PATCH] vk/vulkan.h: Rename VkRect to VkRect2D

---
 include/vulkan/vulkan.h | 7 +++----
 src/vulkan/device.c     | 4 ++--
 src/vulkan/private.h    | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index a0f50e0f024..6711ba2ab44 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1619,14 +1619,14 @@ typedef struct {
 typedef struct {
     VkOffset2D                                  offset;
     VkExtent2D                                  extent;
-} VkRect;
+} VkRect2D;
 
 typedef struct {
     VkStructureType                             sType;
     const void*                                 pNext;
     uint32_t                                    viewportAndScissorCount;
     const VkViewport*                           pViewports;
-    const VkRect*                               pScissors;
+    const VkRect2D*                             pScissors;
 } VkDynamicVpStateCreateInfo;
 
 typedef struct {
@@ -1694,8 +1694,7 @@ typedef struct {
 typedef struct {
     VkStructureType                             sType;
     const void*                                 pNext;
-
-    VkRect                                      renderArea;
+    VkRect2D                                    renderArea;
     uint32_t                                    colorAttachmentCount;
     VkExtent2D                                  extent;
     uint32_t                                    sampleCount;
diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index cfe9201e2e6..b1cc618fdd3 100644
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -1956,7 +1956,7 @@ VkResult anv_CreateDynamicViewportState(
 
    for (uint32_t i = 0; i < pCreateInfo->viewportAndScissorCount; i++) {
       const VkViewport *vp = &pCreateInfo->pViewports[i];
-      const VkRect *s = &pCreateInfo->pScissors[i];
+      const VkRect2D *s = &pCreateInfo->pScissors[i];
 
       struct GEN8_SF_CLIP_VIEWPORT sf_clip_viewport = {
          .ViewportMatrixElementm00 = vp->width / 2,
@@ -3585,7 +3585,7 @@ VkResult anv_CreateFramebuffer(
                .maxDepth = 1
             },
          },
-         .pScissors = (VkRect[]) {
+         .pScissors = (VkRect2D[]) {
             { {  0,  0 },
               { pCreateInfo->width, pCreateInfo->height } },
          }
diff --git a/src/vulkan/private.h b/src/vulkan/private.h
index a0ccb903224..cb290ffea99 100644
--- a/src/vulkan/private.h
+++ b/src/vulkan/private.h
@@ -909,7 +909,7 @@ struct anv_render_pass_layer {
 };
 
 struct anv_render_pass {
-   VkRect                                       render_area;
+   VkRect2D                                     render_area;
 
    uint32_t                                     num_clear_layers;
    uint32_t                                     num_layers;
-- 
2.30.2