made point light shadows

src/core/SkShadowShader.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkReadBuffer.h"
 #include "SkShadowShader.h"
@@ skipping 279 matching lines @@
                 scaleVec.appendf("%d", i);
 
                 fragBuilder->codeAppendf("vec2 %s;", offset.c_str());
 
                 // note that we flip the y-coord of the offset and then later add
                 // a value just to the y-coord of povCoord. This is to account for
                 // the shifted origins from switching from raster into GPU.
                 if (shadowFP.fIsPointLight[i]) {
                     fragBuilder->codeAppendf("vec3 fragToLight%d = %s - worldCor;",
                                              i, lightDirOrPosUniName[i]);
-                    fragBuilder->codeAppendf("float distsq%d = dot(fragToLight%d, fragToLight%d);"
-                                             "fragToLight%d = normalize(fragToLight%d);",
-                                             i, i, i, i, i);
-                    fragBuilder->codeAppendf("%s = vec2(worldCor.x - %s.x, %s.y - worldCor.y) * "
-                                                  "povDepth.b;",
-                                             offset.c_str(), lightDirOrPosUniName[i],
-                                             lightDirOrPosUniName[i]);
+                    fragBuilder->codeAppendf("float distsq%d = dot(fragToLight%d, "
+                                                                  "fragToLight%d);",
+                                             i, i, i);
+                    fragBuilder->codeAppendf("%s = vec2(-fragToLight%d) * povDepth.b;",
+                                             offset.c_str(), i);
+                    fragBuilder->codeAppendf("fragToLight%d = normalize(fragToLight%d);",
+                                             i, i);
+

[robertphillips, 2016/09/06 17:51:11]

Where are the 0.375fs coming from ?

[vjiaoblack, 2016/09/06 19:30:32]

Done.

+                    fragBuilder->codeAppendf("vec2 %s = ((vec2(%s, %s) *"
+                                                     "vMatrixCoord_0_1_Stage0 +"
+                                                     "vec2(0,%s - %s)"
+                                                     "+ %s) / (vec2(%s, %s))) +"
+                                                     "vec2(0.375, -0.375);",
+                                             povCoord.c_str(),
+                                             widthUniName, heightUniName,
+                                             depthMapHeightUniName[i], heightUniName,
+                                             offset.c_str(),
+                                             depthMapWidthUniName[i], depthMapWidthUniName[i]);
                 } else {
                     fragBuilder->codeAppendf("%s = vec2(%s) * povDepth.b * vec2(255.0, -255.0);",
                                              offset.c_str(), lightDirOrPosUniName[i]);
+
+                    fragBuilder->codeAppendf("vec2 %s = ((vec2(%s, %s) *"
+                                                     "vMatrixCoord_0_1_Stage0 +"
+                                                     "vec2(0,%s - %s)"
+                                                     "+ %s) / vec2(%s, %s));",
+                                             povCoord.c_str(),
+                                             widthUniName, heightUniName,
+                                             depthMapHeightUniName[i], heightUniName,
+                                             offset.c_str(),
+                                             depthMapWidthUniName[i], depthMapWidthUniName[i]);
                 }
-                fragBuilder->codeAppendf("vec2 %s = (vec2(%s, %s) *"
-                                                    "vMatrixCoord_0_1_Stage0 +"
-                                                    "vec2(0,%s - %s)"
-                                                    " + "
-                                                    "%s) / vec2(%s, %s);",
-                                         povCoord.c_str(),
-                                         widthUniName, heightUniName,
-                                         depthMapHeightUniName[i], heightUniName,
-                                         offset.c_str(),
-                                         depthMapWidthUniName[i], depthMapHeightUniName[i]);
 
                 fragBuilder->appendTextureLookup(&depthMaps[i], args.fTexSamplers[i],
                                                  povCoord.c_str(),
                                                  kVec2f_GrSLType);
 
             }
 
             // helper variables for calculating shadowing
 
             // variance of depth at this fragment in the context of surrounding area
             // (area size and weighting dependent on blur size and type)
             fragBuilder->codeAppendf("float variance;");
 
             // the difference in depth between the user POV and light POV.
             fragBuilder->codeAppendf("float d;");
 
             // add up light contributions from all lights to totalLightColor
             for (int i = 0; i < numLights; i++) {
-                if (!shadowFP.isPointLight(i)) {
+                fragBuilder->codeAppendf("lightProbability = 1;");
+
+                // 1/512 == .00195... is less than half a pixel; imperceptible
+                fragBuilder->codeAppendf("if (%s.b <= %s.b + .001953125) {",
+                                         povDepth.c_str(), depthMaps[i].c_str());
+                if (blurAlgorithm == SkShadowParams::kVariance_ShadowType) {
+                    // We mess with depth and depth^2 in their given scales.
+                    // (i.e. between 0 and 1)
+                    fragBuilder->codeAppendf("vec2 moments%d = vec2(%s.b, %s.g);",
+                                             i, depthMaps[i].c_str(), depthMaps[i].c_str());
+
+                    // variance biasing lessens light bleeding
+                    fragBuilder->codeAppendf("variance = max(moments%d.y - "
+                                                            "(moments%d.x * moments%d.x),"
+                                                            "%s);", i, i, i,
+                                             minVarianceUniName);
+
+                    fragBuilder->codeAppendf("d = (%s.b) - moments%d.x;",
+                                             povDepth.c_str(), i);
+                    fragBuilder->codeAppendf("lightProbability = "
+                                                     "(variance / (variance + d * d));");
+
+                    SkString clamp("clamp");
+                    clamp.appendf("%d", i);
+
+                    // choosing between light artifacts or correct shape shadows
+                    // linstep
+                    fragBuilder->codeAppendf("float %s = clamp((lightProbability - %s) /"
+                                                              "(1 - %s), 0, 1);",
+                                             clamp.c_str(), shBiasUniName, shBiasUniName);
+
+                    fragBuilder->codeAppendf("lightProbability = %s;", clamp.c_str());
+                } else {
+                    fragBuilder->codeAppendf("if (%s.b >= %s.b) {",
+                                             povDepth.c_str(), depthMaps[i].c_str());
                     fragBuilder->codeAppendf("lightProbability = 1;");
+                    fragBuilder->codeAppendf("} else { lightProbability = 0; }");
+                }
 
-                    // 1/512 == .00195... is less than half a pixel; imperceptible
-                    fragBuilder->codeAppendf("if (%s.b <= %s.b + .001953125) {",
-                                             povDepth.c_str(), depthMaps[i].c_str());
-                    if (blurAlgorithm == SkShadowParams::kVariance_ShadowType) {
-                        // We mess with depth and depth^2 in their given scales.
-                        // (i.e. between 0 and 1)
-                        fragBuilder->codeAppendf("vec2 moments%d = vec2(%s.b, %s.g);",
-                                                 i, depthMaps[i].c_str(), depthMaps[i].c_str());
+                // VSM: The curved shadows near plane edges are artifacts from blurring
+                // lightDir.z is equal to the lightDir dot the surface normal.
+                fragBuilder->codeAppendf("}");
 
-                        // variance biasing lessens light bleeding
-                        fragBuilder->codeAppendf("variance = max(moments%d.y - "
-                                                                "(moments%d.x * moments%d.x),"
-                                                                "%s);", i, i, i,
-                                                 minVarianceUniName);
-
-                        fragBuilder->codeAppendf("d = (%s.b) - moments%d.x;",
-                                                 povDepth.c_str(), i);
-                        fragBuilder->codeAppendf("lightProbability = "
-                                                         "(variance / (variance + d * d));");
-
-                        SkString clamp("clamp");
-                        clamp.appendf("%d", i);
-
-                        // choosing between light artifacts or correct shape shadows
-                        // linstep
-                        fragBuilder->codeAppendf("float %s = clamp((lightProbability - %s) /"
-                                                                  "(1 - %s), 0, 1);",
-                                                 clamp.c_str(), shBiasUniName, shBiasUniName);
-
-                        fragBuilder->codeAppendf("lightProbability = %s;", clamp.c_str());
-                    } else {
-                        fragBuilder->codeAppendf("if (%s.b >= %s.b) {",
-                                                 povDepth.c_str(), depthMaps[i].c_str());
-                        fragBuilder->codeAppendf("lightProbability = 1;");
-                        fragBuilder->codeAppendf("} else { lightProbability = 0; }");
-                    }
-
-                    // VSM: The curved shadows near plane edges are artifacts from blurring
-                    fragBuilder->codeAppendf("}");
-                    fragBuilder->codeAppendf("totalLightColor += %s.z * %s * "
+                if (shadowFP.isPointLight(i)) {
+                    fragBuilder->codeAppendf("totalLightColor += max(fragToLight%d.z, 0) * %s /"
+                                                                "(1 + distsq%d) *"
                                                                 "lightProbability;",
+                                             i, lightColorUniName[i], i);
+                } else {
+                    fragBuilder->codeAppendf("totalLightColor += %s.z * %s * lightProbability;",
                                              lightDirOrPosUniName[i],
                                              lightColorUniName[i]);
-                } else {
-                    // fragToLight%d.z is equal to the fragToLight dot the surface normal.
-                    fragBuilder->codeAppendf("totalLightColor += max(fragToLight%d.z, 0) * %s /"
-                                                                "(1 + distsq%d);",
-                                             i, lightColorUniName[i], i);
                 }
             }
 
             fragBuilder->codeAppendf("totalLightColor += %s;", ambientColorUniName);
             fragBuilder->codeAppendf("%s = resultDiffuseColor * vec4(totalLightColor, 1);",
                                      args.fOutputColor);
         }
 
         static void GenKey(const GrProcessor& proc, const GrGLSLCaps&,
                            GrProcessorKeyBuilder* b) {
@@ skipping 489 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkShadowShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkShadowShaderImpl)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #endif