Merge branch 'main' into bdero/waitios

Author: bdero

DEPS

@@ -48,7 +48,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '5606c2c7e1fcfeaeb5566be383fa5f5b6152e385',
+  'dart_revision': '69867ba60bb7c3d0125777b3e2bf7c7775c18fc9',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -386,7 +386,7 @@ deps = {
    Var('dart_git') + '/json_rpc_2.git@0280ac6cb4f3905d81c47ba927123ba2b95f7940',
 
   'src/third_party/dart/third_party/pkg/linter':
-   Var('dart_git') + '/linter.git@9a586c9deeb53177a02b37807b0f792893092cae',
+   Var('dart_git') + '/linter.git@e80471506fa05b097a2657e46a033effb81d975a',
 
   'src/third_party/dart/third_party/pkg/logging':
    Var('dart_git') + '/logging.git@abef3717d958158eb8b0ddb2871f4b15a9804cd4',
@@ -832,7 +832,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'A7rAmHDuuQ89yV9FwX5LxcOXcTlyT1jOG20DFGDxTdoC'
+        'version': 'mxMrU7aA6avJRQ9qfTDwpXNMWV9uB15MvWw5Cj3hC7kC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -842,7 +842,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'whJeWVcM-8gVZRdVRxZfQ_b-jnWTti3FCM07mw0QBTwC'
+        'version': 'hiuBNrBiGQLcPYrmgez6CR9gZexeB7E9etOZd3wIZ8UC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 381e75687cef76b0053f2a29c79e37c1
+Signature: 2164e2369c09b0555ac686d685ef1ef4
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk
@@ -3962,6 +3962,7 @@ ORIGIN: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/flatland_example.dart + ../
 ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/inspect_sink.fidl + ../../../fuchsia/sdk/linux/LICENSE
 ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/graphical_presenter.fidl + ../../../fuchsia/sdk/linux/LICENSE
 ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl + ../../../fuchsia/sdk/linux/LICENSE
+ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/symlink.fidl + ../../../fuchsia/sdk/linux/LICENSE
 ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/feature.fidl + ../../../fuchsia/sdk/linux/LICENSE
 ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/ipv4.fidl + ../../../fuchsia/sdk/linux/LICENSE
 ORIGIN: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/ipv6.fidl + ../../../fuchsia/sdk/linux/LICENSE
@@ -3979,6 +3980,7 @@ FILE: ../../../fuchsia/sdk/linux/dart/sl4f/lib/src/flatland_example.dart
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.diagnostics/inspect_sink.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.element/graphical_presenter.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/history.fidl
+FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io/symlink.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.lowpan.thread/feature.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/ipv4.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.net.routes/ipv6.fidl

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: 72511696e1c3add1bac744d5d3bb1efc
+Signature: 341fb597c27b8326c83120a4dfdc9e33
 
 ====================================================================================================
 LIBRARY: angle

impeller/compiler/shader_lib/impeller/gaussian.glsl

@@ -6,51 +6,53 @@
 #define GAUSSIAN_GLSL_
 
 #include <impeller/constants.glsl>
+#include <impeller/types.glsl>
 
 /// Gaussian distribution function.
-float IPGaussian(float x, float sigma) {
-  float variance = sigma * sigma;
-  return exp(-0.5 * x * x / variance) / (kSqrtTwoPi * sigma);
+float16_t IPGaussian(float16_t x, float16_t sigma) {
+  float16_t variance = sigma * sigma;
+  return exp(-0.5hf * x * x / variance) / (float16_t(kSqrtTwoPi) * sigma);
 }
 
 /// Abramowitz and Stegun erf approximation.
-float IPErf(float x) {
-  float a = abs(x);
+float16_t IPErf(float16_t x) {
+  float16_t a = abs(x);
   // 0.278393*x + 0.230389*x^2 + 0.078108*x^4 + 1
-  float b = (0.278393 + (0.230389 + 0.078108 * a * a) * a) * a + 1.0;
-  return sign(x) * (1 - 1 / (b * b * b * b));
+  float16_t b =
+      (0.278393hf + (0.230389hf + 0.078108hf * a * a) * a) * a + 1.0hf;
+  return sign(x) * (1.0hf - 1.0hf / (b * b * b * b));
 }
 
 /// Vec2 variation for the Abramowitz and Stegun erf approximation.
-vec2 IPVec2Erf(vec2 x) {
-  vec2 a = abs(x);
+f16vec2 IPVec2Erf(f16vec2 x) {
+  f16vec2 a = abs(x);
   // 0.278393*x + 0.230389*x^2 + 0.078108*x^4 + 1
-  vec2 b = (0.278393 + (0.230389 + 0.078108 * a * a) * a) * a + 1.0;
-  return sign(x) * (1 - 1 / (b * b * b * b));
+  f16vec2 b = (0.278393hf + (0.230389hf + 0.078108hf * a * a) * a) * a + 1.0hf;
+  return sign(x) * (1.0hf - 1.0hf / (b * b * b * b));
 }
 
 /// The indefinite integral of the Gaussian function.
 /// Uses a very close approximation of Erf.
-float IPGaussianIntegral(float x, float sigma) {
+float16_t IPGaussianIntegral(float16_t x, float16_t sigma) {
   // ( 1 + erf( x * (sqrt(2) / (2 * sigma) ) ) / 2
-  return (1 + IPErf(x * (kHalfSqrtTwo / sigma))) * 0.5;
+  return (1.0hf + IPErf(x * (float16_t(kHalfSqrtTwo) / sigma))) * 0.5hf;
 }
 
 /// Vec2 variation for the indefinite integral of the Gaussian function.
 /// Uses a very close approximation of Erf.
-vec2 IPVec2GaussianIntegral(vec2 x, float sigma) {
+f16vec2 IPVec2GaussianIntegral(f16vec2 x, float16_t sigma) {
   // ( 1 + erf( x * (sqrt(2) / (2 * sigma) ) ) / 2
-  return (1 + IPVec2Erf(x * (kHalfSqrtTwo / sigma))) * 0.5;
+  return (1.0hf + IPVec2Erf(x * (float16_t(kHalfSqrtTwo) / sigma))) * 0.5hf;
 }
 
 /// Simpler (but less accurate) approximation of the Gaussian integral.
-vec2 IPVec2FastGaussianIntegral(vec2 x, float sigma) {
-  return 1 / (1 + exp(-kSqrtThree / sigma * x));
+f16vec2 IPVec2FastGaussianIntegral(f16vec2 x, float16_t sigma) {
+  return 1.0hf / (1.0hf + exp(float16_t(-kSqrtThree) / sigma * x));
 }
 
 /// Simple logistic sigmoid with a domain of [-1, 1] and range of [0, 1].
-float IPSigmoid(float x) {
-  return 1.03731472073 / (1 + exp(-4 * x)) - 0.0186573603638;
+float16_t IPSigmoid(float16_t x) {
+  return 1.03731472073hf / (1.0hf + exp(-4.0hf * x)) - 0.0186573603638hf;
 }
 
 #endif

impeller/compiler/shader_lib/impeller/texture.glsl

@@ -143,6 +143,15 @@ vec4 IPSampleDecal(sampler2D texture_sampler, vec2 coords) {
   return texture(texture_sampler, coords);
 }
 
+/// Sample a texture with decal tile mode.
+f16vec4 IPHalfSampleDecal(f16sampler2D texture_sampler, f16vec2 coords) {
+  if (any(lessThan(coords, f16vec2(0.0hf))) ||
+      any(greaterThanEqual(coords, f16vec2(1.0)))) {
+    return f16vec4(0.0);
+  }
+  return texture(texture_sampler, coords);
+}
+
 /// Sample a texture, emulating a specific tile mode.
 ///
 /// This is useful for Impeller graphics backend that don't have native support

impeller/entity/shaders/border_mask_blur.frag

@@ -15,42 +15,42 @@
 // integral (using an erf approximation) to the 4 edges of the UV rectangle and
 // multiplying them.
 
-uniform sampler2D texture_sampler;
+uniform f16sampler2D texture_sampler;
 
 uniform FragInfo {
-  float src_factor;
-  float inner_blur_factor;
-  float outer_blur_factor;
+  float16_t src_factor;
+  float16_t inner_blur_factor;
+  float16_t outer_blur_factor;
 
-  vec2 sigma_uv;
+  f16vec2 sigma_uv;
 }
 frag_info;
 
-in vec2 v_texture_coords;
+in f16vec2 v_texture_coords;
 
-out vec4 frag_color;
+out f16vec4 frag_color;
 
-float BoxBlurMask(vec2 uv) {
+float16_t BoxBlurMask(f16vec2 uv) {
   // LTRB
-  return IPGaussianIntegral(uv.x, frag_info.sigma_uv.x) *      //
-         IPGaussianIntegral(uv.y, frag_info.sigma_uv.y) *      //
-         IPGaussianIntegral(1 - uv.x, frag_info.sigma_uv.x) *  //
-         IPGaussianIntegral(1 - uv.y, frag_info.sigma_uv.y);
+  return IPGaussianIntegral(uv.x, frag_info.sigma_uv.x) *          //
+         IPGaussianIntegral(uv.y, frag_info.sigma_uv.y) *          //
+         IPGaussianIntegral(1.0hf - uv.x, frag_info.sigma_uv.x) *  //
+         IPGaussianIntegral(1.0hf - uv.y, frag_info.sigma_uv.y);
 }
 
 void main() {
-  vec4 image_color = texture(texture_sampler, v_texture_coords);
-  float blur_factor = BoxBlurMask(v_texture_coords);
+  f16vec4 image_color = texture(texture_sampler, v_texture_coords);
+  float16_t blur_factor = BoxBlurMask(v_texture_coords);
 
-  float within_bounds =
-      float(v_texture_coords.x >= 0 && v_texture_coords.y >= 0 &&
-            v_texture_coords.x < 1 && v_texture_coords.y < 1);
-  float inner_factor =
+  float16_t within_bounds =
+      float16_t(v_texture_coords.x >= 0.0hf && v_texture_coords.y >= 0.0hf &&
+                v_texture_coords.x < 1.0hf && v_texture_coords.y < 1.0hf);
+  float16_t inner_factor =
       (frag_info.inner_blur_factor * blur_factor + frag_info.src_factor) *
       within_bounds;
-  float outer_factor =
-      frag_info.outer_blur_factor * blur_factor * (1 - within_bounds);
+  float16_t outer_factor =
+      frag_info.outer_blur_factor * blur_factor * (1.0hf - within_bounds);
 
-  float mask_factor = inner_factor + outer_factor;
+  float16_t mask_factor = inner_factor + outer_factor;
   frag_color = image_color * mask_factor;
 }

impeller/entity/shaders/border_mask_blur.vert

@@ -15,10 +15,10 @@ frame_info;
 in vec2 vertices;
 in vec2 texture_coords;
 
-out vec2 v_texture_coords;
+out f16vec2 v_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(vertices, 0.0, 1.0);
-  v_texture_coords =
-      IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale);
+  v_texture_coords = f16vec2(
+      IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale));
 }

impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl

@@ -18,52 +18,52 @@
 #include <impeller/texture.glsl>
 #include <impeller/types.glsl>
 
-uniform sampler2D texture_sampler;
+uniform f16sampler2D texture_sampler;
 
 uniform BlurInfo {
-  vec2 texture_size;
-  vec2 blur_direction;
+  f16vec2 texture_size;
+  f16vec2 blur_direction;
 
   // The blur sigma and radius have a linear relationship which is defined
   // host-side, but both are useful controls here. Sigma (pixels per standard
   // deviation) is used to define the gaussian function itself, whereas the
   // radius is used to limit how much of the function is integrated.
-  float blur_sigma;
-  float blur_radius;
+  float16_t blur_sigma;
+  float16_t blur_radius;
 }
 blur_info;
 
 #if ENABLE_ALPHA_MASK
-uniform sampler2D alpha_mask_sampler;
+uniform f16sampler2D alpha_mask_sampler;
 
 uniform MaskInfo {
-  float src_factor;
-  float inner_blur_factor;
-  float outer_blur_factor;
+  float16_t src_factor;
+  float16_t inner_blur_factor;
+  float16_t outer_blur_factor;
 }
 mask_info;
 #endif
 
-vec4 Sample(sampler2D tex, vec2 coords) {
+f16vec4 Sample(f16sampler2D tex, f16vec2 coords) {
 #if ENABLE_DECAL_SPECIALIZATION
-  return IPSampleDecal(tex, coords);
+  return IPHalfSampleDecal(tex, coords);
 #else
   return texture(tex, coords);
 #endif
 }
 
-in vec2 v_texture_coords;
-in vec2 v_src_texture_coords;
+in f16vec2 v_texture_coords;
+in f16vec2 v_src_texture_coords;
 
-out vec4 frag_color;
+out f16vec4 frag_color;
 
 void main() {
-  vec4 total_color = vec4(0);
-  float gaussian_integral = 0;
-  vec2 blur_uv_offset = blur_info.blur_direction / blur_info.texture_size;
+  f16vec4 total_color = f16vec4(0.0hf);
+  float16_t gaussian_integral = 0.0hf;
+  f16vec2 blur_uv_offset = blur_info.blur_direction / blur_info.texture_size;
 
-  for (float i = -blur_info.blur_radius; i <= blur_info.blur_radius; i++) {
-    float gaussian = IPGaussian(i, blur_info.blur_sigma);
+  for (float16_t i = -blur_info.blur_radius; i <= blur_info.blur_radius; i++) {
+    float16_t gaussian = IPGaussian(i, blur_info.blur_sigma);
     gaussian_integral += gaussian;
     total_color +=
         gaussian *
@@ -75,11 +75,12 @@ void main() {
   frag_color = total_color / gaussian_integral;
 
 #if ENABLE_ALPHA_MASK
-  vec4 src_color = Sample(alpha_mask_sampler,   // sampler
-                          v_src_texture_coords  // texture coordinates
+  f16vec4 src_color = Sample(alpha_mask_sampler,   // sampler
+                             v_src_texture_coords  // texture coordinates
   );
-  float blur_factor = mask_info.inner_blur_factor * float(src_color.a > 0) +
-                      mask_info.outer_blur_factor * float(src_color.a == 0);
+  float16_t blur_factor =
+      mask_info.inner_blur_factor * float16_t(src_color.a > 0.0hf) +
+      mask_info.outer_blur_factor * float16_t(src_color.a == 0.0hf);
 
   frag_color = frag_color * blur_factor + src_color * mask_info.src_factor;
 #endif

impeller/entity/shaders/gaussian_blur/gaussian_blur.vert

@@ -16,13 +16,13 @@ in vec2 vertices;
 in vec2 texture_coords;
 in vec2 src_texture_coords;
 
-out vec2 v_texture_coords;
-out vec2 v_src_texture_coords;
+out f16vec2 v_texture_coords;
+out f16vec2 v_src_texture_coords;
 
 void main() {
   gl_Position = frame_info.mvp * vec4(vertices, 0.0, 1.0);
-  v_texture_coords =
-      IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale);
-  v_src_texture_coords = IPRemapCoords(
-      src_texture_coords, frame_info.alpha_mask_sampler_y_coord_scale);
+  v_texture_coords = f16vec2(
+      IPRemapCoords(texture_coords, frame_info.texture_sampler_y_coord_scale));
+  v_src_texture_coords = f16vec2(IPRemapCoords(
+      src_texture_coords, frame_info.alpha_mask_sampler_y_coord_scale));
 }