Annotate uniforms with descriptor set layout qualifiers

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

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index ad1a459d2e32932d9cb79a0501fb339b5ad6b7ba..fe6179b783ba27fc50fdb164e5e6ba30f3536832 100644 (file)
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -10,18 +10,18 @@ struct PbrMaterialParameters
        float roughness;
 };
 
-uniform PbrMaterial
+layout(set=1) uniform PbrMaterial
 {
        PbrMaterialParameters pbr_material;
        float alpha_cutoff;
 };
 
-uniform sampler2D base_color_map;
-uniform sampler2D metalness_map;
-uniform sampler2D roughness_map;
-uniform sampler2D occlusion_map;
-uniform sampler2D emission_map;
-uniform sampler2D fresnel_lookup;
+layout(set=1) uniform sampler2D base_color_map;
+layout(set=1) uniform sampler2D metalness_map;
+layout(set=1) uniform sampler2D roughness_map;
+layout(set=1) uniform sampler2D occlusion_map;
+layout(set=1) uniform sampler2D emission_map;
+layout(set=1) uniform sampler2D fresnel_lookup;
 
 layout(constant_id=auto) const bool use_base_color_map = false;
 layout(constant_id=auto) const bool use_metalness_map = false;