Commit Graph

14 Commits

Author SHA1 Message Date
Ms2ger
4ff63fe485 servo: Merge #11265 - Some assorted cleanup (from Ms2ger:cleanup); r=nox
Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data:
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy --faster` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

Either:
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because _____

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2572a7d2c5ba90cc78f6be10bb29c2e8fbc8f250
2016-05-19 05:48:24 -07:00
Emilio Cobos Álvarez
c4a514963d servo: Merge #10224 - webgl: Add attribute validations and other nits (from emilio:shader-type-validations); r=jdm
Fixes https://github.com/servo/servo/issues/9958

Depends on a bunch of prs, and needs a test.

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: f0014bd9cd5ac5db3e5a2f9fa8eafeb992df309a
2016-04-12 04:48:49 +05:00
Jan-Fabian Humann
e5a6ccf935 servo: Merge #10291 - #10211: Stop re-exporting webrender_traits WebGL types from canvas_traits (from jfhumann:10211); r=emilio
Source-Repo: https://github.com/servo/servo
Source-Revision: 524a004e771b465e3de9ebbc33816e50949d6a25
2016-04-01 01:27:20 +05:00
Emilio Cobos Álvarez
bd70866e46 servo: Merge #10302 - Update webrender to master (from emilio:webrender-up); r=nox
I'll rebase #10224 against it.

Sorry for the blocking of #10224, I expected it to be reviewed way sooner, my fault for landing breaking changes.

r? @nox or @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: 84a3dee67ea7a45d6ec505f59c7a55162621f11e
2016-03-31 21:21:06 +05:00
Ms2ger
27851cf695 servo: Merge #10267 - Simplify channel usage in canvas paint threads (from Ms2ger:canvas-channels); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: df808bed20a097719992f3c355bd164c4abc8913
2016-03-29 19:37:54 +05:00
Emilio Cobos Álvarez
400781e2ab servo: Merge #10150 - Canvas cleanup (from emilio:canvas-cleanup); r=jdm
This PR cleans up the layerization infrastructure for canvas, which was unused, and removes unused dependencies.

It also takes in account my recent username change to update angle's dependency (offscreen_gl_context requires extra work due to webrender depending on it).

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 2887623c4ae1960dfef52b14cd4afc3b279f9feb
2016-03-24 08:14:40 +05:00
Ms2ger
d71ac85104 servo: Merge #10106 - Remove renderer ids (from Ms2ger:renderer-id); r=ecoal95
Source-Repo: https://github.com/servo/servo
Source-Revision: 767b11cd676327cfb71f21d2cbcee8c16a74e2b3
2016-03-22 08:20:28 +05:00
Ms2ger
aa205ccea0 servo: Merge #10075 - Deny unsafe code in more crates (from Ms2ger:deny-unsafe); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 8c92e3f32b9aa6a75dc8980da49359ea63f9d67a
2016-03-20 07:30:53 +05:00
Glenn Watson
3b05a50ca8 servo: Merge #9589 - Add WebRender integration to Servo (from glennw:webrender); r=pcwalton
WebRender is an experimental GPU accelerated rendering backend for Servo.

The WebRender backend can be specified by running Servo with the -w option (otherwise the default rendering backend will be used).

WebRender has many bugs, and missing features - but it is usable to browse most websites - please report any WebRender specific rendering bugs you encounter!

Source-Repo: https://github.com/servo/servo
Source-Revision: ab07b06823ea9748a6091aee2281495f86f00bce
2016-02-19 00:24:06 +05:00
Glenn Watson
9f26653699 servo: Merge #9452 - This updates gleam to a version that relies on OpenGL 3.3 (which is n… (from glennw:update-gleam-again); r=ecoal95
…eeded for the instancing changes in WR - see servo/gleam@fc7e28e).

Hopefully the build machines and everyone using Servo has GL 3.3 available on their machines - if it causes any problems, we can revert this change and investigate further.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6b1a08c051f3be4b7bc7e6200053dfa530ecd106
2016-02-01 05:56:54 +05:00
Matthew Kuo
46405ef220 servo: Merge #9363 - Remove remaining unused imports (from mattkuo:clean-imports); r=KiChjang
Closes #9361

Source-Repo: https://github.com/servo/servo
Source-Revision: 6a38d55ceafca08d6ce83c8cbfa5f55835f9e141
2016-01-18 10:34:06 +05:00
Emilio Cobos Álvarez
ddc66a221c servo: Merge #9107 - webgl: Track the current program, implement some uniform functions, and nits (from emilio:webgl-uniforms-and-nits); r=simartin
Was done while implementing sequence arguments.

Depends on #9056.

Source-Repo: https://github.com/servo/servo
Source-Revision: c13e84010d1dd33c5532cdfa2937dddd4db4dd26
2016-01-13 21:44:59 +05:00
Josh Leverette
4497ad6021 servo: Merge #9240 - Refactor WebGLPaintTask to prevent creating extra IPC channels #9228 (from coder543:Refactoring); r=ecoal95
Closes #9228

I think this code will actually do what is desired now. I had to rebase off of master since WebGLPaintTask was renamed to WebGLPaintThread in a commit since last night.

I'm sorry this has been so much trouble so far. I'm still learning how things are done around here. I didn't even think about trailing whitespace, but now I know about the test-tidy tool.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6b1e73c1c0cf3fe2c935df0de667145bc6130461
2016-01-12 17:03:32 +05:00
rohan.prinja
c098aafd20 servo: Merge #9201 - task -> thread (from ajnirp:8512-task-thread); r=jdm
for #8512

Source-Repo: https://github.com/servo/servo
Source-Revision: d3e2f94f2024f4735f836588ed11303a0abafdf8
2016-01-10 15:19:04 +05:00