Fix matc variantFilter

RELEASE_NOTES.md

@@ -5,13 +5,15 @@ A new header is inserted each time a *tag* is created.
 
 ## main branch
 
-- backend: add support for GGP platform
-- gltfio: calculate primitive's AABB correctly. 
-- gltfio: fix glTF breaking issue
+- gltfio: calculate primitive's AABB correctly.
 - gltfio: recompute bounding boxes with morph targets
-- engine: primitives with `CullingMode::FRONT_AND_BACK` are now skipped.
 - engine: add missing getters on `MaterialInstance`
 
+## v1.28.3
+
+- backend: add support for GGP platform
+- engine: primitives with `CullingMode::FRONT_AND_BACK` are now skipped.
+
 ## v1.28.2
 
 - gltfio: support EXT_meshopt_compression

libs/filabridge/include/filament/MaterialEnums.h

@@ -232,14 +232,15 @@ enum class Property : uint8_t {
     // when adding new Properties, make sure to update MATERIAL_PROPERTIES_COUNT
 };
 
+// These flags should match the equivalents in Variant.h.
 enum class UserVariantFilterBit : uint32_t {
     DIRECTIONAL_LIGHTING        = 0x01,
     DYNAMIC_LIGHTING            = 0x02,
     SHADOW_RECEIVER             = 0x04,
     SKINNING                    = 0x08,
-    FOG                         = 0x10,
-    VSM                         = 0x20,
-    SSR                         = 0x40,
+    FOG                         = 0x20,
+    VSM                         = 0x40,
+    SSR                         = VSM | SHADOW_RECEIVER,
 };
 
 using UserVariantFilterMask = uint32_t;

libs/utils/CMakeLists.txt

@@ -13,7 +13,6 @@ file(GLOB_RECURSE PUBLIC_HDRS ${PUBLIC_HDR_DIR}/${TARGET}/*.h)
 
 set(DIST_HDRS
         ${PUBLIC_HDR_DIR}/${TARGET}/algorithm.h
-        ${PUBLIC_HDR_DIR}/${TARGET}/architecture.h
         ${PUBLIC_HDR_DIR}/${TARGET}/bitset.h
         ${PUBLIC_HDR_DIR}/${TARGET}/CallStack.h
         ${PUBLIC_HDR_DIR}/${TARGET}/debug.h
@@ -27,7 +26,6 @@ set(DIST_HDRS
         ${PUBLIC_HDR_DIR}/${TARGET}/EntityManager.h
         ${PUBLIC_HDR_DIR}/${TARGET}/FixedCapacityVector.h
         ${PUBLIC_HDR_DIR}/${TARGET}/Invocable.h
-        ${PUBLIC_HDR_DIR}/${TARGET}/JobSystem.h
         ${PUBLIC_HDR_DIR}/${TARGET}/Log.h
         ${PUBLIC_HDR_DIR}/${TARGET}/memalign.h
         ${PUBLIC_HDR_DIR}/${TARGET}/Mutex.h
@@ -42,7 +40,6 @@ set(DIST_HDRS
         ${PUBLIC_HDR_DIR}/${TARGET}/SpinLock.h
         ${PUBLIC_HDR_DIR}/${TARGET}/StructureOfArrays.h
         ${PUBLIC_HDR_DIR}/${TARGET}/unwindows.h
-        ${PUBLIC_HDR_DIR}/${TARGET}/WorkStealingDequeue.h
 )
 
 # Use our custom mutex/condition only on ANDROID
@@ -52,7 +49,6 @@ set(DIST_ANDROID_HDRS
 
 set(DIST_GENERIC_HDRS
         ${PUBLIC_HDR_DIR}/${TARGET_GENERIC}/Mutex.h
-        ${PUBLIC_HDR_DIR}/${TARGET_GENERIC}/Condition.h
 )
 
 set(SRCS