Invert back-compat logic

vanruesc · vanruesc · commit dcaf7101d838 · 2023-07-01T13:17:51.000+02:00
diff --git a/src/materials/GodRaysMaterial.js b/src/materials/GodRaysMaterial.js
@@ -1,5 +1,4 @@
 import { NoBlending, ShaderMaterial, Uniform } from "three";
-import { updateFragmentShader } from "../utils";
 
 import fragmentShader from "./glsl/convolution.god-rays.frag";
 import vertexShader from "./glsl/common.vert";
@@ -51,8 +50,6 @@ export class GodRaysMaterial extends ShaderMaterial {
 			vertexShader
 		});
 
-		this.fragmentShader = updateFragmentShader(this.fragmentShader);
-
 	}
 
 	/**
diff --git a/src/materials/glsl/convolution.downsampling.frag b/src/materials/glsl/convolution.downsampling.frag
@@ -76,6 +76,6 @@ void main() {
 	c += WEIGHT_OUTER * texture2D(inputBuffer, vUv);
 	gl_FragColor = c;
 
-	#include <encodings_fragment>
+	#include <colorspace_fragment>
 
 }
diff --git a/src/materials/glsl/convolution.gaussian.frag b/src/materials/glsl/convolution.gaussian.frag
@@ -28,6 +28,6 @@ void main() {
 
 	gl_FragColor = result;
 
-	#include <encodings_fragment>
+	#include <colorspace_fragment>
 
 }
diff --git a/src/materials/glsl/convolution.kawase.frag b/src/materials/glsl/convolution.kawase.frag
@@ -21,6 +21,6 @@ void main() {
 	sum += texture2D(inputBuffer, vUv3); // Bottom left
 	gl_FragColor = sum * 0.25; // Compute the average
 
-	#include <encodings_fragment>
+	#include <colorspace_fragment>
 
 }
diff --git a/src/materials/glsl/convolution.tilt-shift.frag b/src/materials/glsl/convolution.tilt-shift.frag
@@ -30,6 +30,6 @@ void main() {
 	sum += texture2D(inputBuffer, vec2(vUv.x - dUv.x, vUv.y - dUv.y)); // Bottom left
 	gl_FragColor = sum * 0.25; // Compute the average
 
-	#include <encodings_fragment>
+	#include <colorspace_fragment>
 
 }
diff --git a/src/materials/glsl/convolution.upsampling.frag b/src/materials/glsl/convolution.upsampling.frag
@@ -39,6 +39,6 @@ void main() {
 	vec4 baseColor = texture2D(supportBuffer, vUv);
 	gl_FragColor = mix(baseColor, c, radius);
 
-	#include <encodings_fragment>
+	#include <colorspace_fragment>
 
 }
diff --git a/src/materials/glsl/copy.frag b/src/materials/glsl/copy.frag
@@ -20,7 +20,7 @@ void main() {
 	vec4 texel = texture2D(inputBuffer, vUv);
 	gl_FragColor = opacity * texel;
 
-	#include <encodings_fragment>
+	#include <colorspace_fragment>
 	#include <dithering_fragment>
 
 }
diff --git a/src/materials/glsl/effect.frag b/src/materials/glsl/effect.frag
@@ -143,7 +143,7 @@ void main() {
 
 	#ifdef ENCODE_OUTPUT
 
-		#include <encodings_fragment>
+		#include <colorspace_fragment>
 
 	#endif
 
diff --git a/src/utils/BackCompat.js b/src/utils/BackCompat.js
@@ -103,11 +103,11 @@ export function copyTextureColorSpace(src, dest) {
  * @ignore
  */
 
-export function updateFragmentShader(fragmentShader, vertexShader) {
+export function updateFragmentShader(fragmentShader) {
 
-	if(revision >= 154) {
+	if(revision < 154) {
 
-		return fragmentShader.replace("encodings_fragment", "colorspace_fragment");
+		return fragmentShader.replace("colorspace_fragment", "encodings_fragment");
 
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,6 @@ void main() {`
`76`	`76`	`c += WEIGHT_OUTER * texture2D(inputBuffer, vUv);`
`77`	`77`	`gl_FragColor = c;`
`78`	`78`
`79`		`- #include <encodings_fragment>`
	`79`	`+ #include <colorspace_fragment>`
`80`	`80`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ void main() {`
`28`	`28`
`29`	`29`	`gl_FragColor = result;`
`30`	`30`
`31`		`- #include <encodings_fragment>`
	`31`	`+ #include <colorspace_fragment>`
`32`	`32`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ void main() {`
`21`	`21`	`sum += texture2D(inputBuffer, vUv3); // Bottom left`
`22`	`22`	`gl_FragColor = sum * 0.25; // Compute the average`
`23`	`23`
`24`		`- #include <encodings_fragment>`
	`24`	`+ #include <colorspace_fragment>`
`25`	`25`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ void main() {`
`30`	`30`	`sum += texture2D(inputBuffer, vec2(vUv.x - dUv.x, vUv.y - dUv.y)); // Bottom left`
`31`	`31`	`gl_FragColor = sum * 0.25; // Compute the average`
`32`	`32`
`33`		`- #include <encodings_fragment>`
	`33`	`+ #include <colorspace_fragment>`
`34`	`34`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@ void main() {`
`39`	`39`	`vec4 baseColor = texture2D(supportBuffer, vUv);`
`40`	`40`	`gl_FragColor = mix(baseColor, c, radius);`
`41`	`41`
`42`		`- #include <encodings_fragment>`
	`42`	`+ #include <colorspace_fragment>`
`43`	`43`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ void main() {`
`20`	`20`	`vec4 texel = texture2D(inputBuffer, vUv);`
`21`	`21`	`gl_FragColor = opacity * texel;`
`22`	`22`
`23`		`- #include <encodings_fragment>`
	`23`	`+ #include <colorspace_fragment>`
`24`	`24`	`#include <dithering_fragment>`
`25`	`25`
`26`	`26`	`}`