shaders: Reorder gbuffer render target outputs.

OpenXRay · Mar 24, 2016 · 63fb1a8 · 63fb1a8
1 parent 2407c94
commit 63fb1a8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/res/gamedata/shaders/gl/iostructs/p_bumped.h b/res/gamedata/shaders/gl/iostructs/p_bumped.h
@@ -1,9 +1,9 @@
 
 out vec4 SV_Target0;
-#ifndef GBUFFER_OPTIMIZATION
 out vec4 SV_Target1;
-#endif
+#ifndef GBUFFER_OPTIMIZATION
 out vec4 SV_Target2;
+#endif
 #ifdef EXTEND_F_DEFFER
 out int gl_SampleMask[];
 #endif
@@ -55,10 +55,12 @@ void main()
 #endif	//	MSAA_ALPHATEST_DX10_1_ATOC
 
 	SV_Target0 = O.position;
-#ifndef GBUFFER_OPTIMIZATION
+#ifdef GBUFFER_OPTIMIZATION
+	SV_Target1 = O.C;
+#else
 	SV_Target1 = O.Ne;
-#endif
 	SV_Target2 = O.C;
+#endif
 #ifdef EXTEND_F_DEFFER
 	gl_SampleMask[0] = O.mask;
 #endif

diff --git a/res/gamedata/shaders/gl/iostructs/p_flat.h b/res/gamedata/shaders/gl/iostructs/p_flat.h
@@ -1,9 +1,9 @@
 
 out vec4 SV_Target0;
-#ifndef GBUFFER_OPTIMIZATION
 out vec4 SV_Target1;
-#endif
+#ifndef GBUFFER_OPTIMIZATION
 out vec4 SV_Target2;
+#endif
 #ifdef EXTEND_F_DEFFER
 out int gl_SampleMask[];
 #endif
@@ -51,10 +51,12 @@ void main()
 #endif	//	MSAA_ALPHATEST_DX10_1_ATOC
 
 	SV_Target0 = O.position;
-#ifndef GBUFFER_OPTIMIZATION
+#ifdef GBUFFER_OPTIMIZATION
+	SV_Target1 = O.C;
+#else
 	SV_Target1 = O.Ne;
-#endif
 	SV_Target2 = O.C;
+#endif
 #ifdef EXTEND_F_DEFFER
 	gl_SampleMask[0] = O.mask;
 #endif

diff --git a/res/gamedata/shaders/gl/iostructs/p_particle_deffer.h b/res/gamedata/shaders/gl/iostructs/p_particle_deffer.h
@@ -1,9 +1,9 @@
 
 out vec4 SV_Target0;
-#ifndef GBUFFER_OPTIMIZATION
 out vec4 SV_Target1;
-#endif
+#ifndef GBUFFER_OPTIMIZATION
 out vec4 SV_Target2;
+#endif
 #ifdef EXTEND_F_DEFFER
 out int gl_SampleMask[];
 #endif
@@ -59,10 +59,12 @@ void main()
 #endif	//	MSAA_ALPHATEST_DX10_1_ATOC
 
 	SV_Target0 = O.position;
-#ifndef GBUFFER_OPTIMIZATION
+#ifdef GBUFFER_OPTIMIZATION
+	SV_Target1 = O.C;
+#else
 	SV_Target1 = O.Ne;
-#endif
 	SV_Target2 = O.C;
+#endif
 #ifdef EXTEND_F_DEFFER
 	gl_SampleMask[0] = O.mask;
 #endif