profiles: remove useless array for properties

KhronosGroup · Dec 13, 2021 · d206f8f · d206f8f
1 parent 418a9bd
commit d206f8f
Show file tree

Hide file tree

Showing 6 changed files with 544 additions and 937 deletions.
diff --git a/profiles/VP_ANDROID_angle_es31.json b/profiles/VP_ANDROID_angle_es31.json
@@ -16,14 +16,12 @@
                     "multiview": true
                 }
             },
-            "properties": [
-                {
-                    "VkPhysicalDeviceMultiviewProperties": {
-                        "maxMultiviewViewCount": 0,
-                        "maxMultiviewInstanceIndex": 134217727
-                    }
+            "properties": {
+                "VkPhysicalDeviceMultiviewProperties": {
+                    "maxMultiviewViewCount": 0,
+                    "maxMultiviewInstanceIndex": 134217727
                 }
-            ]
+            }
         },
         {
             "name": "baseline",
@@ -89,26 +87,24 @@
                     "robustImageAccess": true
                 }
             },
-            "properties": [
-                {
-                    "VkPhysicalDeviceProperties": {
-                        "limits": {
-                            "standardSampleLocations": true,
-                            "maxVertexOutputComponents": 64,
-                            "maxTessellationControlPerVertexOutputComponents": 64,
-                            "maxTessellationControlPerPatchOutputComponents": 64,
-                            "maxTessellationControlTotalOutputComponents": 64,
-                            "maxTessellationEvaluationOutputComponents": 64,
-                            "maxGeometryOutputComponents": 64,
-                            "maxGeometryTotalOutputComponents": 64,
-                            "maxPerStageDescriptorUniformBuffers": 12,
-                            "maxPerStageDescriptorStorageBuffers": 12,
-                            "maxVertexInputAttributeOffset": 2048,
-                            "subPixelPrecisionBits": 8
-                        }
+            "properties": {
+                "VkPhysicalDeviceProperties": {
+                    "limits": {
+                        "standardSampleLocations": true,
+                        "maxVertexOutputComponents": 64,
+                        "maxTessellationControlPerVertexOutputComponents": 64,
+                        "maxTessellationControlPerPatchOutputComponents": 64,
+                        "maxTessellationControlTotalOutputComponents": 64,
+                        "maxTessellationEvaluationOutputComponents": 64,
+                        "maxGeometryOutputComponents": 64,
+                        "maxGeometryTotalOutputComponents": 64,
+                        "maxPerStageDescriptorUniformBuffers": 12,
+                        "maxPerStageDescriptorStorageBuffers": 12,
+                        "maxVertexInputAttributeOffset": 2048,
+                        "subPixelPrecisionBits": 8
                     }
                 }
-            ]
+            }
         }
     ],
     "profiles": [

diff --git a/profiles/VP_ANDROID_baseline_2022.json b/profiles/VP_ANDROID_baseline_2022.json
@@ -129,110 +129,108 @@
                     "textureCompressionETC2": true
                 }
             },
-            "properties": [
-                {
-                    "VkPhysicalDeviceProperties": {
-                        "limits": {
-                            "maxImageDimension1D": 16384,
-                            "maxImageDimension2D": 8192,
-                            "maxImageDimension3D": 4096,
-                            "maxImageDimensionCube": 8192,
-                            "maxImageArrayLayers": 256,
-                            "maxTexelBufferElements": 65536,
-                            "maxUniformBufferRange": 65536,
-                            "maxStorageBufferRange": 268435456,
-                            "maxPushConstantsSize": 128,
-                            "maxMemoryAllocationCount": 4294967295,
-                            "maxSamplerAllocationCount": 16384,
-                            "bufferImageGranularity": 4096,
-                            "maxBoundDescriptorSets": 4,
-                            "maxPerStageDescriptorSamplers": 128,
-                            "maxPerStageDescriptorUniformBuffers": 12,
-                            "maxPerStageDescriptorStorageBuffers": 35,
-                            "maxPerStageDescriptorSampledImages": 16,
-                            "maxPerStageDescriptorStorageImages": 8,
-                            "maxPerStageDescriptorInputAttachments": 4,
-                            "maxPerStageResources": 79,
-                            "maxDescriptorSetSamplers": 768,
-                            "maxDescriptorSetUniformBuffers": 72,
-                            "maxDescriptorSetUniformBuffersDynamic": 8,
-                            "maxDescriptorSetStorageBuffers": 72,
-                            "maxDescriptorSetStorageBuffersDynamic": 4,
-                            "maxDescriptorSetSampledImages": 96,
-                            "maxDescriptorSetStorageImages": 48,
-                            "maxDescriptorSetInputAttachments": 4,
-                            "maxVertexInputAttributes": 16,
-                            "maxVertexInputBindings": 16,
-                            "maxVertexInputAttributeOffset": 2047,
-                            "maxVertexInputBindingStride": 2048,
-                            "maxVertexOutputComponents": 128,
-                            "maxTessellationGenerationLevel": 64,
-                            "maxTessellationPatchSize": 32,
-                            "maxTessellationControlPerVertexInputComponents": 128,
-                            "maxTessellationControlPerVertexOutputComponents": 128,
-                            "maxTessellationControlPerPatchOutputComponents": 120,
-                            "maxTessellationControlTotalOutputComponents": 4096,
-                            "maxTessellationEvaluationInputComponents": 128,
-                            "maxTessellationEvaluationOutputComponents": 128,
-                            "maxFragmentInputComponents": 128,
-                            "maxFragmentOutputAttachments": 4,
-                            "maxFragmentDualSrcAttachments": 0,
-                            "maxFragmentCombinedOutputResources": 47,
-                            "maxComputeSharedMemorySize": 32768,
-                            "maxComputeWorkGroupCount": [ 65535, 65535, 65535 ],
-                            "maxComputeWorkGroupInvocations": 128,
-                            "maxComputeWorkGroupSize": [ 128, 128, 128 ],
-                            "subPixelPrecisionBits": 8,
-                            "subTexelPrecisionBits": 8,
-                            "mipmapPrecisionBits": 8,
-                            "maxDrawIndexedIndexValue": 4294967295,
-                            "maxDrawIndirectCount": 1,
-                            "maxSamplerLodBias": 15.9961,
-                            "maxSamplerAnisotropy": 1.0,
-                            "maxViewports": 1,
-                            "maxViewportDimensions": [ 8192, 8192 ],
-                            "viewportBoundsRange": [ -32768, 32767 ],
-                            "viewportSubPixelBits": 0,
-                            "minMemoryMapAlignment": 64,
-                            "minTexelBufferOffsetAlignment": 256,
-                            "minUniformBufferOffsetAlignment": 64,
-                            "minStorageBufferOffsetAlignment": 256,
-                            "minTexelOffset": -8,
-                            "maxTexelOffset": 7,
-                            "minTexelGatherOffset": -8,
-                            "maxTexelGatherOffset": 7,
-                            "minInterpolationOffset": -0.5,
-                            "maxInterpolationOffset": 0.5,
-                            "subPixelInterpolationOffsetBits": 4,
-                            "maxFramebufferWidth": 8192,
-                            "maxFramebufferHeight": 8192,
-                            "maxFramebufferLayers": 256,
-                            "framebufferColorSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
-                            "framebufferDepthSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
-                            "framebufferStencilSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
-                            "framebufferNoAttachmentsSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
-                            "maxColorAttachments": 4,
-                            "sampledImageColorSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
-                            "sampledImageIntegerSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT" ],
-                            "sampledImageDepthSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
-                            "sampledImageStencilSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
-                            "storageImageSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT" ],
-                            "maxSampleMaskWords": 1,
-                            "timestampComputeAndGraphics": true,
-                            "timestampPeriod": 38.4615,
-                            "maxClipDistances": 0,
-                            "maxCullDistances": 0,
-                            "maxCombinedClipAndCullDistances": 0,
-                            "discreteQueuePriorities": 2,
-                            "pointSizeRange": [ 1.0, 1024.0 ],
-                            "lineWidthRange": [ 1.0, 1.0 ],
-                            "pointSizeGranularity": 0.0625,
-                            "strictLines": true,
-                            "nonCoherentAtomSize": 64
-                        }
+            "properties": {
+                "VkPhysicalDeviceProperties": {
+                    "limits": {
+                        "maxImageDimension1D": 16384,
+                        "maxImageDimension2D": 8192,
+                        "maxImageDimension3D": 4096,
+                        "maxImageDimensionCube": 8192,
+                        "maxImageArrayLayers": 256,
+                        "maxTexelBufferElements": 65536,
+                        "maxUniformBufferRange": 65536,
+                        "maxStorageBufferRange": 268435456,
+                        "maxPushConstantsSize": 128,
+                        "maxMemoryAllocationCount": 4294967295,
+                        "maxSamplerAllocationCount": 16384,
+                        "bufferImageGranularity": 4096,
+                        "maxBoundDescriptorSets": 4,
+                        "maxPerStageDescriptorSamplers": 128,
+                        "maxPerStageDescriptorUniformBuffers": 12,
+                        "maxPerStageDescriptorStorageBuffers": 35,
+                        "maxPerStageDescriptorSampledImages": 16,
+                        "maxPerStageDescriptorStorageImages": 8,
+                        "maxPerStageDescriptorInputAttachments": 4,
+                        "maxPerStageResources": 79,
+                        "maxDescriptorSetSamplers": 768,
+                        "maxDescriptorSetUniformBuffers": 72,
+                        "maxDescriptorSetUniformBuffersDynamic": 8,
+                        "maxDescriptorSetStorageBuffers": 72,
+                        "maxDescriptorSetStorageBuffersDynamic": 4,
+                        "maxDescriptorSetSampledImages": 96,
+                        "maxDescriptorSetStorageImages": 48,
+                        "maxDescriptorSetInputAttachments": 4,
+                        "maxVertexInputAttributes": 16,
+                        "maxVertexInputBindings": 16,
+                        "maxVertexInputAttributeOffset": 2047,
+                        "maxVertexInputBindingStride": 2048,
+                        "maxVertexOutputComponents": 128,
+                        "maxTessellationGenerationLevel": 64,
+                        "maxTessellationPatchSize": 32,
+                        "maxTessellationControlPerVertexInputComponents": 128,
+                        "maxTessellationControlPerVertexOutputComponents": 128,
+                        "maxTessellationControlPerPatchOutputComponents": 120,
+                        "maxTessellationControlTotalOutputComponents": 4096,
+                        "maxTessellationEvaluationInputComponents": 128,
+                        "maxTessellationEvaluationOutputComponents": 128,
+                        "maxFragmentInputComponents": 128,
+                        "maxFragmentOutputAttachments": 4,
+                        "maxFragmentDualSrcAttachments": 0,
+                        "maxFragmentCombinedOutputResources": 47,
+                        "maxComputeSharedMemorySize": 32768,
+                        "maxComputeWorkGroupCount": [ 65535, 65535, 65535 ],
+                        "maxComputeWorkGroupInvocations": 128,
+                        "maxComputeWorkGroupSize": [ 128, 128, 128 ],
+                        "subPixelPrecisionBits": 8,
+                        "subTexelPrecisionBits": 8,
+                        "mipmapPrecisionBits": 8,
+                        "maxDrawIndexedIndexValue": 4294967295,
+                        "maxDrawIndirectCount": 1,
+                        "maxSamplerLodBias": 15.9961,
+                        "maxSamplerAnisotropy": 1.0,
+                        "maxViewports": 1,
+                        "maxViewportDimensions": [ 8192, 8192 ],
+                        "viewportBoundsRange": [ -32768, 32767 ],
+                        "viewportSubPixelBits": 0,
+                        "minMemoryMapAlignment": 64,
+                        "minTexelBufferOffsetAlignment": 256,
+                        "minUniformBufferOffsetAlignment": 64,
+                        "minStorageBufferOffsetAlignment": 256,
+                        "minTexelOffset": -8,
+                        "maxTexelOffset": 7,
+                        "minTexelGatherOffset": -8,
+                        "maxTexelGatherOffset": 7,
+                        "minInterpolationOffset": -0.5,
+                        "maxInterpolationOffset": 0.5,
+                        "subPixelInterpolationOffsetBits": 4,
+                        "maxFramebufferWidth": 8192,
+                        "maxFramebufferHeight": 8192,
+                        "maxFramebufferLayers": 256,
+                        "framebufferColorSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
+                        "framebufferDepthSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
+                        "framebufferStencilSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
+                        "framebufferNoAttachmentsSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
+                        "maxColorAttachments": 4,
+                        "sampledImageColorSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
+                        "sampledImageIntegerSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT" ],
+                        "sampledImageDepthSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
+                        "sampledImageStencilSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT", "VK_SAMPLE_COUNT_4_BIT" ],
+                        "storageImageSampleCounts": [ "VK_SAMPLE_COUNT_1_BIT" ],
+                        "maxSampleMaskWords": 1,
+                        "timestampComputeAndGraphics": true,
+                        "timestampPeriod": 38.4615,
+                        "maxClipDistances": 0,
+                        "maxCullDistances": 0,
+                        "maxCombinedClipAndCullDistances": 0,
+                        "discreteQueuePriorities": 2,
+                        "pointSizeRange": [ 1.0, 1024.0 ],
+                        "lineWidthRange": [ 1.0, 1.0 ],
+                        "pointSizeGranularity": 0.0625,
+                        "strictLines": true,
+                        "nonCoherentAtomSize": 64
                     }
                 }
-            ],
+            },
             "formats": [
                 {
                     "VK_FORMAT_R8G8B8_UNORM": [