Skip to content

/ surfman

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

Merge webrender branch #46

Merged
merged 14 commits into from Dec 22, 2015
Merged

Merge webrender branch #46

merged 14 commits into from Dec 22, 2015

Conversation

@emilio
Copy link
Member

emilio commented Dec 9, 2015

May you review it @jdm and/or @glennw?

It's the branch used in webrender with fixes for egl, restored support for OSX, and cleaned up a bit:

  • I removed the texture_surface feature that has been unused since always
  • And also the windows glutin port since it's not capable of managing current contexts, etc. I'll try to adapt it in the future, but for now no WebGL in windows is fine I guess.
  • And proper CI again! \o/

It also supports using an EGL backend from linux (though only via renderbuffer for now, since some gl errors appear with texture formats).
emilio and others added 14 commits Nov 18, 2015
@emilio
[WIP] Preliminary work for WebGL on WebRender
6e969af
@emilio
Add dpy to glx's NativeGLContextHandle
b002678 
This was causing sharing problems with my Mesa drivers, since if
contexts are shared without using the same display the driver either
aborts or displays garbage...
@emilio
Remove `layers` integration.
e97cc7f
@emilio
platform: Port to egl and generate egl bindings also in linux
fb7a029 
This will help the task of splitting the backend from glx to egl, I
think someone is doing that :P
@emilio
Make `GLContext` backend-agnostic.
412f380
@emilio
[wip] Add mac port
62f16ad 
I'm almost sure it won't compile, I've probably made a typo.
@emilio
platform/glx: Remove unused import
cfb2dfc
@emilio
Update not_implemented platform and use it for now on osx
7d8ee2b
@emilio
Update gl_generator and remove texture_surface feature
7e65a33
@gw3583 @emilio
Fix up libc usage
4c0ec39
@emilio
platform/cgl: Restore OSX support & add new (and consistent) tests
b0b7c0a
@emilio
Remove old unused dependencies and code
1bca3d1
@emilio
ci: Try to reenable CI
758d36c
@emilio
platform/egl: Improve EGL implementation
Loading status checks…
9430a1a
@emilio emilio force-pushed the webrender branch from 197b206 to 9430a1a Dec 9, 2015
@jdm
Copy link
Member

jdm commented Dec 9, 2015

I'll need to defer to @glennw or do a lot of studying.
@glennw
Copy link
Member

glennw commented Dec 10, 2015

@ecoal95 I haven't looked at this yet - but does it contain any changes that rely on the servo/webrender branch? Or are they changes that will work with servo/master right now?
@emilio
Copy link
Member Author

emilio commented Dec 10, 2015

This will work with Servo master with minor changes (just passing the
wanted NativeGLContext backend).

Nothing that relies on servo/webrender, webrender, nor
webrender_traits.

On Thu, Dec 10, 2015 at 06:27:30AM -0800, Glenn Watson wrote:

@ecoal95 I haven't looked at this yet - but does it contain any changes that rely on the servo/webrender branch? Or are they changes that will work with servo/master right now?

Reply to this email directly or view it on GitHub:
#46 (comment)
@emilio
Copy link
Member Author

emilio commented Dec 22, 2015

Glenn approved this changes on IRC a few days ago, so I'm merging them and will make the servo PR ASAP.
emilio added a commit that referenced this pull request Dec 22, 2015
@emilio
Merge pull request #46 from ecoal95/webrender
Loading status checks…
29ba2c1 
Merge webrender branch
@emilio emilio merged commit 29ba2c1 into master Dec 22, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@emilio emilio mentioned this pull request Dec 22, 2015
Merged
bors-servo added a commit to servo/servo that referenced this pull request Dec 22, 2015
@bors-servo
Auto merge of #9044 - ecoal95:offscreen-gl-up, r=<try>
a9a7cff 
Update offscreen_gl_context

cc: servo/surfman#46

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9044)
<!-- Reviewable:end -->
bors-servo added a commit to servo/servo that referenced this pull request Dec 23, 2015
@bors-servo
Auto merge of #9044 - ecoal95:offscreen-gl-up, r=<try>
5c8e8ce 
Update offscreen_gl_context

cc: servo/surfman#46

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9044)
<!-- Reviewable:end -->
bors-servo added a commit to servo/servo that referenced this pull request Dec 23, 2015
@bors-servo
Auto merge of #9044 - ecoal95:offscreen-gl-up, r=<try>
f5746e3 
Update offscreen_gl_context

cc: servo/surfman#46

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9044)
<!-- Reviewable:end -->
bors-servo added a commit to servo/servo that referenced this pull request Dec 23, 2015
@bors-servo
Auto merge of #9044 - ecoal95:offscreen-gl-up, r=jdm
Loading status checks…
da8952b 
Update offscreen_gl_context

cc: servo/surfman#46

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9044)
<!-- Reviewable:end -->
jrmuizel pushed a commit to jrmuizel/gecko-cinnabar that referenced this pull request Jun 12, 2017
@emilio
servo: Merge #9044 - Update offscreen_gl_context (from emilio:offscre…
4efe383 
…en-gl-up); r=jdm

cc: servo/surfman#46
Source-Repo: https://github.com/servo/servo
Source-Revision: da8952b7023a92b7a69bd4423905594f4baa8f29
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 1, 2019
@marco-c
servo: Merge #9044 - Update offscreen_gl_context (from emilio:offscre…
1373423 
…en-gl-up); r=jdm

cc: servo/surfman#46
Source-Repo: https://github.com/servo/servo
Source-Revision: da8952b7023a92b7a69bd4423905594f4baa8f29

UltraBlame original commit: 3d43b4ca21e14d514f0cecac3feedb1f2f103ce1
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 1, 2019
@marco-c
servo: Merge #9044 - Update offscreen_gl_context (from emilio:offscre…
617fad5 
…en-gl-up); r=jdm

cc: servo/surfman#46
Source-Repo: https://github.com/servo/servo
Source-Revision: da8952b7023a92b7a69bd4423905594f4baa8f29

UltraBlame original commit: 3d43b4ca21e14d514f0cecac3feedb1f2f103ce1
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 1, 2019
@marco-c
servo: Merge #9044 - Update offscreen_gl_context (from emilio:offscre…
0669bad 
…en-gl-up); r=jdm

cc: servo/surfman#46
Source-Repo: https://github.com/servo/servo
Source-Revision: da8952b7023a92b7a69bd4423905594f4baa8f29

UltraBlame original commit: 3d43b4ca21e14d514f0cecac3feedb1f2f103ce1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@emilio @jdm @glennw @gw3583
You can’t perform that action at this time.