Revert "Add workarounds for Mali-G72 GPU. (#3701)"

This reverts commit 2fb765f.
iTwin · May 31, 2022 · 48f0096 · 48f0096
1 parent 2fb765f
commit 48f0096
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 117 deletions.
diff --git a/common/changes/@itwin/webgl-compatibility/pmc-mali-g72-workaround_2022-05-30-15-45.json b/common/changes/@itwin/webgl-compatibility/pmc-mali-g72-workaround_2022-05-30-15-45.json
diff --git a/core/webgl-compatibility/src/Capabilities.ts b/core/webgl-compatibility/src/Capabilities.ts
@@ -76,7 +76,6 @@ const buggyIntelMatchers = [
 // Regexes to match Mali GPUs known to suffer from GraphicsDriverBugs.msaaWillHang.
 const buggyMaliMatchers = [
   /Mali-G71/,
-  /Mali-G72/,
   /Mali-G76/,
 ];
 
@@ -249,7 +248,6 @@ export class Capabilities {
     this._driverBugs = {};
     if (unmaskedRenderer && buggyIntelMatchers.some((x) => x.test(unmaskedRenderer)))
       this._driverBugs.fragDepthDoesNotDisableEarlyZ = true;
-
     if (unmaskedRenderer && buggyMaliMatchers.some((x) => x.test(unmaskedRenderer)))
       this._driverBugs.msaaWillHang = true;
 
@@ -296,8 +294,7 @@ export class Capabilities {
       && !ProcessDetector.isIOSBrowser
       // Samsung Galaxy Note 8 exhibits same issue as described above for iOS >= 15.
       // It uses specifically Mali-G71 MP20 but reports its renderer as follows.
-      // Samsung Galaxy A50 and S9 exhibits same issue; they use Mali-G72.
-      && unmaskedRenderer !== "Mali-G71" && unmaskedRenderer !== "Mali-G72";
+      && unmaskedRenderer !== "Mali-G71";
 
     if (allowFloatRender && undefined !== this.queryExtensionObject("EXT_float_blend") && this.isTextureRenderable(gl, gl.FLOAT)) {
       this._maxRenderType = RenderType.TextureFloat;

diff --git a/core/webgl-compatibility/src/test/Compatibility.test.ts b/core/webgl-compatibility/src/test/Compatibility.test.ts
@@ -217,18 +217,10 @@ describe("Render Compatibility", () => {
 
   it("detects MSAA hang bug", () => {
     const renderers = [
-<<<<<<< HEAD
       ["Mali-G71", true],
       ["Mali-G76", true],
       ["ANGLE (Intel HD Graphics 620 Direct3D11 vs_5_0 ps_5_0)", false],
       ["Mali-G79", false],
-=======
-      [ "Mali-G71", true ],
-      [ "Mali-G72", true ],
-      [ "Mali-G76", true ],
-      [ "ANGLE (Intel HD Graphics 620 Direct3D11 vs_5_0 ps_5_0)",  false ],
-      [ "Mali-G79", false ],
->>>>>>> 67881e02f2 (Add workarounds for Mali-G72 GPU. (#3701))
     ];
 
     for (const renderer of renderers) {

diff --git a/tools/internal/scripts/rush/audit.js b/tools/internal/scripts/rush/audit.js