Combine webrender_traits and webrender #330

nox · 2016-08-06T14:18:40Z

This change is


        Initial commit - public API and types for webrender.


        Fix iframe clip


        Fix font_advance reftest


        Add image-rendering types.


        Switch to using ipc-channel.


        Merge pull request #1 from glennw/ipc

Switch to using ipc-channel.


        Fix a warning


        Munge api so it will work with e10s/serde.


        Add pipeline size change to render notifier trait.


        Temporary disable native fonts until fixed properly with e10s support.


        Switch to servo/ipc-channel


        Support native fonts again post-e10s.


        Merge pull request #2 from pcwalton/native-fonts

Support native fonts again post-e10s.


        Add fast WebGL support for WebRender


        Use custom branch for offscreen_gl_context


        Merge pull request #3 from ecoal95/webgl

Add WebGL support


        Move all the common WebGL code to webrender_traits


        Make `MixBlendMode` hashable.


        Merge pull request #4 from ecoal95/webgl

Move all the common WebGL code to webrender_traits


        Merge pull request #5 from pcwalton/hashable-mix-blend-mode

Make `MixBlendMode` hashable.


        webgl: Fix texturing

I discovered this while debugging the texture test (which worked without the framebuffer unbinding). PR to servo/servo incoming too.


        Merge pull request #6 from ecoal95/fix-textures

webgl: Fix texturing


        rustup


        webgl: Fix pending changes from rebase


        Merge pull request #7 from ecoal95/webrender-rebase

webgl: Fix pending changes from rebase


        Fix gleam dep


        Update api for WR changes


        webgl: Missing WebGL implementation details post-rebase


        Merge pull request #8 from ecoal95/webgl-todo

webgl: Missing WebGL implementation details post-rebase


        warning fixes


        Auto merge of #67 - MSleepyPanda:master, r=glennw

@glennw

Document the public api While working with the API, i couldn't help but notice the lack of documentation. I talked with @glennw on IRC and he explained me a lot of details which i wrote down, so that new contributors will learn from my mistakes. I also tried to explain the relationship between the different parts of the API. It's still a bit rough but it's something. There's an equivalent PR for webrender as well.


        Pin ipc-channel dependency.


        Auto merge of #68 - glennw:fix-ipc, r=nox

Pin ipc-channel dependency.


        Use ipc-channel from crates.io.


        Auto merge of #69 - servo:ipc, r=nox

Use ipc-channel from crates.io.

glennw · 2016-08-08T10:00:33Z

@nox This looks good to me (and thanks for doing it!) but let's just check with @pcwalton if he wants to hold off on this until the optimizations PR he is working on is ready to go.

glennw · 2016-08-08T20:10:45Z

@nox pcwalton would like to hold off until his optimization PR merges, sorry about that. Do we know the cause of the CI failures on this PR in the meantime?

bors-servo · 2016-08-08T20:53:54Z

☔ The latest upstream changes (presumably #331) made this pull request unmergeable. Please resolve the merge conflicts.


        Require euclid 0.8 and bump the version


        Auto merge of #70 - mrobinson:euclid-0.8, r=larsbergstrom

@nox

Require euclid 0.8 and bump the version @nox r?


        Update serde to 0.8


        Merge pull request #71 from nox/serde; r=Ms2ger

Update serde to 0.8

bors-servo · 2016-08-17T16:35:24Z

☔ The latest upstream changes (presumably #344) made this pull request unmergeable. Please resolve the merge conflicts.


        Move the crate to its own 'webrender' subdirectory


        Add 'webrender_traits/' from commit '4d5036748208733dbdad43b7faec27cc…

…ccbce9a6' git-subtree-dir: webrender_traits git-subtree-mainline: 315b28f git-subtree-split: 4d50367


        Adapt the build system for the now-included webrender_traits crate


        Clean up both Cargo.toml files and bump to 0.4.0

Ms2ger · 2016-08-18T12:31:50Z

@bors-servo r+

bors-servo · 2016-08-18T12:31:51Z

📌 Commit cf3966b has been approved by Ms2ger

bors-servo · 2016-08-18T12:31:54Z

⚡ Test exempted - status


        Auto merge of #330 - nox:merge, r=Ms2ger

Combine webrender_traits and webrender  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/330)

gw3583 and others added 30 commits Nov 9, 2015

Initial commit - public API and types for webrender.

52db2fa

Fix iframe clip

9bf8905

Fix font_advance reftest

c4c468b

Add image-rendering types.

a955162

Switch to using ipc-channel.

c686da5

Merge pull request #1 from glennw/ipc

f3e0ba7

Switch to using ipc-channel.

Fix a warning

9af2c0e

Munge api so it will work with e10s/serde.

7d89e0a

Add pipeline size change to render notifier trait.

22daaa2

Temporary disable native fonts until fixed properly with e10s support.

4679db0

Switch to servo/ipc-channel

fa8a045

Support native fonts again post-e10s.

12bb1fe

Merge pull request #2 from pcwalton/native-fonts

6f52a38

Support native fonts again post-e10s.

Add fast WebGL support for WebRender

f1aa080

Use custom branch for offscreen_gl_context

50020b0

Merge pull request #3 from ecoal95/webgl

8be78ef

Add WebGL support

Move all the common WebGL code to webrender_traits

3fa520b

Make `MixBlendMode` hashable.

e6f54eb

Merge pull request #4 from ecoal95/webgl

da6d0b2

Move all the common WebGL code to webrender_traits

Merge pull request #5 from pcwalton/hashable-mix-blend-mode

4f853ef

Make `MixBlendMode` hashable.

webgl: Fix texturing

2e10c9b

I discovered this while debugging the texture test (which worked without the framebuffer unbinding). PR to servo/servo incoming too.

Merge pull request #6 from ecoal95/fix-textures

6891f0a

webgl: Fix texturing

rustup

fec89a4

webgl: Fix pending changes from rebase

70f3507

Merge pull request #7 from ecoal95/webrender-rebase

d36caed

webgl: Fix pending changes from rebase

Fix gleam dep

a68695e

Update api for WR changes

960e48f

webgl: Missing WebGL implementation details post-rebase

864b212

Merge pull request #8 from ecoal95/webgl-todo

416e2e4

webgl: Missing WebGL implementation details post-rebase

warning fixes

48056c0

bors-servo and others added 5 commits Aug 1, 2016

Pin ipc-channel dependency.

a375751

Auto merge of #68 - glennw:fix-ipc, r=nox

f8ac18a

Pin ipc-channel dependency.

Use ipc-channel from crates.io.

f845b7d

Auto merge of #69 - servo:ipc, r=nox

a26ebe4

Use ipc-channel from crates.io.

nox force-pushed the nox:merge branch 2 times, most recently from 4852709 to 19535e5 Aug 6, 2016

mrobinson and others added 4 commits Aug 10, 2016

Require euclid 0.8 and bump the version

0519fc5

Auto merge of #70 - mrobinson:euclid-0.8, r=larsbergstrom

75d4070

Require euclid 0.8 and bump the version @nox r?

Update serde to 0.8

754457b

Merge pull request #71 from nox/serde; r=Ms2ger

4d50367

Update serde to 0.8

nox force-pushed the nox:merge branch from 19535e5 to 832df0c Aug 17, 2016

nox added 3 commits Aug 6, 2016

Move the crate to its own 'webrender' subdirectory

315b28f

Add 'webrender_traits/' from commit '4d5036748208733dbdad43b7faec27cc…

93d5912

…ccbce9a6' git-subtree-dir: webrender_traits git-subtree-mainline: 315b28f git-subtree-split: 4d50367

Adapt the build system for the now-included webrender_traits crate

72097ca

nox force-pushed the nox:merge branch from 832df0c to a741afd Aug 18, 2016

Clean up both Cargo.toml files and bump to 0.4.0

Loading status checks…

cf3966b

nox force-pushed the nox:merge branch from a741afd to cf3966b Aug 18, 2016

nox mentioned this pull request Aug 18, 2016

Store stacking context tree as flat array with primitive runs. #350

Closed

bors-servo merged commit cf3966b into servo:master Aug 18, 2016
2 checks passed

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

bors-servo mentioned this pull request Aug 18, 2016

Use shared memory to pass around font data #347

Closed

nox deleted the nox:merge branch Nov 10, 2016

servo / webrender

Combine webrender_traits and webrender #330

Combine webrender_traits and webrender #330

nox commented Aug 6, 2016 •

edited by larsbergstrom

glennw commented Aug 8, 2016

glennw commented Aug 8, 2016

bors-servo commented Aug 8, 2016

bors-servo commented Aug 17, 2016

Ms2ger commented Aug 18, 2016

bors-servo commented Aug 18, 2016

bors-servo commented Aug 18, 2016

servo / webrender

Join GitHub today

Combine webrender_traits and webrender #330

Combine webrender_traits and webrender #330

Conversation

nox commented Aug 6, 2016 • edited by larsbergstrom

glennw commented Aug 8, 2016

glennw commented Aug 8, 2016

bors-servo commented Aug 8, 2016

bors-servo commented Aug 17, 2016

Ms2ger commented Aug 18, 2016

bors-servo commented Aug 18, 2016

bors-servo commented Aug 18, 2016

nox commented Aug 6, 2016 •

edited by larsbergstrom