Rearrange various uniforms to be declared in the file which uses them

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

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index c866058de4dbd0c6dd06fd7b28ad72c25f5b7c44..33035ee3fa03a0b5b703ef692e710baeac336f5f 100644 (file)
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -2,6 +2,25 @@ import msp_interface;
 import common;
 import shadow;
 
+struct PbrMaterialParameters
+{
+       vec4 base_color;
+       vec4 emission;
+       float metalness;
+       float roughness;
+};
+
+uniform PbrMaterial
+{
+       PbrMaterialParameters pbr_material;
+};
+
+uniform sampler2D base_color_map;
+uniform sampler2D metalness_map;
+uniform sampler2D roughness_map;
+uniform sampler2D occlusion_map;
+uniform sampler2D emission_map;
+
 layout(constant_id=auto) const bool use_base_color_map = false;
 layout(constant_id=auto) const bool use_metalness_map = false;
 layout(constant_id=auto) const bool use_roughness_map = false;