reverting materials

materialsLibrary/src/cell/cell.fragment.fx

@@ -36,9 +36,6 @@ uniform vec2 vDiffuseInfos;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 // Custom
 vec3 computeCustomDiffuseLighting(lightingInfo info, vec3 diffuseBase, float shadow)
 {
@@ -149,7 +146,4 @@ void main(void)
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-	
 }

materialsLibrary/src/cell/cellMaterial.ts

@@ -31,8 +31,6 @@ class CellMaterialDefines extends MaterialDefines {
     public ALPHATEST = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public NORMAL = false;
     public UV1 = false;
     public UV2 = false;
@@ -137,9 +135,6 @@ export class CellMaterial extends PushMaterial {
         // Lights
         defines._needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, false, this._maxSimultaneousLights, this._disableLighting);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         // Values that need to be evaluated on every frame
         MaterialHelper.PrepareDefinesForFrameBoundValues(scene, engine, defines, useInstances ? true : false);
 

materialsLibrary/src/fire/fire.fragment.fx

@@ -32,9 +32,6 @@ varying vec2 vDistortionCoords3;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 vec4 bx2(vec4 x)
 {
    return vec4(2.0) * x - vec4(1.0);
@@ -100,7 +97,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/fire/fireMaterial.ts

@@ -33,8 +33,6 @@ class FireMaterialDefines extends MaterialDefines {
     public DEPTHPREPASS = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public UV1 = false;
     public VERTEXCOLOR = false;
     public VERTEXALPHA = false;
@@ -134,9 +132,6 @@ export class FireMaterial extends PushMaterial {
         // Values that need to be evaluated on every frame
         MaterialHelper.PrepareDefinesForFrameBoundValues(scene, engine, defines, useInstances ? true : false);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         // Attribs
         MaterialHelper.PrepareDefinesForAttributes(mesh, defines, false, true);
 

materialsLibrary/src/fur/fur.fragment.fx

@@ -45,9 +45,6 @@ varying vec2 vFurUV;
 #include<fogFragmentDeclaration>
 #include<clipPlaneFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 float Rand(vec3 rv) {
 	float x = dot(rv, vec3(12.9898,78.233, 24.65487));
 	return fract(sin(x) * 43758.5453);
@@ -133,7 +130,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/fur/furMaterial.ts

@@ -36,8 +36,6 @@ class FurMaterialDefines extends MaterialDefines {
     public DEPTHPREPASS = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public NORMAL = false;
     public UV1 = false;
     public UV2 = false;
@@ -210,9 +208,6 @@ export class FurMaterial extends PushMaterial {
         // Misc.
         MaterialHelper.PrepareDefinesForMisc(mesh, scene, false, this.pointsCloud, this.fogEnabled, this._shouldTurnAlphaTestOn(mesh), defines);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         // Lights
         defines._needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, false, this._maxSimultaneousLights, this._disableLighting);
 

materialsLibrary/src/gradient/gradient.fragment.fx

@@ -40,9 +40,6 @@ varying vec4 vColor;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 void main(void) {
 #include<clipPlaneFragment>
 
@@ -102,7 +99,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/gradient/gradientMaterial.ts

@@ -31,8 +31,6 @@ class GradientMaterialDefines extends MaterialDefines {
     public DEPTHPREPASS = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public NORMAL = false;
     public UV1 = false;
     public UV2 = false;
@@ -125,9 +123,6 @@ export class GradientMaterial extends PushMaterial {
 
         MaterialHelper.PrepareDefinesForMisc(mesh, scene, false, this.pointsCloud, this.fogEnabled, this._shouldTurnAlphaTestOn(mesh), defines);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         defines._needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, false, this._maxSimultaneousLights, this._disableLighting);
 
         defines.EMISSIVE = this._disableLighting;

materialsLibrary/src/grid/grid.fragment.fx

@@ -16,9 +16,6 @@ varying vec3 vNormal;
 
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 // Samplers
 #ifdef OPACITY
 varying vec2 vOpacityUV;
@@ -119,7 +116,4 @@ void main(void) {
     #endif
 #else    
 #endif
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/grid/gridMaterial.ts

@@ -20,8 +20,6 @@ class GridMaterialDefines extends MaterialDefines {
     public OPACITY = false;
     public TRANSPARENT = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public PREMULTIPLYALPHA = false;
     public UV1 = false;
     public UV2 = false;
@@ -160,9 +158,6 @@ export class GridMaterial extends PushMaterial {
 
         MaterialHelper.PrepareDefinesForMisc(mesh, scene, false, false, this.fogEnabled, false, defines);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         // Values that need to be evaluated on every frame
         MaterialHelper.PrepareDefinesForFrameBoundValues(scene, scene.getEngine(), defines, !!useInstances);
 

materialsLibrary/src/lava/lava.fragment.fx

@@ -51,8 +51,6 @@ uniform vec2 vDiffuseInfos;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
 
 float random( vec3 scale, float seed ){
     return fract( sin( dot( gl_FragCoord.xyz + seed, scale ) ) * 43758.5453 + seed ) ;
@@ -155,7 +153,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/lava/lavaMaterial.ts

@@ -32,8 +32,6 @@ class LavaMaterialDefines extends MaterialDefines {
     public DEPTHPREPASS = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public LIGHT0 = false;
     public LIGHT1 = false;
     public LIGHT2 = false;
@@ -197,9 +195,6 @@ export class LavaMaterial extends PushMaterial {
 
         MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, false, this._maxSimultaneousLights, this._disableLighting);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         // Values that need to be evaluated on every frame
         MaterialHelper.PrepareDefinesForFrameBoundValues(scene, engine, defines, useInstances ? true : false);
 

materialsLibrary/src/mix/mix.fragment.fx

@@ -67,9 +67,6 @@ uniform vec2 diffuse8Infos;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 void main(void) {
 	// Clip plane
 	#include<clipPlaneFragment>
@@ -167,7 +164,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/mix/mixMaterial.ts

@@ -33,8 +33,6 @@ class MixMaterialDefines extends MaterialDefines {
     public DEPTHPREPASS = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public SPECULARTERM = false;
     public NORMAL = false;
     public UV1 = false;
@@ -225,9 +223,6 @@ export class MixMaterial extends PushMaterial {
         // Lights
         defines._needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, false, this._maxSimultaneousLights, this._disableLighting);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         // Values that need to be evaluated on every frame
         MaterialHelper.PrepareDefinesForFrameBoundValues(scene, engine, defines, useInstances ? true : false);
 

materialsLibrary/src/normal/normal.fragment.fx

@@ -38,9 +38,6 @@ uniform vec2 vDiffuseInfos;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 void main(void) {
 #include<clipPlaneFragment>
 
@@ -100,7 +97,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/normal/normalMaterial.ts

@@ -32,8 +32,6 @@ class NormalMaterialDefines extends MaterialDefines {
     public DEPTHPREPASS = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public LIGHT0 = false;
     public LIGHT1 = false;
     public LIGHT2 = false;
@@ -171,9 +169,6 @@ export class NormalMaterial extends PushMaterial {
         defines._needNormals = true;
         MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, false, this._maxSimultaneousLights, this._disableLighting);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         // Values that need to be evaluated on every frame
         MaterialHelper.PrepareDefinesForFrameBoundValues(scene, engine, defines, useInstances ? true : false);
 

materialsLibrary/src/shadowOnly/shadowOnly.fragment.fx

@@ -26,9 +26,6 @@ varying vec3 vNormalW;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 void main(void) {
 #include<clipPlaneFragment>
 
@@ -55,7 +52,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/shadowOnly/shadowOnlyMaterial.ts

@@ -29,8 +29,6 @@ class ShadowOnlyMaterialDefines extends MaterialDefines {
     public CLIPPLANE6 = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public NORMAL = false;
     public NUM_BONE_INFLUENCERS = 0;
     public BonesPerMesh = 0;
@@ -125,9 +123,6 @@ export class ShadowOnlyMaterial extends PushMaterial {
 
         MaterialHelper.PrepareDefinesForMisc(mesh, scene, false, this.pointsCloud, this.fogEnabled, this._shouldTurnAlphaTestOn(mesh), defines);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         defines._needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, false, 1);
 
         const shadowGenerator = this._getFirstShadowLightForMesh(mesh)?.getShadowGenerator();

materialsLibrary/src/simple/simple.fragment.fx

@@ -36,9 +36,6 @@ uniform vec2 vDiffuseInfos;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 void main(void) {
 #include<clipPlaneFragment>
 
@@ -99,7 +96,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/simple/simpleMaterial.ts

@@ -32,8 +32,6 @@ class SimpleMaterialDefines extends MaterialDefines {
     public DEPTHPREPASS = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public NORMAL = false;
     public UV1 = false;
     public UV2 = false;
@@ -126,9 +124,6 @@ export class SimpleMaterial extends PushMaterial {
         // Lights
         defines._needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, false, this._maxSimultaneousLights, this._disableLighting);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         // Values that need to be evaluated on every frame
         MaterialHelper.PrepareDefinesForFrameBoundValues(scene, engine, defines, useInstances ? true : false);
 

materialsLibrary/src/sky/sky.fragment.fx

@@ -22,9 +22,6 @@ uniform vec3 sunPosition;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 // Constants
 const float e = 2.71828182845904523536028747135266249775724709369995957;
 const float pi = 3.141592653589793238462643383279502884197169;
@@ -171,7 +168,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/sky/skyMaterial.ts

@@ -27,8 +27,6 @@ class SkyMaterialDefines extends MaterialDefines {
     public CLIPPLANE6 = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public VERTEXCOLOR = false;
     public VERTEXALPHA = false;
 
@@ -181,9 +179,6 @@ export class SkyMaterial extends PushMaterial {
 
         MaterialHelper.PrepareDefinesForMisc(mesh, scene, false, this.pointsCloud, this.fogEnabled, false, defines);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         // Attribs
         MaterialHelper.PrepareDefinesForAttributes(mesh, defines, true, false);
 

materialsLibrary/src/terrain/terrain.fragment.fx

@@ -55,9 +55,6 @@ uniform sampler2D bump3Sampler;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 // Bump
 #ifdef BUMP
 #extension GL_OES_standard_derivatives : enable
@@ -183,7 +180,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/terrain/terrainMaterial.ts

@@ -34,8 +34,6 @@ class TerrainMaterialDefines extends MaterialDefines {
     public DEPTHPREPASS = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public SPECULARTERM = false;
     public NORMAL = false;
     public UV1 = false;
@@ -188,9 +186,6 @@ export class TerrainMaterial extends PushMaterial {
         // Lights
         defines._needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, false, this._maxSimultaneousLights, this._disableLighting);
 
-        // Deferred
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         // Values that need to be evaluated on every frame
         MaterialHelper.PrepareDefinesForFrameBoundValues(scene, engine, defines, useInstances ? true : false);
 

materialsLibrary/src/triPlanar/triPlanarMaterial.ts

@@ -40,8 +40,6 @@ class TriPlanarMaterialDefines extends MaterialDefines {
     public DEPTHPREPASS = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public SPECULARTERM = false;
     public NORMAL = false;
     public VERTEXCOLOR = false;

materialsLibrary/src/triPlanar/triplanar.fragment.fx

@@ -55,9 +55,6 @@ varying mat3 tangentSpace;
 #include<clipPlaneFragmentDeclaration>
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 void main(void) {
 	// Clip plane
 	#include<clipPlaneFragment>
@@ -150,7 +147,4 @@ void main(void) {
 #include<fogFragment>
 
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/water/water.fragment.fx

@@ -72,9 +72,6 @@ varying vec3 vPosition;
 // Fog
 #include<fogFragmentDeclaration>
 
-// Deferred
-#include<deferredDeclaration>[SCENE_MRT_COUNT]
-
 void main(void) {
 	// Clip plane
     #include<clipPlaneFragment>
@@ -255,7 +252,4 @@ vec4 color = vec4(finalDiffuse + finalSpecular, alpha);
 #endif
 	
 	gl_FragColor = color;
-
-#include<deferredDefaultOutput>
-
 }

materialsLibrary/src/water/waterMaterial.ts

@@ -40,8 +40,6 @@ class WaterMaterialDefines extends MaterialDefines implements IImageProcessingCo
     public DEPTHPREPASS = false;
     public POINTSIZE = false;
     public FOG = false;
-    public HIGH_DEFINITION_PIPELINE = false;
-    public SCENE_MRT_COUNT = 0;
     public NORMAL = false;
     public UV1 = false;
     public UV2 = false;
@@ -345,8 +343,6 @@ export class WaterMaterial extends PushMaterial {
 
         MaterialHelper.PrepareDefinesForMisc(mesh, scene, this._useLogarithmicDepth, this.pointsCloud, this.fogEnabled, this._shouldTurnAlphaTestOn(mesh), defines);
 
-        MaterialHelper.PrepareDefinesForDeferred(scene, defines);
-
         if (defines._areMiscDirty) {
             if (this._fresnelSeparate) {
                 defines.FRESNELSEPARATE = true;