Wr2 #319

glennw · 2016-08-02T04:30:29Z

No description provided.


        Initial tiling / wr2 code.


        Pack image stretch size in image primitive


        fix a typo


        Fix various reftests.


        Pass border style data to the GPU


        Add various features and fixes for mozilla reftests.


        add support for dashed borders


        Reftest fixes, b.html fixes.


        rename border style variables


        rename color0 and color1 to vertical/horizontal colors. proper colors…

… for inset/outset


        proper colors for inset and outset border styles. fixed special case …

…for black


        Pack primitives once per frame instead of once per tile.


        Reftest fixes and prim shaders.


        Add first pass support for dotted box border styles


        Create dots based on size of border width. Make enough space to prope…

…rly draw all the circle


        dotted borders for corners


        mostly works


        properly space circles in edges. Fixed up size of dots


        Various reftest, shader, snapping fixes.


        add a global device position to border shaders


        Move local_rect into the common primitive structure.


        basic dashes work but they look too fat


        basic dashes work but they look too fat


        Tidy up the (non-transform) vertex shaders, abstract common functiona…

…lity.


        dashed lines work but corners look wrong


        append global clamped position to VertexInfo


        Fix angle gradients, image struct.


        add support for outset and inset box shadows


        support inset and outset borders


        Add explicit type casts, needed for compilation on android / es3 targ…

…ets.

pcwalton · 2016-08-02T20:22:56Z

src/resource_cache.rs

@@ -130,15 +130,13 @@ pub struct ResourceCache {

    pending_raster_jobs: Vec<GlyphRasterJob>,

-    white_image_id: TextureCacheItemId,
-    dummy_mask_image_id: TextureCacheItemId,
+    //white_image_id: TextureCacheItemId,


Just remove

pcwalton · 2016-08-02T20:23:47Z

src/renderer.rs

+            self.debug.add_text((tile_x0.0 as f32 + tile_x1.0 as f32) * 0.5,
+                                (tile_y0.0 as f32 + tile_y1.0 as f32) * 0.5,
+                                label,
+                                c);//&ColorF::new(0.0, 0.0, 0.0, 1.0));


Remove commented out code here and above

pcwalton · 2016-08-02T20:24:04Z

src/renderer.rs


-            self.update_shaders();
+            //self.update_shaders();


Remove commented out stuff here

pcwalton · 2016-08-02T20:25:08Z

src/render_backend.rs

                                    Some(self.render())
                                } else {
                                    None
                                }
                            });
+//                            hprof::end_frame();
+                            //hprof::profiler().print_timing();


Remove commented out code

pcwalton · 2016-08-02T20:25:19Z

src/render_backend.rs

@@ -196,27 +199,37 @@ impl RenderBackend {
                                self.build_scene();
                                self.render()
                            });
+//                            hprof::end_frame();
+                            //hprof::profiler().print_timing();


Remove commented out code

pcwalton · 2016-08-02T20:25:43Z

src/kdtree.rs

+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+


Delete this file?

pcwalton · 2016-08-02T20:25:55Z

src/layer.rs

    pub fn finalize(&mut self, scrolling: &ScrollingState) {
        self.scrolling = *scrolling;
-        self.aabb_tree.finalize();
+        //self.aabb_tree.finalize();


Just delete this line

pcwalton · 2016-08-02T20:26:02Z

src/layer.rs

@@ -105,6 +73,7 @@ impl Layer {
    pub fn print(&self) {
        self.aabb_tree.print(NodeIndex(0), 0);
    }
+*/


Remove this commented out code

pcwalton · 2016-08-02T20:26:47Z

src/lib.rs

@@ -99,6 +101,7 @@ extern crate app_units;
 extern crate euclid;
 extern crate fnv;
 extern crate gleam;
+//extern crate hprof;


Remove this

pcwalton · 2016-08-02T20:27:26Z

src/quadtree.rs

@@ -0,0 +1,222 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public


Just delete this file


        Address review comments.

pcwalton · 2016-08-02T22:37:05Z

@bors-servo: r+

bors-servo · 2016-08-02T22:37:06Z

📌 Commit 9b552f5 has been approved by pcwalton

bors-servo · 2016-08-02T22:37:08Z

⌛ Testing commit 9b552f5 with merge 0d27ab1...


        Auto merge of #319 - glennw:wr2, r=pcwalton

Wr2

pcwalton · 2016-08-02T22:37:10Z

Here we go!

bors-servo · 2016-08-02T23:30:08Z

💔 Test failed - travis

nox · 2016-08-03T00:22:45Z

@bors-servo retry

bors-servo · 2016-08-03T00:22:47Z

⌛ Testing commit 9b552f5 with merge 9db67b8...


        Auto merge of #319 - glennw:wr2, r=pcwalton

Wr2

bors-servo · 2016-08-03T00:31:22Z

☀️ Test successful - travis

liigo · 2016-08-04T00:26:55Z

@glennw @pcwalton

IMO, This PR has bad title (~~one word~~ 'Wr2') and bad description (nothing). Most commits has no detail message. It's unfortunate for such a big PR.


        Restore backend features in example and wrench.

Previously deleted in servo#319

gw3583 and others added 30 commits Jun 11, 2016

Initial tiling / wr2 code.

98dde84

Pack image stretch size in image primitive

a3c0608

fix a typo

8ffc51f

Fix various reftests.

c499a3e

Pass border style data to the GPU

21d5ffb

Add various features and fixes for mozilla reftests.

7448a58

add support for dashed borders

f87fa6e

Reftest fixes, b.html fixes.

2c60532

rename border style variables

6ab72b4

rename color0 and color1 to vertical/horizontal colors. proper colors…

435f3eb

… for inset/outset

proper colors for inset and outset border styles. fixed special case …

8c2407d

…for black

Pack primitives once per frame instead of once per tile.

4ddcf03

Reftest fixes and prim shaders.

fd79416

Add first pass support for dotted box border styles

901a783

Create dots based on size of border width. Make enough space to prope…

71733df

…rly draw all the circle

dotted borders for corners

3a8b93e

mostly works

0194d38

properly space circles in edges. Fixed up size of dots

b42424c

Various reftest, shader, snapping fixes.

d6ea013

add a global device position to border shaders

76890b0

Move local_rect into the common primitive structure.

ac2e8da

basic dashes work but they look too fat

90b67a9

basic dashes work but they look too fat

559223a

Tidy up the (non-transform) vertex shaders, abstract common functiona…

d53c8b0

…lity.

dashed lines work but corners look wrong

7bf757f

append global clamped position to VertexInfo

b90c12b

Fix angle gradients, image struct.

f6c15f5

add support for outset and inset box shadows

673a476

support inset and outset borders

3442bad

Add explicit type casts, needed for compilation on android / es3 targ…

e5ec9fd

…ets.