Bump MATERIAL_VERSION to 69

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.68.5'
+    implementation 'com.google.android.filament:filament-android:1.69.0'
 }
 ```
 
@@ -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.68.5'
+pod 'Filament', '~> 1.69.0'
 ```
 
 ## Documentation

android/gradle.properties

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

filament/backend/src/opengl/ShaderCompilerService.cpp

@@ -1089,9 +1089,16 @@ UTILS_NOINLINE
 
 /* static */ std::string_view process_countBits(OpenGLContext& context) noexcept {
     using namespace std::literals;
+    // bitCount is available in GL 4.0 and GLES 3.1.
     if (context.isAtLeastGL<4, 0>() || context.isAtLeastGLES<3, 1>()) {
         return ""sv;
     }
+
+    // GLES 2.0 does not support bitwise operations or unsigned integers.
+    if (context.isES2()) {
+        return ""sv;
+    }
+
     return R"(
 // https://graphics.stanford.edu/%7Eseander/bithacks.html
 int bitCount(highp uint value) {

ios/CocoaPods/Filament.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "Filament"
-  spec.version = "1.68.5"
+  spec.version = "1.69.0"
   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.68.5/filament-v1.68.5-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.69.0/filament-v1.69.0-ios.tgz" }
 
   spec.libraries = 'c++'
 

libs/filabridge/include/filament/MaterialEnums.h

@@ -28,7 +28,7 @@
 namespace filament {
 
 // update this when a new version of filament wouldn't work with older materials
-static constexpr size_t MATERIAL_VERSION = 68;
+static constexpr size_t MATERIAL_VERSION = 69;
 
 // Those are the api levels that are used in the source material file (.mat)
 //

web/filament-js/package.json

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