Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync changes from mozilla-central #3735

Merged
merged 11 commits into from Aug 15, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Some generated files are not rendered by default. Learn more.

@@ -32,13 +32,13 @@ cstr = "0.1.2"
euclid = { version = "0.20.0", features = ["serde"] }
fxhash = "0.2.1"
gleam = "0.6.17"
image_loader = { optional = true, version = "0.21", package = "image", default-features = false, features = ["png_codec"] }
image_loader = { optional = true, version = "0.22", package = "image", default-features = false, features = ["png_codec"] }
lazy_static = "1"
log = "0.4"
malloc_size_of_derive = "0.1"
num-traits = "0.2"
plane-split = "0.14.1"
png = { optional = true, version = "0.14" }
png = { optional = true, version = "0.15" }
rayon = "1"
ron = { optional = true, version = "0.1.7" }
serde = { optional = true, version = "1.0", features = ["serde_derive"] }
@@ -25,14 +25,16 @@ in int aBlurDirection;
struct BlurTask {
RenderTaskCommonData common_data;
float blur_radius;
vec2 blur_region;
};

BlurTask fetch_blur_task(int address) {
RenderTaskData task_data = fetch_render_task_data(address);

BlurTask task = BlurTask(
task_data.common_data,
task_data.user_data.x
task_data.user_data.x,
task_data.user_data.yz
);

return task;
@@ -72,7 +74,7 @@ void main(void) {
}

vUvRect = vec4(src_rect.p0 + vec2(0.5),
src_rect.p0 + src_rect.size - vec2(0.5));
src_rect.p0 + blur_task.blur_region - vec2(0.5));
vUvRect /= texture_size.xyxy;

vec2 pos = target_rect.p0 + target_rect.size * aPosition.xy;
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.