X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;h=724538ffb95a84e6cbf69775b2c0e6f0664bc428;hb=caa1348f9478fcd834a1fdcbafed7cccf6b582e2;hp=b0f8a410cfce832dadc737b918f77017b3242d08;hpb=f501ffe2862fd8b4c5793542190e8e0a0d8de667;p=libs%2Fgl.git diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl index b0f8a410..724538ff 100644 --- a/shaderlib/msp_interface.glsl +++ b/shaderlib/msp_interface.glsl @@ -6,11 +6,6 @@ struct LightSourceParameters vec3 attenuation; }; -struct ClipPlane -{ - vec4 equation; -}; - uniform mat4 world_obj_matrix; uniform mat3 world_obj_normal_matrix; uniform CameraTransform @@ -21,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]; @@ -30,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; @@ -49,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;