commit 46b2b005840869fc57a3f5de0edf9c76dfc9a264
author Brian Osman <brianosman@google.com> Fri Feb 07 12:03:13 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 07 17:36:58 2020 +0000
tree 887908d761a89bd0e38e25533b870c2801aad76e
parent d2e4de1c3310b87a4bae42c4967be7d5beb34de4

Fix bump3d use of sample()

Change-Id: I75d7a4bdbfb2a5d22b85bca0cae2975378b19a53
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269365
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

samplecode/Sample3D.cpp

diff --git a/samplecode/Sample3D.cpp b/samplecode/Sample3D.cpp
index 5bee8c2..a7b755b 100644
--- a/samplecode/Sample3D.cpp
+++ b/samplecode/Sample3D.cpp
@@ -556,7 +556,7 @@
             }
 
             void main(float x, float y, inout half4 color) {
-                float3 norm = convert_normal_sample(sample(normal_map));
+                float3 norm = convert_normal_sample(sample(normal_map, float2(x, y)));
                 float3 plane_norm = normalize(localToWorld * float4(norm, 0)).xyz;
 
                 float3 plane_pos = (localToWorld * float4(x, y, 0, 1)).xyz;
@@ -566,7 +566,7 @@
                 float dp = dot(plane_norm, light_dir);
                 float scale = min(ambient + max(dp, 0), 1);
 
-                color = sample(color_map) * half4(float4(scale, scale, scale, 1));
+                color = sample(color_map, float2(x, y)) * half4(float4(scale, scale, scale, 1));
             }
         )";
         auto [effect, error] = SkRuntimeEffect::Make(SkString(code));