Revert "Environment BRDF chunks (playcanvas#3126)" (playcanvas#3141)

slimbuck · web-flow · commit 798ad5e441ac · 2021-05-05T09:09:10.000+01:00
This reverts commit 3250ac8.
diff --git a/src/graphics/program-lib/chunks/chunks.js b/src/graphics/program-lib/chunks/chunks.js
@@ -41,8 +41,6 @@ import dpAtlasQuadPS from './dpAtlasQuad.frag';
 import emissivePS from './emissive.frag';
 import endPS from './end.frag';
 import endVS from './end.vert';
-import envBrdfNonePS from './envBrdfNone.frag';
-import envBrdfApproxPS from './envBrdfApprox.frag';
 import envConstPS from './envConst.frag';
 import envMultiplyPS from './envMultiply.frag';
 import extensionPS from './extension.frag';
@@ -250,8 +248,6 @@ var shaderChunks = {
     emissivePS: emissivePS,
     endPS: endPS,
     endVS: endVS,
-    envBrdfApproxPS: envBrdfApproxPS,
-    envBrdfNonePS: envBrdfNonePS,
     envConstPS: envConstPS,
     envMultiplyPS: envMultiplyPS,
     extensionPS: extensionPS,
diff --git a/src/graphics/program-lib/chunks/envBrdfApprox.frag b/src/graphics/program-lib/chunks/envBrdfApprox.frag
diff --git a/src/graphics/program-lib/chunks/envBrdfNone.frag b/src/graphics/program-lib/chunks/envBrdfNone.frag
diff --git a/src/graphics/program-lib/chunks/reflectionCC.frag b/src/graphics/program-lib/chunks/reflectionCC.frag
@@ -2,6 +2,6 @@
 uniform float material_clearCoatReflectivity;
 
 void addReflectionCC() {
-    ccReflection += vec4(envBrdf(calcReflection(ccReflDirW, ccGlossiness), ccGlossiness, ccNormalW), material_clearCoatReflectivity);
+    ccReflection += vec4(calcReflection(ccReflDirW, ccGlossiness), material_clearCoatReflectivity);
 }
 #endif
diff --git a/src/graphics/program-lib/chunks/reflectionPrefilteredCube.frag b/src/graphics/program-lib/chunks/reflectionPrefilteredCube.frag
@@ -50,6 +50,6 @@ vec3 calcReflection(vec3 tReflDirW, float tGlossiness) {
     return processEnvironment($DECODE(cubeFinal).rgb);
 }
 
-void addReflection() {
-    dReflection += vec4(envBrdf(calcReflection(dReflDirW, dGlossiness), dGlossiness, dNormalW), material_reflectivity);
+void addReflection() {   
+    dReflection += vec4(calcReflection(dReflDirW, dGlossiness), material_reflectivity);
 }
diff --git a/src/graphics/program-lib/chunks/reflectionPrefilteredCubeLod.frag b/src/graphics/program-lib/chunks/reflectionPrefilteredCubeLod.frag
@@ -17,5 +17,5 @@ vec3 calcReflection(vec3 tReflDirW, float tGlossiness) {
 }
 
 void addReflection() {   
-    dReflection += vec4(envBrdf(calcReflection(dReflDirW, dGlossiness), dGlossiness, dNormalW), material_reflectivity);
+    dReflection += vec4(calcReflection(dReflDirW, dGlossiness), material_reflectivity);
 }
diff --git a/src/graphics/program-lib/programs/standard.js b/src/graphics/program-lib/programs/standard.js
@@ -1243,11 +1243,6 @@ var standard = {
             code += scode;
         } else if (cubemapReflection) {
             if (options.prefilteredCubemap) {
-                if (options.useMetalness) {
-                    code += chunks.envBrdfApproxPS;
-                } else {
-                    code += chunks.envBrdfNonePS;
-                }
                 if (useTexCubeLod) {
                     code += chunks.reflectionPrefilteredCubeLodPS.replace(/\$DECODE/g, reflectionDecode);
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`uniform float material_clearCoatReflectivity;`
`3`	`3`
`4`	`4`	`void addReflectionCC() {`
`5`		`- ccReflection += vec4(envBrdf(calcReflection(ccReflDirW, ccGlossiness), ccGlossiness, ccNormalW), material_clearCoatReflectivity);`
	`5`	`+ ccReflection += vec4(calcReflection(ccReflDirW, ccGlossiness), material_clearCoatReflectivity);`
`6`	`6`	`}`
`7`	`7`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@ vec3 calcReflection(vec3 tReflDirW, float tGlossiness) {`
`50`	`50`	`return processEnvironment($DECODE(cubeFinal).rgb);`
`51`	`51`	`}`
`52`	`52`
`53`		`-void addReflection() {`
`54`		`- dReflection += vec4(envBrdf(calcReflection(dReflDirW, dGlossiness), dGlossiness, dNormalW), material_reflectivity);`
	`53`	`+void addReflection() {`
	`54`	`+ dReflection += vec4(calcReflection(dReflDirW, dGlossiness), material_reflectivity);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@ vec3 calcReflection(vec3 tReflDirW, float tGlossiness) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`void addReflection() {`
`20`		`- dReflection += vec4(envBrdf(calcReflection(dReflDirW, dGlossiness), dGlossiness, dNormalW), material_reflectivity);`
	`20`	`+ dReflection += vec4(calcReflection(dReflDirW, dGlossiness), material_reflectivity);`
`21`	`21`	`}`