From: Mikko Rasa Date: Sat, 24 Apr 2021 11:45:32 +0000 (+0300) Subject: Don't use "sample" as variable name in GLSL X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=1e3b07299f798983ee0b861121a65ca2e8c8830a;p=libs%2Fgl.git Don't use "sample" as variable name in GLSL In later versions it's a keyword. --- diff --git a/builtin_data/_ambientocclusion_combine.glsl b/builtin_data/_ambientocclusion_combine.glsl index 88929066..2e9f75fc 100644 --- a/builtin_data/_ambientocclusion_combine.glsl +++ b/builtin_data/_ambientocclusion_combine.glsl @@ -15,11 +15,11 @@ void main() vec2 offset = vec2(float(i), float(j))-1.5; vec2 sample_coord = texcoord+offset*tex_scale; float occ = texture(occlusion, sample_coord).r; - float sample = texture(depth, sample_coord).r; + float sample_depth = texture(depth, sample_coord).r; float z_range = occlusion_radius*length(offset)*edge_depth_threshold; float min_depth = project(vec3(center.xy, center.z+z_range)).z; float max_depth = project(vec3(center.xy, center.z-z_range)).z; - if(sample>=min_depth && sample<=max_depth) + if(sample_depth>=min_depth && sample_depth<=max_depth) { sum += occ; count += 1.0; diff --git a/builtin_data/_ambientocclusion_occlude.glsl b/builtin_data/_ambientocclusion_occlude.glsl index 260f1efa..62fd153b 100644 --- a/builtin_data/_ambientocclusion_occlude.glsl +++ b/builtin_data/_ambientocclusion_occlude.glsl @@ -14,10 +14,10 @@ void main() for(int i=0; i=min_depth) + float sample_depth = texture(depth, psp.xy*0.5+0.5).r; + if(sample_depth>=min_depth) { - if(sample