icd: Fix power operator in VkPhysicalDeviceLimits

Two bugs here:
- ^ (xor) was being used as a power operator
- maxPerStageResources and maxDescriptorSet* limits were mistaking
  footnote notation in the spec for power notation

2 files changed, 16 insertions, 16 deletions

diff --git a/icd/generated/mock_icd.cpp b/icd/generated/mock_icd.cpp
index 93eb1d8c..a834ce9f 100644
--- a/icd/generated/mock_icd.cpp
+++ b/icd/generated/mock_icd.cpp
@@ -57,14 +57,14 @@ static VkPhysicalDeviceLimits SetLimits(VkPhysicalDeviceLimits *limits) {
     limits->maxPerStageDescriptorSampledImages = 16;
     limits->maxPerStageDescriptorStorageImages = 4;
     limits->maxPerStageDescriptorInputAttachments = 4;
-    limits->maxPerStageResources = 128^2;
-    limits->maxDescriptorSetSamplers = 96^8;
-    limits->maxDescriptorSetUniformBuffers = 72^8;
+    limits->maxPerStageResources = 128;
+    limits->maxDescriptorSetSamplers = 96;
+    limits->maxDescriptorSetUniformBuffers = 72;
     limits->maxDescriptorSetUniformBuffersDynamic = 8;
-    limits->maxDescriptorSetStorageBuffers = 24^8;
+    limits->maxDescriptorSetStorageBuffers = 24;
     limits->maxDescriptorSetStorageBuffersDynamic = 4;
-    limits->maxDescriptorSetSampledImages = 96^8;
-    limits->maxDescriptorSetStorageImages = 24^8;
+    limits->maxDescriptorSetSampledImages = 96;
+    limits->maxDescriptorSetStorageImages = 24;
     limits->maxDescriptorSetInputAttachments = 4;
     limits->maxVertexInputAttributes = 16;
     limits->maxVertexInputBindings = 16;
@@ -99,8 +99,8 @@ static VkPhysicalDeviceLimits SetLimits(VkPhysicalDeviceLimits *limits) {
     limits->subPixelPrecisionBits = 4;
     limits->subTexelPrecisionBits = 4;
     limits->mipmapPrecisionBits = 4;
-    limits->maxDrawIndexedIndexValue = (2^32) - 1;
-    limits->maxDrawIndirectCount = (2^16) - 1;
+    limits->maxDrawIndexedIndexValue = UINT32_MAX;
+    limits->maxDrawIndirectCount = UINT16_MAX;
     limits->maxSamplerLodBias = 2.0f;
     limits->maxSamplerAnisotropy = 16;
     limits->maxViewports = 16;
diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py
index e1dced9f..33f2cad8 100644
--- a/scripts/mock_icd_generator.py
+++ b/scripts/mock_icd_generator.py
@@ -83,14 +83,14 @@ static VkPhysicalDeviceLimits SetLimits(VkPhysicalDeviceLimits *limits) {
     limits->maxPerStageDescriptorSampledImages = 16;
     limits->maxPerStageDescriptorStorageImages = 4;
     limits->maxPerStageDescriptorInputAttachments = 4;
-    limits->maxPerStageResources = 128^2;
-    limits->maxDescriptorSetSamplers = 96^8;
-    limits->maxDescriptorSetUniformBuffers = 72^8;
+    limits->maxPerStageResources = 128;
+    limits->maxDescriptorSetSamplers = 96;
+    limits->maxDescriptorSetUniformBuffers = 72;
     limits->maxDescriptorSetUniformBuffersDynamic = 8;
-    limits->maxDescriptorSetStorageBuffers = 24^8;
+    limits->maxDescriptorSetStorageBuffers = 24;
     limits->maxDescriptorSetStorageBuffersDynamic = 4;
-    limits->maxDescriptorSetSampledImages = 96^8;
-    limits->maxDescriptorSetStorageImages = 24^8;
+    limits->maxDescriptorSetSampledImages = 96;
+    limits->maxDescriptorSetStorageImages = 24;
     limits->maxDescriptorSetInputAttachments = 4;
     limits->maxVertexInputAttributes = 16;
     limits->maxVertexInputBindings = 16;
@@ -125,8 +125,8 @@ static VkPhysicalDeviceLimits SetLimits(VkPhysicalDeviceLimits *limits) {
     limits->subPixelPrecisionBits = 4;
     limits->subTexelPrecisionBits = 4;
     limits->mipmapPrecisionBits = 4;
-    limits->maxDrawIndexedIndexValue = (2^32) - 1;
-    limits->maxDrawIndirectCount = (2^16) - 1;
+    limits->maxDrawIndexedIndexValue = UINT32_MAX;
+    limits->maxDrawIndirectCount = UINT16_MAX;
     limits->maxSamplerLodBias = 2.0f;
     limits->maxSamplerAnisotropy = 16;
     limits->maxViewports = 16;