Fix some errors in the shader library

[libs/gl.git] / shaderlib / msp_interface.glsl

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index b1b887ea68a92b3f11a308d0895e503473cf8f61..1c3029ef343cbddb9a295951864300f9ac627b56 100644 (file)
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -14,6 +14,14 @@ struct BasicMaterialParameters
        float reflectivity;
 };
 
+struct PbrMaterialParameters
+{
+       vec4 base_color;
+       vec4 emission;
+       float metalness;
+       float roughness;
+};
+
 struct ClipPlane
 {
        vec4 equation;
@@ -32,6 +40,11 @@ uniform BasicMaterial
        BasicMaterialParameters basic_material;
 };
 
+uniform PbrMaterial
+{
+       PbrMaterialParameters pbr_material;
+};
+
 uniform Lighting
 {
        // Declared as an array for compatibility reasons
@@ -47,6 +60,11 @@ uniform Lighting
 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;
 
@@ -57,13 +75,13 @@ uniform ShadowMap
        mat4 shd_eye_matrix;
 };
 
-uniform samplerCube environment;
+uniform samplerCube environment_map;
 uniform EnvMap
 {
        mat3 env_eye_matrix;
 };
 
-const int max_clip_planes = 0;
+layout(constant_id=auto) const int max_clip_planes = 0;
 uniform Clipping
 {
        ClipPlane clip_planes[max_clip_planes];