From 0e84eb35e2996801965f3f477359b4b0d782e59d Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Mon, 30 Jan 2023 20:12:04 -0600
Subject: [PATCH] nvk: Re-order Vulkan 1.0 feature bits

Also, leave TODO comments for anything we want to enable but haven't.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_physical_device.c | 43 +++++++++++++++---------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c
index 6577a30f526..718f624c85b 100644
--- a/src/nouveau/vulkan/nvk_physical_device.c
+++ b/src/nouveau/vulkan/nvk_physical_device.c
@@ -33,37 +33,50 @@ nvk_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice,
    pFeatures->features = (VkPhysicalDeviceFeatures) {
       .robustBufferAccess = true,
       .fullDrawIndexUint32 = true,
-      .independentBlend = true,
-      .logicOp = true,
-      .multiViewport = true,
-      .samplerAnisotropy = true,
-      .shaderClipDistance = true,
-      .shaderCullDistance = true,
-      .shaderResourceMinLod = true,
       .imageCubeArray = true,
+      .independentBlend = true,
+      /* TODO: geometryShader */
+      /* TODO: tessellationShader */
+      .sampleRateShading = true,
       .dualSrcBlend = true,
+      .logicOp = true,
       .multiDrawIndirect = true,
       .drawIndirectFirstInstance = true,
       .depthClamp = true,
       .depthBiasClamp = true,
       .fillModeNonSolid = true,
       .depthBounds = true,
-      .fragmentStoresAndAtomics = true,
-      .alphaToOne = true,
-      .occlusionQueryPrecise = true,
-      .pipelineStatisticsQuery = true,
-      .sampleRateShading = true,
-      .textureCompressionBC = true,
-      .vertexPipelineStoresAndAtomics = true,
       .wideLines = true,
       .largePoints = true,
-      /* More features */
+      .alphaToOne = true,
+      .multiViewport = true,
+      .samplerAnisotropy = true,
+      .textureCompressionETC2 = false,
+      .textureCompressionBC = true,
+      .textureCompressionASTC_LDR = false,
+      .occlusionQueryPrecise = true,
+      .pipelineStatisticsQuery = true,
+      .vertexPipelineStoresAndAtomics = true,
+      .fragmentStoresAndAtomics = true,
+      /* TODO: shaderTessellationAndGeometryPointSize */
       .shaderStorageImageExtendedFormats = true,
+      /* TODO: shaderStorageImageMultisample */
+      /* TODO: shaderStorageImageReadWithoutFormat */
       .shaderStorageImageWriteWithoutFormat = true,
       .shaderUniformBufferArrayDynamicIndexing = true,
       .shaderSampledImageArrayDynamicIndexing = true,
       .shaderStorageBufferArrayDynamicIndexing = true,
       .shaderStorageImageArrayDynamicIndexing = true,
+      .shaderClipDistance = true,
+      .shaderCullDistance = true,
+      /* TODO: shaderFloat64 */
+      /* TODO: shaderInt64 */
+      /* TODO: shaderInt16 */
+      /* TODO: shaderResourceResidency */
+      .shaderResourceMinLod = true,
+      /* TODO: sparseResidency* */
+      /* TODO: variableMultisampleRate */
+      /* TODO: inheritedQueries */
    };
 
    VkPhysicalDeviceVulkan11Features core_1_1 = {