From 69bce622e925380e3d8ffe4533c51423a09e1c56 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Mon, 2 Dec 2024 13:59:01 -0600 Subject: [PATCH] nvk: Move Vulkan 1.4 properties to the 1.4 section Part-of: --- src/nouveau/vulkan/nvk_physical_device.c | 54 +++++++++--------------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 74a259d8ec0..b4c10f0e973 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -940,15 +940,33 @@ nvk_get_device_properties(const struct nvk_instance *instance, .maxBufferSize = NVK_MAX_BUFFER_SIZE, /* Vulkan 1.4 properties */ + .lineSubPixelPrecisionBits = 8, + .maxVertexAttribDivisor = UINT32_MAX, + .supportsNonZeroFirstInstance = true, + .maxPushDescriptors = NVK_MAX_PUSH_DESCRIPTORS, .dynamicRenderingLocalReadDepthStencilAttachments = true, .dynamicRenderingLocalReadMultisampledAttachments = true, + .earlyFragmentMultisampleCoverageAfterSampleCounting = true, + .earlyFragmentSampleMaskTestBeforeSampleCounting = true, + .depthStencilSwizzleOneSupport = true, + .polygonModePointSize = true, + .nonStrictSinglePixelWideLinesUseParallelogram = false, + .nonStrictWideLinesUseParallelogram = false, + .blockTexelViewCompatibleMultipleLayers = true, + .maxCombinedImageSamplerDescriptorCount = 3, + .fragmentShadingRateClampCombinerInputs = false, /* TODO */ + .defaultRobustnessStorageBuffers = + VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT, + .defaultRobustnessUniformBuffers = + VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT, + .defaultRobustnessVertexInputs = + VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT, + .defaultRobustnessImages = + VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2_EXT, /* VK_KHR_compute_shader_derivatives */ .meshAndTaskShaderDerivatives = false, - /* VK_KHR_push_descriptor */ - .maxPushDescriptors = NVK_MAX_PUSH_DESCRIPTORS, - /* VK_EXT_conservative_rasterization */ .primitiveOverestimationSize = info->cls_eng3d >= VOLTA_A ? 1.0f / 512.0f : 0.0, .maxExtraPrimitiveOverestimationSize = 0.75, @@ -1026,22 +1044,6 @@ nvk_get_device_properties(const struct nvk_instance *instance, .graphicsPipelineLibraryFastLinking = true, .graphicsPipelineLibraryIndependentInterpolationDecoration = true, - /* VK_KHR_line_rasterization */ - .lineSubPixelPrecisionBits = 8, - - /* VK_KHR_maintenance5 */ - .earlyFragmentMultisampleCoverageAfterSampleCounting = true, - .earlyFragmentSampleMaskTestBeforeSampleCounting = true, - .depthStencilSwizzleOneSupport = true, - .polygonModePointSize = true, - .nonStrictSinglePixelWideLinesUseParallelogram = false, - .nonStrictWideLinesUseParallelogram = false, - - /* VK_KHR_maintenance6 */ - .blockTexelViewCompatibleMultipleLayers = true, - .maxCombinedImageSamplerDescriptorCount = 3, - .fragmentShadingRateClampCombinerInputs = false, /* TODO */ - /* VK_KHR_maintenance7 */ .robustFragmentShadingRateAttachmentAccess = false, .separateDepthStencilAttachmentAccess = false, @@ -1070,16 +1072,6 @@ nvk_get_device_properties(const struct nvk_instance *instance, .pciDevice = info->pci.dev, .pciFunction = info->pci.func, - /* VK_EXT_pipeline_robustness */ - .defaultRobustnessStorageBuffers = - VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT, - .defaultRobustnessUniformBuffers = - VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DISABLED_EXT, - .defaultRobustnessVertexInputs = - VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT, - .defaultRobustnessImages = - VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2_EXT, - /* VK_EXT_physical_device_drm gets populated later */ /* VK_EXT_provoking_vertex */ @@ -1113,10 +1105,6 @@ nvk_get_device_properties(const struct nvk_instance *instance, .transformFeedbackRasterizationStreamSelect = true, .transformFeedbackDraw = true, - /* VK_KHR_vertex_attribute_divisor */ - .maxVertexAttribDivisor = UINT32_MAX, - .supportsNonZeroFirstInstance = true, - /* VK_KHR_fragment_shader_barycentric */ .triStripVertexOrderIndependentOfProvokingVertex = false,