From 84f93960d3369925eba0eae34198ecbfc63adada Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Tue, 27 Oct 2015 18:52:46 +0800
Subject: bug 14936: Sparse questions/issues (WIP)

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14936
---
 demos/vulkaninfo.c       |  2 +-
 include/vulkan.h         |  6 +-----
 layers/param_checker.cpp | 40 ----------------------------------------
 3 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index 7965ede9..4b22f9e9 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -796,6 +796,7 @@ static void app_gpu_dump_features(const struct app_gpu *gpu)
     printf("\tsparseResidency8Samples                 = %u\n", features->sparseResidency8Samples                );
     printf("\tsparseResidency16Samples                = %u\n", features->sparseResidency16Samples               );
     printf("\tsparseResidencyAliased                  = %u\n", features->sparseResidencyAliased                 );
+    printf("\tvariableMultisampleRate                 = %u\n", features->variableMultisampleRate                );
 }
 
 static void app_dump_sparse_props(const VkPhysicalDeviceSparseProperties *sparseProps)
@@ -808,7 +809,6 @@ static void app_dump_sparse_props(const VkPhysicalDeviceSparseProperties *sparse
     printf("\t\tresidencyStandard2DMultisampleBlockShape = %u\n", sparseProps->residencyStandard2DMultisampleBlockShape);
     printf("\t\tresidencyStandard3DBlockShape     = %u\n", sparseProps->residencyStandard3DBlockShape    );
     printf("\t\tresidencyAlignedMipSize           = %u\n", sparseProps->residencyAlignedMipSize          );
-    printf("\t\tresidencyNonResident              = %u\n", sparseProps->residencyNonResident             );
     printf("\t\tresidencyNonResidentStrict        = %u\n", sparseProps->residencyNonResidentStrict       );
 }
 
diff --git a/include/vulkan.h b/include/vulkan.h
index 947c9476..24aaafa1 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -839,10 +839,6 @@ typedef enum {
     VK_SPARSE_IMAGE_FORMAT_NONSTANDARD_BLOCK_SIZE_BIT = 0x00000004,
 } VkSparseImageFormatFlagBits;
 typedef VkFlags VkSparseImageFormatFlags;
-
-typedef enum {
-    VK_SPARSE_MEMORY_BIND_REPLICATE_BLOCK_BIT = 0x00000001,
-} VkSparseMemoryBindFlagBits;
 typedef VkFlags VkSparseMemoryBindFlags;
 
 typedef enum {
@@ -1163,6 +1159,7 @@ typedef struct {
     VkBool32                                    sparseResidency8Samples;
     VkBool32                                    sparseResidency16Samples;
     VkBool32                                    sparseResidencyAliased;
+    VkBool32                                    variableMultisampleRate;
 } VkPhysicalDeviceFeatures;
 
 typedef struct {
@@ -1292,7 +1289,6 @@ typedef struct {
     VkBool32                                    residencyStandard2DMultisampleBlockShape;
     VkBool32                                    residencyStandard3DBlockShape;
     VkBool32                                    residencyAlignedMipSize;
-    VkBool32                                    residencyNonResident;
     VkBool32                                    residencyNonResidentStrict;
 } VkPhysicalDeviceSparseProperties;
 
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index ce64cf4c..5a65741a 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -650,46 +650,6 @@ std::string EnumeratorString(VkSparseImageFormatFlagBits const& enumerator)
     return enumeratorString;
 }
 
-static
-bool ValidateEnumerator(VkSparseMemoryBindFlagBits const& enumerator)
-{
-    VkSparseMemoryBindFlagBits allFlags = (VkSparseMemoryBindFlagBits)(VK_SPARSE_MEMORY_BIND_REPLICATE_BLOCK_BIT);
-    if(enumerator & (~allFlags))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-static
-std::string EnumeratorString(VkSparseMemoryBindFlagBits const& enumerator)
-{
-    if(!ValidateEnumerator(enumerator))
-    {
-        return "unrecognized enumerator";
-    }
-
-    std::vector<std::string> strings;
-    if(enumerator & VK_SPARSE_MEMORY_BIND_REPLICATE_BLOCK_BIT)
-    {
-        strings.push_back("VK_SPARSE_MEMORY_BIND_REPLICATE_BLOCK_BIT");
-    }
-
-    std::string enumeratorString;
-    for(auto const& string : strings)
-    {
-        enumeratorString += string;
-
-        if(string != strings.back())
-        {
-            enumeratorString += '|';
-        }
-    }
-
-    return enumeratorString;
-}
-
 static
 bool ValidateEnumerator(VkFenceCreateFlagBits const& enumerator)
 {
-- 
cgit v1.2.3