X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;h=724538ffb95a84e6cbf69775b2c0e6f0664bc428;hb=4571472425ca75573895c96f590ba12dedbed661;hp=d8de5d240b90f6c416cac9a7b7cc37a361debe1c;hpb=adc26a2e141a2853b6c5025130c46a46cece4b84;p=libs%2Fgl.git diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl index d8de5d24..724538ff 100644 --- a/shaderlib/msp_interface.glsl +++ b/shaderlib/msp_interface.glsl @@ -3,11 +3,7 @@ struct LightSourceParameters vec4 position; vec3 color; int type; -}; - -struct ClipPlane -{ - vec4 equation; + vec3 attenuation; }; uniform mat4 world_obj_matrix; @@ -20,7 +16,7 @@ uniform CameraTransform mat4 eye_clip_matrix; }; -layout(constant_id=auto) const int max_lights = 4; +const int max_lights = 6; uniform Lighting { LightSourceParameters light_sources[max_lights]; @@ -29,13 +25,6 @@ uniform Lighting float fog_density; }; -layout(constant_id=auto) const bool use_clipping = false; -layout(constant_id=auto) const int max_clip_planes = 8; -uniform Clipping -{ - ClipPlane clip_planes[max_clip_planes]; -}; - #pragma MSP stage(vertex) layout(location=0) in vec4 vertex; layout(location=1) in vec4 color; @@ -48,6 +37,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;