X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=shaderlib%2Fmsp_interface.glsl;fp=shaderlib%2Fmsp_interface.glsl;h=e20e36dd555014087999c0ef86324f7f68b6a222;hp=1c3029ef343cbddb9a295951864300f9ac627b56;hb=a3c33df71e507380100069ad7ef802b61de351bb;hpb=532b877ac54969ca186b12b05baa483625e3f5d0

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 1c3029ef..e20e36dd 100644
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -5,23 +5,6 @@ struct LightSourceParameters
 	vec4 specular;
 };
 
-struct BasicMaterialParameters
-{
-	vec4 diffuse;
-	vec4 specular;
-	vec4 emission;
-	float shininess;
-	float reflectivity;
-};
-
-struct PbrMaterialParameters
-{
-	vec4 base_color;
-	vec4 emission;
-	float metalness;
-	float roughness;
-};
-
 struct ClipPlane
 {
 	vec4 equation;
@@ -35,16 +18,6 @@ uniform Transform
 	mat4 projection_matrix;
 };
 
-uniform BasicMaterial
-{
-	BasicMaterialParameters basic_material;
-};
-
-uniform PbrMaterial
-{
-	PbrMaterialParameters pbr_material;
-};
-
 uniform Lighting
 {
 	// Declared as an array for compatibility reasons
@@ -57,30 +30,6 @@ uniform Lighting
 	float fog_density;
 };
 
-uniform sampler2D diffuse_map;
-uniform sampler2D specular_map;
-uniform sampler2D shininess_map;
-uniform sampler2D reflectivity_map;
-uniform sampler2D base_color_map;
-uniform sampler2D metalness_map;
-uniform sampler2D roughness_map;
-uniform sampler2D occlusion_map;
-uniform sampler2D emission_map;
-uniform sampler2D normal_map;
-
-uniform sampler2DShadow shadow_map;
-uniform ShadowMap
-{
-	float shadow_darkness;
-	mat4 shd_eye_matrix;
-};
-
-uniform samplerCube environment_map;
-uniform EnvMap
-{
-	mat3 env_eye_matrix;
-};
-
 layout(constant_id=auto) const int max_clip_planes = 0;
 uniform Clipping
 {