Vulkan: Don't expose MSRTT on Mac/SwiftShader

include/platform/FeaturesVk.h

@@ -369,6 +369,13 @@ struct FeaturesVk : FeatureSetBase
         "force_max_uniform_buffer_size_16K", FeatureCategory::VulkanWorkarounds,
         "Force max uniform buffer size to 16K on some device due to bug", &members,
         "https://issuetracker.google.com/161903006"};
+
+    // Swiftshader on mac fails to initialize WebGL context when EXT_multisampled_render_to_texture
+    // is used by Chromium.
+    // http://anglebug.com/4937
+    Feature enableMultisampledRenderToTexture = {
+        "enable_multisampled_render_to_texture", FeatureCategory::VulkanWorkarounds,
+        "Expose EXT_multisampled_render_to_texture", &members, "http://anglebug.com/4937"};
 };
 
 inline FeaturesVk::FeaturesVk()  = default;

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -1628,7 +1628,7 @@ void RendererVk::initFeatures(DisplayVk *displayVk, const ExtensionNameList &dev
     bool isNvidia   = IsNvidia(mPhysicalDeviceProperties.vendorID);
     bool isQualcomm = IsQualcomm(mPhysicalDeviceProperties.vendorID);
     bool isARM      = IsARM(mPhysicalDeviceProperties.vendorID);
-    bool isSwS =
+    bool isSwiftShader =
         IsSwiftshader(mPhysicalDeviceProperties.vendorID, mPhysicalDeviceProperties.deviceID);
 
     if (mLineRasterizationFeatures.bresenhamLines == VK_TRUE)
@@ -1775,7 +1775,8 @@ void RendererVk::initFeatures(DisplayVk *displayVk, const ExtensionNameList &dev
     ANGLE_FEATURE_CONDITION(&mFeatures, bindEmptyForUnusedDescriptorSets,
                             IsAndroid() && isQualcomm);
 
-    ANGLE_FEATURE_CONDITION(&mFeatures, forceOldRewriteStructSamplers, IsAndroid() && !isSwS);
+    ANGLE_FEATURE_CONDITION(&mFeatures, forceOldRewriteStructSamplers,
+                            IsAndroid() && !isSwiftShader);
 
     ANGLE_FEATURE_CONDITION(&mFeatures, perFrameWindowSizeQuery,
                             isIntel || (IsWindows() && isAMD) || IsFuchsia() || isARM);
@@ -1845,6 +1846,9 @@ void RendererVk::initFeatures(DisplayVk *displayVk, const ExtensionNameList &dev
     bool isAdreno540 = mPhysicalDeviceProperties.deviceID == angle::kDeviceID_Adreno540;
     ANGLE_FEATURE_CONDITION(&mFeatures, forceMaxUniformBufferSize16KB, isQualcomm && isAdreno540);
 
+    ANGLE_FEATURE_CONDITION(&mFeatures, enableMultisampledRenderToTexture,
+                            !(IsApple() && isSwiftShader));
+
     angle::PlatformMethods *platform = ANGLEPlatformCurrent();
     platform->overrideFeaturesVk(platform, &mFeatures);
 

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -76,19 +76,21 @@ void RendererVk::ensureCapsInitialized() const
 
     // Enable this for simple buffer readback testing, but some functionality is missing.
     // TODO(jmadill): Support full mapBufferRange extension.
-    mNativeExtensions.mapBufferOES                 = true;
-    mNativeExtensions.mapBufferRange               = true;
-    mNativeExtensions.textureStorage               = true;
-    mNativeExtensions.drawBuffers                  = true;
-    mNativeExtensions.fragDepth                    = true;
-    mNativeExtensions.framebufferBlit              = true;
-    mNativeExtensions.framebufferMultisample       = true;
-    mNativeExtensions.multisampledRenderToTexture  = true;
-    mNativeExtensions.multisampledRenderToTexture2 = true;
-    mNativeExtensions.copyTexture                  = true;
-    mNativeExtensions.copyTexture3d                = true;
-    mNativeExtensions.copyCompressedTexture        = true;
-    mNativeExtensions.debugMarker                  = true;
+    mNativeExtensions.mapBufferOES           = true;
+    mNativeExtensions.mapBufferRange         = true;
+    mNativeExtensions.textureStorage         = true;
+    mNativeExtensions.drawBuffers            = true;
+    mNativeExtensions.fragDepth              = true;
+    mNativeExtensions.framebufferBlit        = true;
+    mNativeExtensions.framebufferMultisample = true;
+    mNativeExtensions.multisampledRenderToTexture =
+        getFeatures().enableMultisampledRenderToTexture.enabled;
+    mNativeExtensions.multisampledRenderToTexture2 =
+        getFeatures().enableMultisampledRenderToTexture.enabled;
+    mNativeExtensions.copyTexture           = true;
+    mNativeExtensions.copyTexture3d         = true;
+    mNativeExtensions.copyCompressedTexture = true;
+    mNativeExtensions.debugMarker           = true;
     mNativeExtensions.robustness =
         !IsSwiftshader(mPhysicalDeviceProperties.vendorID, mPhysicalDeviceProperties.deviceID) &&
         !IsARM(mPhysicalDeviceProperties.vendorID);