Ticket #2111: fix-hqdof-error.patch

binaries/data/mods/public/shaders/effects/postproc/HQDOF.xml

@@ -5 +5 @@
         <pass shader="glsl/hqdof">
             <define name="manualdof" value="true"/>
 
-            <define name="focalLength" value="1000"/>
-            <define name="fstop" value="200"/>
+            <define name="focalLength" value="1000.0"/>
+            <define name="fstop" value="200.0"/>
+            <define name="showFocus" value="false"/>
 
             <define name="samples" value="3"/>
             <define name="rings" value="3"/>
@@ -16 +17 @@
             <define name="fdofstart" value="30.0"/>
             <define name="fdofdist" value="40.0"/>
 
-            <define name="maxblur" value="2"/>
+            <define name="maxblur" value="2.0"/>
 
             <define name="threshold" value="0.9"/>
             <define name="gain" value="2.0"/>

binaries/data/mods/public/shaders/glsl/hqdof.fs

@@ -66 +66 @@
 uniform float focalDepth;  //focal distance value in meters, but you may use autofocus option below
 //uniform float focalLength = 1000; //focal length in mm
 //uniform float fstop = 200; //f-stop value
-uniform bool showFocus = false; //show debug focus point and focal range (red = focal point, green = focal range)
+//uniform bool showFocus = false; //show debug focus point and focal range (red = focal point, green = focal range)
 
 /*
 make sure that these two values are the same for your camera, otherwise distances will be wrong.
@@ -119 +119 @@
 float bdepth(vec2 coords, float blursize) //blurring depth
 {
     float d = 0.0;
-    float div = 0;
+    float div = 0.0;
     float kernel[9];
     vec2 offset[9];
 
@@ -218 +218 @@
         float b = (a-fdofstart)/fdofdist; //far DoF
         float c = (-a-ndofstart)/ndofdist; //near Dof
         blur = (a>0.0)?b:c;
-        blur /= max((fDepth / 15) - 7, 1);
+        blur /= max((fDepth / 15.0) - 7.0, 1.0);
     }
     else
     {
@@ -233 +233 @@
         blur = abs(a-b)*c;
     }
 
-    return clamp(blur, 0, 1);
+    return clamp(blur, 0.0, 1.0);
 }
 
 varying vec2 v_tex;
@@ -279 +279 @@
     float h2 = texel.y*maxblur+noise.y;
 
     // calculation of final color
-    vec3 color = texture2D(renderedTex, v_tex).rgb;
-    vec3 samplecolor = color;
+    vec3 samplecolor = texture2D(renderedTex, v_tex).rgb;
     float samplediv = 1.0;
 
     int ringsamples;
@@ -288 +287 @@
     for (int i = 1; i <= rings; i += 1)
     {
         ringsamples = i * samples;
-        float step = PI*2.0 / ringsamples;
+        float step = PI*2.0 / float(ringsamples);
 
         for (int j = 0; j < ringsamples; j += 1)
         {
             // find sample coordinates
-            float pw = (cos(j*step)*i);
-            float ph = (sin(j*step)*i);
+            float pw = (cos(float(j)*step)*float(i));
+            float ph = (sin(float(j)*step)*float(i));
 
             vec2 samplecoord = v_tex + vec2(pw*w,ph*h);
 
             // set this sample's color and count
-            vec3 samplecoloradd = color(samplecoord,blur)*mix(1.0,i/rings,bias);
-            float sampledivadd = mix(1.0,i/rings,bias);
+            vec3 samplecoloradd = color(samplecoord,blur)*mix(1.0,float(i)/float(rings),bias);
+            float sampledivadd = mix(1.0,float(i)/float(rings),bias);
 
             // begin performance-unfriendly (but nice-looking) removal of fully-focused foreground samples
             if (foregroundcleanup)
             {
                 float sampledepth = linearize(texture2D(depthTex, samplecoord).x);
-                int depthweight = (sampledepth > depth) ? 1 : 0;
+                float depthweight = (sampledepth > depth) ? 1.0 : 0.0;
                 float sampleblur = bluramount(sampledepth, fDepth);
 
-                float weight = clamp(depthweight + sampleblur, 0, 1);
+                float weight = clamp(depthweight + sampleblur, 0.0, 1.0);
                 samplecoloradd *= weight;
                 sampledivadd *= weight;
             }
@@ -323 +322 @@
         #ifdef BLURONSHARPCHECK
         for (int k = j; k < ringsamples * 2; k += 1)
         {
-            float pw = (cos(k*step)*i);
-            float ph = (sin(k*step)*i);
+            float pw = (cos(float(k)*step)*float(i));
+            float ph = (sin(float(k)*step)*float(i));
 
             vec2 samplecoord = v_tex + vec2(pw*w2,ph*h2);
 
             float sampledepth = linearize(texture2D(depthTex, samplecoord).x);
-            int depthweight = (sampledepth > depth) ? 0 : 1;
+            float depthweight = (sampledepth > depth) ? 0.0 : 1.0;
             float sampleblur = bluramount(sampledepth, fDepth);
 
-            vec3 coladd = color(samplecoord,sampleblur)*mix(1.0,i/rings,bias);
-            float sadd = mix(1.0,i/rings,bias);
+            vec3 coladd = color(samplecoord,sampleblur)*mix(1.0,float(i)/float(rings),bias);
+            float sadd = mix(1.0,float(i)/float(rings),bias);
 
-            float weight = (sampleblur > blur) ? clamp(depthweight * (0.2 - blur) * (float(k) / ringsamples / 2) * sampleblur, 0, 1) : 0.0;
+            float weight = (sampleblur > blur) ? clamp(depthweight * (0.2 - blur) * (float(k) / float(ringsamples) / 2.0) * sampleblur, 0.0, 1.0) : 0.0;
             coladd *= weight;
             sadd *= weight;