X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;h=c4b27b1137e7d77886c15ee510ad0697478a3ff8;hb=615f1717f32064a7adb2b848e8646c2c3cf11f61;hp=2458b97d6b2d08e36de81c6e3f2397b32c930aa8;hpb=68b74ce23dd20822b07d79dc25aa0a0a19ef27a5;p=libs%2Fgl.git diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl index 2458b97d..c4b27b11 100644 --- a/shaderlib/msp_interface.glsl +++ b/shaderlib/msp_interface.glsl @@ -1,8 +1,7 @@ struct LightSourceParameters { vec4 position; - vec4 diffuse; - vec4 specular; + vec3 color; }; struct ClipPlane @@ -30,7 +29,8 @@ uniform Lighting float fog_density; }; -layout(constant_id=auto) const int max_clip_planes = 0; +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]; @@ -41,11 +41,12 @@ layout(location=0) in vec4 vertex; layout(location=1) in vec4 color; layout(location=2) in vec3 normal; layout(location=3) in vec3 tangent; -layout(location=4) in vec3 binormal; -layout(location=7) in vec4 texcoord; -layout(location=8) in vec4 texcoord1; -layout(location=9) in vec4 texcoord2; -layout(location=10) in vec4 texcoord3; +layout(location=4) in vec4 group; +layout(location=5) in vec4 weight; +layout(location=6) in vec4 texcoord; +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)