Move the frag_color output from msp_interface to common

This allows creating shaders without a fragment stage which use the
interface.

diff --git a/builtin_data/_occluder.glsl b/builtin_data/_occluder.glsl
index 488d4120609c44a907426dffc4258234a5a98a78..b8846c47707df93bcd853d7ffc87f2e191635ce4 100644 (file)
--- a/builtin_data/_occluder.glsl
+++ b/builtin_data/_occluder.glsl
@@ -4,8 +4,3 @@ void main()
 {
        gl_Position = clip_eye_matrix*eye_world_matrix*world_obj_matrix*vertex;
 }
-#pragma MSP stage(fragment)
-void main()
-{
-       frag_color = vec4(1.0);
-}

diff --git a/builtin_data/_sky_backdrop.glsl b/builtin_data/_sky_backdrop.glsl
index fa28663c65282b573950c4d4249a208a8fe5c49b..fa8f1be5b31d32678d287f70a29c37e4cffea509 100644 (file)
--- a/builtin_data/_sky_backdrop.glsl
+++ b/builtin_data/_sky_backdrop.glsl
@@ -13,6 +13,7 @@ void main()
 }
 
 #pragma MSP stage(fragment)
+layout(location=0) out vec4 frag_color;
 void main()
 {
        vec3 nview = normalize(view_dir.xyz);

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index 33fefe8806deb4ddfa7240c5394f1778f082d1c1..03cfd5af7c62a610a815a031c64abf5f7a4f6772 100644 (file)
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -77,6 +77,8 @@ struct IncomingLight
        vec3 color;
 };
 
+layout(location=0) out vec4 frag_color;
+
 virtual vec3 get_fragment_normal()
 {
        if(use_normal_map)

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index b0f8a410cfce832dadc737b918f77017b3242d08..3fdd606b1b51f70585fc9fd619133b13e63a46b3 100644 (file)
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -49,6 +49,3 @@ layout(location=7) in vec4 texcoord1;
 layout(location=8) in vec4 texcoord2;
 layout(location=9) in vec4 texcoord3;
 layout(location=13) in vec4 instance_transform[3];
-
-#pragma MSP stage(fragment)
-layout(location=0) out vec4 frag_color;