X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=shaderlib%2Fphong.glsl;h=28e9e5007be0af9c7e706353d2a67c16ea965ab2;hp=234897116183a4997c625687447b65172ef8036d;hb=a741acd5c501c03de5181656498d2bcbe0df9157;hpb=542c01f2798ad38279b043011a5bf1d1b975eb07 diff --git a/shaderlib/phong.glsl b/shaderlib/phong.glsl index 23489711..28e9e500 100644 --- a/shaderlib/phong.glsl +++ b/shaderlib/phong.glsl @@ -11,17 +11,17 @@ struct BasicMaterialParameters float reflectivity; }; -uniform BasicMaterial +layout(set=1) uniform BasicMaterial { BasicMaterialParameters basic_material; float alpha_cutoff; }; -uniform sampler2D diffuse_map; -uniform sampler2D specular_map; -uniform sampler2D shininess_map; -uniform sampler2D emission_map; -uniform sampler2D reflectivity_map; +layout(set=1) uniform sampler2D diffuse_map; +layout(set=1) uniform sampler2D specular_map; +layout(set=1) uniform sampler2D shininess_map; +layout(set=1) uniform sampler2D emission_map; +layout(set=1) uniform sampler2D reflectivity_map; layout(constant_id=auto) const bool use_diffuse_map = false; layout(constant_id=auto) const bool use_specular = false;