X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tests%2Fglsl%2Fconstructors.glsl;h=9b878e49727c3dbf9ccc7e3d65668292ec35adfc;hb=4737d137d0a1c7fed868c4adc7a3d7e00ba7681c;hp=d10dacf51dce9a6a6f04be0f779a8eb9c82262ea;hpb=7b03ca83ca6c48b9f8c3f77c13760e7f87e9632d;p=libs%2Fgl.git diff --git a/tests/glsl/constructors.glsl b/tests/glsl/constructors.glsl index d10dacf5..9b878e49 100644 --- a/tests/glsl/constructors.glsl +++ b/tests/glsl/constructors.glsl @@ -41,18 +41,18 @@ void main() { mat3 normal_matrix = mat3(model[0].xyz, model[1].xyz, model[2].xyz); tbn_light_dir = mat3(normal_matrix*tangent, normal_matrix*binormal, normal_matrix*normal)*light_dir; - gl_Position = view_projection*model*vec4(position, float(1)); + gl_Position = view_projection*model*vec4(position, 1.0); _vs_out_texcoord = texcoord; } */ /* Expected output: fragment -layout(location=9) uniform sampler2D normalmap; +layout(location=9, binding=25) uniform sampler2D normalmap; layout(location=0) out vec4 frag_color; layout(location=1) in vec2 _vs_out_texcoord; layout(location=0) in vec3 tbn_light_dir; void main() { - frag_color = vec4(vec3(dot(vec3(texture(normalmap, _vs_out_texcoord).xyz)*2.0-1.0, normalize(tbn_light_dir))), float(1)); + frag_color = vec4(vec3(dot(vec3(texture(normalmap, _vs_out_texcoord).xyz)*2.0-1.0, normalize(tbn_light_dir))), 1.0); } */