From 3294bb64a5bda2fc86cb8ce13ff9ea52257152fd Mon Sep 17 00:00:00 2001
From: Powei Feng <powei@google.com>
Date: Tue, 7 Oct 2025 11:50:34 -0700
Subject: [PATCH] Revert "Make matc workarounds default to NONE again" (#9295)

This reverts commit d11a6b4467ee3d1eefbc35e16f4da83d11df6540.

Breakage detailed in following bug

BUGS=449740720
---
 libs/filamat/include/filamat/MaterialBuilder.h    | 2 +-
 libs/filament-matp/include/filament-matp/Config.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/filamat/include/filamat/MaterialBuilder.h b/libs/filamat/include/filamat/MaterialBuilder.h
index e5a3876961..206326d824 100644
--- a/libs/filamat/include/filamat/MaterialBuilder.h
+++ b/libs/filamat/include/filamat/MaterialBuilder.h
@@ -146,7 +146,7 @@ protected:
     Platform mPlatform = Platform::DESKTOP;
     TargetApi mTargetApi = (TargetApi) 0;
     Optimization mOptimization = Optimization::PERFORMANCE;
-    Workarounds mWorkarounds = Workarounds::NONE;
+    Workarounds mWorkarounds = Workarounds::ALL;
     bool mPrintShaders = false;
     bool mSaveRawVariants = false;
     bool mGenerateDebugInfo = false;
diff --git a/libs/filament-matp/include/filament-matp/Config.h b/libs/filament-matp/include/filament-matp/Config.h
index b40e113d61..7a8f1941e5 100644
--- a/libs/filament-matp/include/filament-matp/Config.h
+++ b/libs/filament-matp/include/filament-matp/Config.h
@@ -171,7 +171,7 @@ protected:
     StringReplacementMap mTemplateMap;
     StringReplacementMap mMaterialParameters;
     filament::UserVariantFilterMask mVariantFilter = 0;
-    Workarounds mWorkarounds = Workarounds::NONE;
+    Workarounds mWorkarounds = Workarounds::ALL;
     bool mIncludeEssl1 = true;
 };