Disable/revert recent refection changes.

PiperOrigin-RevId: 963586393
Change-Id: I65449cfcae4d50664f87296fa69d1660adf60c91

src/render/filament/assets/phong_2d_reflect.mat

@@ -15,7 +15,6 @@
 material {
     name : phong_2d_reflect,
     shadingModel : specularGlossiness,
-    postLightingBlending : add,
     flipUV : false,
     parameters : [
         { type : float4, name : BaseColorFactor },
@@ -52,12 +51,8 @@ fragment {
     material.emissive      = vec4(
         materialParams.BaseColorFactor.rgb * materialParams.EmissiveFactor, 0.0);
 
-    // The reflection is radiance arriving from the mirror direction, so it is
+    // Apply reflection.
-    // weighted by the Fresnel term and added after lighting. Reflectance is
-    // the reflectivity at normal incidence; grazing angles approach a mirror.
     vec4 reflection = texture(materialParams_Reflection, screen_uv);
-    float f0 = materialParams.Reflectance;
+    material.baseColor.rgb = mix(material.baseColor.rgb, reflection.rgb, materialParams.Reflectance);
-    float fresnel = f0 + (1.0 - f0) * pow(1.0 - getNdotV(), 5.0);
-    material.postLightingColor = vec4(reflection.rgb * fresnel, 0.0);
   }
 }

src/render/filament/assets/phong_2d_uv_reflect.mat

@@ -15,7 +15,6 @@
 material {
     name : phong_2d_uv_reflect,
     shadingModel : specularGlossiness,
-    postLightingBlending : add,
     flipUV : false,
     parameters : [
         { type : float4, name : BaseColorFactor },
@@ -44,12 +43,8 @@ fragment {
     material.emissive      = vec4(
         materialParams.BaseColorFactor.rgb * materialParams.EmissiveFactor, 0.0);
 
-    // The reflection is radiance arriving from the mirror direction, so it is
+    // Apply reflection.
-    // weighted by the Fresnel term and added after lighting. Reflectance is
-    // the reflectivity at normal incidence; grazing angles approach a mirror.
     vec4 reflection = texture(materialParams_Reflection, screen_uv);
-    float f0 = materialParams.Reflectance;
+    material.baseColor.rgb = mix(material.baseColor.rgb, reflection.rgb, materialParams.Reflectance);
-    float fresnel = f0 + (1.0 - f0) * pow(1.0 - getNdotV(), 5.0);
-    material.postLightingColor = vec4(reflection.rgb * fresnel, 0.0);
   }
 }

src/render/filament/assets/phong_color_reflect.mat

@@ -15,7 +15,6 @@
 material {
     name : phong_color_reflect,
     shadingModel : specularGlossiness,
-    postLightingBlending : add,
     parameters : [
         { type : float4, name : BaseColorFactor },
         { type : float, name : SpecularFactor },
@@ -37,12 +36,8 @@ fragment {
     material.emissive      = vec4(
         materialParams.BaseColorFactor.rgb * materialParams.EmissiveFactor, 0.0);
 
-    // The reflection is radiance arriving from the mirror direction, so it is
+    // Apply reflection.
-    // weighted by the Fresnel term and added after lighting. Reflectance is
-    // the reflectivity at normal incidence; grazing angles approach a mirror.
     vec4 reflection = texture(materialParams_Reflection, screen_uv);
-    float f0 = materialParams.Reflectance;
+    material.baseColor.rgb = mix(material.baseColor.rgb, reflection.rgb, materialParams.Reflectance);
-    float fresnel = f0 + (1.0 - f0) * pow(1.0 - getNdotV(), 5.0);
-    material.postLightingColor = vec4(reflection.rgb * fresnel, 0.0);
   }
 }

src/render/filament/assets/phong_cube_reflect.mat

@@ -15,7 +15,6 @@
 material {
     name : phong_cube_reflect,
     shadingModel : specularGlossiness,
-    postLightingBlending : add,
     flipUV : false,
     parameters : [
         { type : float4, name : BaseColorFactor },
@@ -51,12 +50,8 @@ fragment {
     material.emissive      = vec4(
         materialParams.BaseColorFactor.rgb * materialParams.EmissiveFactor, 0.0);
 
-    // The reflection is radiance arriving from the mirror direction, so it is
+    // Apply reflection.
-    // weighted by the Fresnel term and added after lighting. Reflectance is
-    // the reflectivity at normal incidence; grazing angles approach a mirror.
     vec4 reflection = texture(materialParams_Reflection, screen_uv);
-    float f0 = materialParams.Reflectance;
+    material.baseColor.rgb = mix(material.baseColor.rgb, reflection.rgb, materialParams.Reflectance);
-    float fresnel = f0 + (1.0 - f0) * pow(1.0 - getNdotV(), 5.0);
-    material.postLightingColor = vec4(reflection.rgb * fresnel, 0.0);
   }
 }

src/render/filament/core/material_manager.cc

@@ -133,40 +133,30 @@ MaterialManager::MaterialType MaterialManager::GetMaterialType(
   } else if (material.orm_texture) {
     if (material.opacity_texture) {
       return ObjectManager::kPbrPackedTransparent;
-    } else if (material.reflectance > 0) {
-      return ObjectManager::kPbrPackedReflect;
     } else {
       return ObjectManager::kPbrPacked;
     }
   } else if (material.metallic_texture) {
     if (material.opacity_texture) {
       return ObjectManager::kPbrPackedTransparent;
-    } else if (material.reflectance > 0) {
-      return ObjectManager::kPbrReflect;
     } else {
       return ObjectManager::kPbr;
     }
   } else if (material.roughness_texture) {
     if (material.color[3] < 1.0f) {
       return ObjectManager::kPbrTransparent;
-    } else if (material.reflectance > 0) {
-      return ObjectManager::kPbrReflect;
     } else {
       return ObjectManager::kPbr;
     }
   } else if (material.metallic >= 0) {
     if (material.color[3] < 1.0f) {
       return ObjectManager::kPbrTransparent;
-    } else if (material.reflectance > 0) {
-      return ObjectManager::kPbrReflect;
     } else {
       return ObjectManager::kPbr;
     }
   } else if (material.roughness >= 0) {
     if (material.color[3] < 1.0f) {
       return ObjectManager::kPbrTransparent;
-    } else if (material.reflectance > 0) {
-      return ObjectManager::kPbrReflect;
     } else {
       return ObjectManager::kPbr;
     }