commit c3b8eea2f5e66db11651068575f4712cf195f542
author Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Sep 10 14:14:11 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Sep 11 09:20:02 2015 -0600
tree 69bd7442c1cf487e259535dc9addd1a8ee83c393
parent 5162441c5e51c513e0003d904444ad563c6c79d2

bug 14516: rename VK_IMAGE_USAGE_DEPTH_STENCIL_BIT

into VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT

icd/intel/layout.c

diff --git a/icd/intel/layout.c b/icd/intel/layout.c
index 5826ec5..1f18a11 100644
--- a/icd/intel/layout.c
+++ b/icd/intel/layout.c
@@ -400,7 +400,7 @@
       /* this happens to be the case */
       layout->align_i = layout->block_width;
       layout->align_j = layout->block_height;
-   } else if (info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_BIT) {
+   } else if (info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
       if (intel_gpu_gen(params->gpu) >= INTEL_GEN(7)) {
          switch (layout->format) {
          case VK_FORMAT_D16_UNORM:
@@ -492,7 +492,7 @@
     *
     *     "W-Major Tile Format is used for separate stencil."
     */
-   if (info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_BIT) {
+   if (info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
       switch (format) {
       case VK_FORMAT_S8_UINT:
          valid_tilings &= LAYOUT_TILING_W;
@@ -602,7 +602,7 @@
     *
     * See "Multisampled Surface Storage Format" field of SURFACE_STATE.
     */
-   if (info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_BIT) {
+   if (info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
       /*
        * From the Ivy Bridge PRM, volume 1 part 1, page 111:
        *
@@ -689,7 +689,7 @@
     *
     * GEN7+ requires separate stencil buffers.
     */
-   if (info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_BIT) {
+   if (info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
       if (intel_gpu_gen(params->gpu) >= INTEL_GEN(7))
          require_separate_stencil = true;
       else
@@ -789,7 +789,7 @@
    if (intel_debug & INTEL_DEBUG_NOHIZ)
        return false;
 
-   if (!(info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_BIT))
+   if (!(info->usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT))
       return false;
 
    if (!intel_format_has_depth(params->gpu, info->format))