Merge branch 'rc/1.12.7' into release

This reverts commit 2feb0ad325.

README.md

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

RELEASE_NOTES.md

@@ -3,7 +3,13 @@
 This file contains one line summaries of commits that are worthy of mentioning in release notes.
 A new header is inserted each time a *tag* is created.
 
-## v1.12.6 (currently main branch)
+## v1.12.8 (currently main branch)
+
+## v1.12.7
+
+- engine: Fix, apply emissive after shadowing.
+
+## v1.12.6
 
 - engine: Added concept of lod bias to materials.
   [⚠️ **Materials need to be rebuilt to access this new feature**].

android/gradle.properties

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

filament/src/Material.cpp

@@ -357,8 +357,7 @@ Handle<HwProgram> FMaterial::getProgramSlow(uint8_t variantKey) const noexcept {
     }
 }
 
-Handle<HwProgram> FMaterial::getSurfaceProgramSlow(uint8_t variantKey)
-    const noexcept {
+Handle<HwProgram> FMaterial::getSurfaceProgramSlow(uint8_t variantKey) const noexcept {
     // filterVariant() has already been applied in generateCommands(), shouldn't be needed here
     // if we're unlit, we don't have any bits that correspond to lit materials
     assert_invariant( variantKey == Variant::filterVariant(variantKey, isVariantLit()) );

filament/src/RenderPass.cpp

@@ -456,24 +456,24 @@ void RenderPass::generateCommandsImpl(uint32_t extraFlags,
 
             if (isDepthPass) {
                 FMaterial const* const ma = mi->getMaterial();
-                RasterState rs = ma->getRasterState();
+                const RasterState rs = ma->getRasterState();
+                const TransparencyMode mode = mi->getTransparencyMode();
+                const BlendingMode blendingMode = ma->getBlendingMode();
+                const bool translucent = (blendingMode != BlendingMode::OPAQUE
+                                          && blendingMode != BlendingMode::MASKED);
 
                 // unconditionally write the command
                 cmdDepth.primitive.primitiveHandle = primitive.getHwHandle();
                 cmdDepth.primitive.mi = mi;
                 cmdDepth.primitive.rasterState.culling = mi->getCullingMode();
-                *curr = cmdDepth;
 
-                BlendingMode blendingMode = ma->getBlendingMode();
-                bool translucent = (blendingMode != BlendingMode::OPAQUE && blendingMode != BlendingMode::MASKED);
-
-                // FIXME: should writeDepthForShadowCasters take precedence over rs.depthWrite?
-                bool issueDepth = (rs.depthWrite
+                // FIXME: should writeDepthForShadowCasters take precedence over mi->getDepthWrite()?
+                cmdDepth.primitive.rasterState.depthWrite = (1 // only keep bit 0
+                        & (mi->getDepthWrite() | (mode == TransparencyMode::TWO_PASSES_ONE_SIDE))
                         & !(depthFilterTranslucentObjects & translucent)
                         & !(depthFilterAlphaMaskedObjects & rs.alphaToCoverage))
-                                | writeDepthForShadowCasters;
-
-                curr->key |= select(!issueDepth);
+                            | writeDepthForShadowCasters;
+                *curr = cmdDepth;
 
                 // handle the case where this primitive is empty / no-op
                 curr->key |= select(primitive.getPrimitiveType() == PrimitiveType::NONE);

ios/CocoaPods/Filament.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "Filament"
-  spec.version = "1.12.6"
+  spec.version = "1.12.7"
   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.12.6/filament-v1.12.6-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.12.7/filament-v1.12.7-ios.tgz" }
 
   # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
   spec.pod_target_xcconfig = {

shaders/src/shading_unlit.fs

@@ -37,8 +37,6 @@ vec4 evaluateMaterial(const MaterialInputs material) {
     }
 #endif
 
-    addEmissive(material, color);
-
 #if defined(HAS_DIRECTIONAL_LIGHTING)
 #if defined(HAS_SHADOWING)
     float visibility = 1.0;
@@ -62,5 +60,7 @@ vec4 evaluateMaterial(const MaterialInputs material) {
     color = vec4(0.0);
 #endif
 
+    addEmissive(material, color);
+
     return color;
 }

web/filament-js/package.json

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