From 7f947bfab9d30edb31a0d68645dcf3f86ef186d3 Mon Sep 17 00:00:00 2001 From: gaaclarke <30870216+gaaclarke@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:59:21 -0700 Subject: [PATCH] Removed clamping from dithering (#56140) tests: https://github.com/flutter/flutter/pull/157643 fixes revert from https://github.com/flutter/flutter/pull/153976 The pixel format will clamp if it needs to anyway so this isn't necessary. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I signed the [CLA]. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat --- .../shader_lib/impeller/dithering.glsl | 3 --- impeller/tools/malioc.json | 24 +++++++++---------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/impeller/compiler/shader_lib/impeller/dithering.glsl b/impeller/compiler/shader_lib/impeller/dithering.glsl index e8e4e8439ce67..5494c4ecee45c 100644 --- a/impeller/compiler/shader_lib/impeller/dithering.glsl +++ b/impeller/compiler/shader_lib/impeller/dithering.glsl @@ -45,9 +45,6 @@ vec4 IPOrderedDither8x8(vec4 color, vec2 dest) { // Apply the dither to the color. color.rgb += dither * kDitherRate; - // Clamp the color values to [0,1]. - color.rgb = clamp(color.rgb, 0.0, 1.0); - return color; } diff --git a/impeller/tools/malioc.json b/impeller/tools/malioc.json index aafabbc2af84b..787254a4fa0e5 100644 --- a/impeller/tools/malioc.json +++ b/impeller/tools/malioc.json @@ -586,7 +586,7 @@ "shortest_path_cycles": [ 0.5, 0.109375, - 0.296875, + 0.28125, 0.5, 0.0, 0.25, @@ -596,9 +596,9 @@ "load_store" ], "total_cycles": [ - 1.4249999523162842, + 1.40625, 0.862500011920929, - 1.4249999523162842, + 1.40625, 0.875, 4.0, 0.25, @@ -636,7 +636,7 @@ "longest_path_cycles": [ 0.5, 0.109375, - 0.125, + 0.109375, 0.5, 0.0, 0.25, @@ -658,7 +658,7 @@ "shortest_path_cycles": [ 0.5, 0.109375, - 0.125, + 0.109375, 0.5, 0.0, 0.25, @@ -671,7 +671,7 @@ "total_cycles": [ 0.5, 0.109375, - 0.125, + 0.109375, 0.5, 0.0, 0.25, @@ -6298,7 +6298,7 @@ "shortest_path_cycles": [ 0.5625, 0.203125, - 0.265625, + 0.25, 0.5625, 0.0, 0.25, @@ -6308,9 +6308,9 @@ "load_store" ], "total_cycles": [ - 0.71875, + 0.699999988079071, 0.40625, - 0.71875, + 0.699999988079071, 0.5625, 4.0, 0.25, @@ -6768,7 +6768,7 @@ "shortest_path_cycles": [ 0.5625, 0.21875, - 0.28125, + 0.265625, 0.5625, 0.0, 0.25, @@ -6778,9 +6778,9 @@ "load_store" ], "total_cycles": [ - 0.71875, + 0.699999988079071, 0.421875, - 0.71875, + 0.699999988079071, 0.625, 4.0, 0.25,