Vulkan: Fix line width caps.

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -459,6 +459,8 @@ angle::Result RendererVk::initialize(vk::Context *context,
     ChoosePhysicalDevice(physicalDevices, enableMockICD, &mPhysicalDevice,
                          &mPhysicalDeviceProperties);
 
+    vkGetPhysicalDeviceFeatures(mPhysicalDevice, &mPhysicalDeviceFeatures);
+
     // Ensure we can find a graphics queue family.
     uint32_t queueCount = 0;
     vkGetPhysicalDeviceQueueFamilyProperties(mPhysicalDevice, &queueCount, nullptr);
@@ -693,8 +695,8 @@ void RendererVk::ensureCapsInitialized() const
 {
     if (!mCapsInitialized)
     {
-        vk::GenerateCaps(mPhysicalDeviceProperties, mNativeTextureCaps, &mNativeCaps,
-                         &mNativeExtensions, &mNativeLimitations);
+        vk::GenerateCaps(mPhysicalDeviceProperties, mPhysicalDeviceFeatures, mNativeTextureCaps,
+                         &mNativeCaps, &mNativeExtensions, &mNativeLimitations);
         mCapsInitialized = true;
     }
 }

src/libANGLE/renderer/vulkan/RendererVk.h

@@ -165,6 +165,7 @@ class RendererVk : angle::NonCopyable
     VkDebugReportCallbackEXT mDebugReportCallback;
     VkPhysicalDevice mPhysicalDevice;
     VkPhysicalDeviceProperties mPhysicalDeviceProperties;
+    VkPhysicalDeviceFeatures mPhysicalDeviceFeatures;
     std::vector<VkQueueFamilyProperties> mQueueFamilyProperties;
     VkQueue mQueue;
     uint32_t mCurrentQueueFamilyIndex;

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -30,6 +30,7 @@ namespace vk
 {
 
 void GenerateCaps(const VkPhysicalDeviceProperties &physicalDeviceProperties,
+                  const VkPhysicalDeviceFeatures &physicalDeviceFeatures,
                   const gl::TextureCapsMap &textureCaps,
                   gl::Caps *outCaps,
                   gl::Extensions *outExtensions,
@@ -58,8 +59,10 @@ void GenerateCaps(const VkPhysicalDeviceProperties &physicalDeviceProperties,
     outCaps->minAliasedPointSize =
         std::max(1.0f, physicalDeviceProperties.limits.pointSizeRange[0]);
     outCaps->maxAliasedPointSize   = physicalDeviceProperties.limits.pointSizeRange[1];
-    outCaps->minAliasedLineWidth   = physicalDeviceProperties.limits.lineWidthRange[0];
-    outCaps->maxAliasedLineWidth   = physicalDeviceProperties.limits.lineWidthRange[1];
+
+    outCaps->minAliasedLineWidth = 1.0f;
+    outCaps->maxAliasedLineWidth = 1.0f;
+
     outCaps->maxDrawBuffers =
         std::min<uint32_t>(physicalDeviceProperties.limits.maxColorAttachments,
                            physicalDeviceProperties.limits.maxFragmentOutputAttachments);

src/libANGLE/renderer/vulkan/vk_caps_utils.h

@@ -33,6 +33,7 @@ class DisplayVk;
 namespace vk
 {
 void GenerateCaps(const VkPhysicalDeviceProperties &physicalDeviceProperties,
+                  const VkPhysicalDeviceFeatures &physicalDeviceFeatures,
                   const gl::TextureCapsMap &textureCaps,
                   gl::Caps *outCaps,
                   gl::Extensions *outExtensions,

src/tests/deqp_support/deqp_gles2_test_expectations.txt

@@ -235,12 +235,6 @@
 // Vulkan failures
 2598 VULKAN : dEQP-GLES2.functional.rasterization.primitives.line* = SKIP
 2599 VULKAN : dEQP-GLES2.functional.rasterization.limits.points = SKIP
-2598 VULKAN : dEQP-GLES2.functional.clipping.line.wide_line_z_clip = SKIP
-2598 VULKAN : dEQP-GLES2.functional.clipping.line.wide_line_z_clip_viewport_center = SKIP
-2598 VULKAN : dEQP-GLES2.functional.clipping.line.wide_line_z_clip_viewport_corner = SKIP
-2598 VULKAN : dEQP-GLES2.functional.clipping.line.wide_line_clip = SKIP
-2598 VULKAN : dEQP-GLES2.functional.clipping.line.long_wide_line_clip = SKIP
-2598 VULKAN : dEQP-GLES2.functional.clipping.line.wide_line_attrib_clip = SKIP
 
 // Vulkan AMD Windows specific failures
 2602 VULKAN WIN AMD : dEQP-GLES2.functional.buffer.write.* = SKIP