Disabling multisampled_render_to_texture extension if renderer is ADRENO.

Skia roll breaking for: Test-Win10-MSVC-LenovoYogaC630-GPU-Adreno630-arm64-Debug-All-ANGLE. Bug: angleproject:4007 Change-Id: I5ba1047540c02d27e05425b7af347207500b3682 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1863741 Commit-Queue: Mingyu Hu <mihu@microsoft.com> Commit-Queue: Rafael Cintron <rafael.cintron@microsoft.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Disabling multisampled_render_to_texture extension if renderer is ADRENO.
a0b064d0 · Mingyu Hu · Commit Bot · 9a334fda · a0b064d0 · a0b064d0
Commit a0b064d0 authored Oct 15, 2019 by Mingyu Hu Committed by Commit Bot Oct 16, 2019
3 changed files
--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
@@ -3834,8 +3834,8 @@ void Renderer11::generateCaps(gl::Caps *outCaps,
                              gl::Extensions *outExtensions,
                              gl::Limitations *outLimitations) const
 {
-    d3d11_gl::GenerateCaps(mDevice, mDeviceContext, mRenderer11DeviceCaps, getFeatures(), outCaps,
+    d3d11_gl::GenerateCaps(mDevice, mDeviceContext, mRenderer11DeviceCaps, getFeatures(),
-                           outTextureCaps, outExtensions, outLimitations);
+                           mDescription, outCaps, outTextureCaps, outExtensions, outLimitations);
 }
 void Renderer11::initializeFeatures(angle::FeaturesD3D *features) const

--- a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
@@ -1387,6 +1387,7 @@ void GenerateCaps(ID3D11Device *device,
                  ID3D11DeviceContext *deviceContext,
                  const Renderer11DeviceCaps &renderer11DeviceCaps,
                  const angle::FeaturesD3D &features,
+                  const char *description,
                  gl::Caps *caps,
                  gl::TextureCapsMap *textureCapsMap,
                  gl::Extensions *extensions,
@@ -1659,7 +1660,10 @@ void GenerateCaps(ID3D11Device *device,
    extensions->maxDualSourceDrawBuffers    = 1;
    extensions->texture3DOES                = true;
    extensions->baseVertexBaseInstance      = true;
-    extensions->multisampledRenderToTexture = true;
+    if (!strstr(description, "Adreno"))
+    {
+        extensions->multisampledRenderToTexture = true;
+    }
    // D3D11 cannot support reading depth texture as a luminance texture.
    // It treats it as a red-channel-only texture.

--- a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
+++ b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.h
@@ -75,6 +75,7 @@ void GenerateCaps(ID3D11Device *device,
                  ID3D11DeviceContext *deviceContext,
                  const Renderer11DeviceCaps &renderer11DeviceCaps,
                  const angle::FeaturesD3D &features,
+                  const char *description,
                  gl::Caps *caps,
                  gl::TextureCapsMap *textureCapsMap,
                  gl::Extensions *extensions,