commit 7ed105917014d56bae29b0a14dcee32e1256e55c
author Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Sep 10 17:17:43 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Sep 11 09:24:00 2015 -0600
tree c656749cb79fcaf854d4ba89cc7cb2251d4d2761
parent ec9dedf14146238ce7c888b02578c79ba4e5fd1b

Bug 12998: Document required depth formats and layouts in buffer memory

icd/common/icd-format.c

diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c
index 2834a23..893eb27 100644
--- a/icd/common/icd-format.c
+++ b/icd/common/icd-format.c
@@ -123,7 +123,7 @@
     [VK_FORMAT_R11G11B10_UFLOAT]     = { 4,  3 },
     [VK_FORMAT_R9G9B9E5_UFLOAT]      = { 4,  3 },
     [VK_FORMAT_D16_UNORM]            = { 2,  1 },
-    [VK_FORMAT_D24_UNORM]            = { 3,  1 },
+    [VK_FORMAT_D24_UNORM_X8]         = { 3,  1 },
     [VK_FORMAT_D32_SFLOAT]           = { 4,  1 },
     [VK_FORMAT_S8_UINT]              = { 1,  1 },
     [VK_FORMAT_D16_UNORM_S8_UINT]    = { 3,  2 },
@@ -211,7 +211,7 @@
 
     switch (format) {
     case VK_FORMAT_D16_UNORM:
-    case VK_FORMAT_D24_UNORM:
+    case VK_FORMAT_D24_UNORM_X8:
     case VK_FORMAT_D32_SFLOAT:
     case VK_FORMAT_S8_UINT:
     case VK_FORMAT_D16_UNORM_S8_UINT:

icd/intel/format.c

diff --git a/icd/intel/format.c b/icd/intel/format.c
index bc05f2b..dab6e3d 100644
--- a/icd/intel/format.c
+++ b/icd/intel/format.c
@@ -623,7 +623,7 @@
         features = VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT;;
         break;
     case VK_FORMAT_D16_UNORM:
-    case VK_FORMAT_D24_UNORM:
+    case VK_FORMAT_D24_UNORM_X8:
     case VK_FORMAT_D32_SFLOAT:
         features = VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT;
         break;

icd/intel/format.h

diff --git a/icd/intel/format.h b/icd/intel/format.h
index c464243..f962691 100644
--- a/icd/intel/format.h
+++ b/icd/intel/format.h
@@ -39,7 +39,7 @@
 
     switch (format) {
     case VK_FORMAT_D16_UNORM:
-    case VK_FORMAT_D24_UNORM:
+    case VK_FORMAT_D24_UNORM_X8:
     case VK_FORMAT_D32_SFLOAT:
     /* VK_FORMAT_D16_UNORM_S8_UINT is unsupported */
     case VK_FORMAT_D24_UNORM_S8_UINT:

icd/intel/layout.c

diff --git a/icd/intel/layout.c b/icd/intel/layout.c
index 1f18a11..be40789 100644
--- a/icd/intel/layout.c
+++ b/icd/intel/layout.c
@@ -699,7 +699,7 @@
    switch (format) {
    case VK_FORMAT_D24_UNORM_S8_UINT:
       if (require_separate_stencil) {
-         format = VK_FORMAT_D24_UNORM;
+         format = VK_FORMAT_D24_UNORM_X8;
          layout->separate_stencil = true;
       }
       break;