Revert "Make matc workarounds default to NONE again" (#9295)

This reverts commit d11a6b4467.

Breakage detailed in following bug

BUGS=449740720

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.65.3'
+    implementation 'com.google.android.filament:filament-android:1.65.4'
 }
 ```
 
@@ -51,7 +51,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
 iOS projects can use CocoaPods to install the latest release:
 
 ```shell
-pod 'Filament', '~> 1.65.3'
+pod 'Filament', '~> 1.65.4'
 ```
 
 ## Documentation

android/gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.65.3
+VERSION_NAME=1.65.4
 
 POM_DESCRIPTION=Real-time physically based rendering engine for Android.
 

filament/src/MaterialParser.h

@@ -32,6 +32,7 @@
 #include <utils/FixedCapacityVector.h>
 
 #include <array>
+#include <optional>
 #include <tuple>
 #include <utility>
 

ios/CocoaPods/Filament.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "Filament"
-  spec.version = "1.65.3"
+  spec.version = "1.65.4"
   spec.license = { :type => "Apache 2.0", :file => "LICENSE" }
   spec.homepage = "https://google.github.io/filament"
   spec.authors = "Google LLC."
   spec.summary = "Filament is a real-time physically based rendering engine for Android, iOS, Windows, Linux, macOS, and WASM/WebGL."
   spec.platform = :ios, "11.0"
-  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.65.3/filament-v1.65.3-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.65.4/filament-v1.65.4-ios.tgz" }
 
   # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
   spec.pod_target_xcconfig = {

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;

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;
 };
 

web/filament-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "filament",
-  "version": "1.65.3",
+  "version": "1.65.4",
   "description": "Real-time physically based rendering engine",
   "main": "filament.js",
   "module": "filament.js",