1578099 - Make CompositorOGL and BasicCompositor use NativeLayer instead of NativeLayerCA with ifdefs

Status: RESOLVED FIXED

(Core :: Graphics: Layers, task)

Description

[Markus Stange [:mstange]]

Requested by Matt in a review in bug 1574592:

As discussed on IRC, I'd prefer for NativeLayer to have APIs for locking to get a DrawTarget, and to bind to the current framebuffer in a provided GLContext.

I think that'll give us less platform specific code in the renderer implementation, and avoid us needing to duplicate things between WebRender and Compositor's GL code.

Comment 1

[Markus Stange [:mstange]]

Attachment: Bug 1578099 - Make more NativeLayerCA methods available on NativeLayerCA. r=mattwoodrow

The comments above these methods refer to NextSurface* methods which will be
added in later patches.

Comment 2

[Markus Stange [:mstange]]

Attachment: Bug 1578099 - Add NativeLayer::NextSurfaceAsDrawTarget. r=mattwoodrow

This uses MacIOSurface internally. NextSurfaceAsDrawTarget locks the MacIOSurface,
and NotifySurfaceReady unlocks it if necessary.

Depends on D44321

Comment 3

[Markus Stange [:mstange]]

Attachment: Bug 1578099 - Use NativeLayer::NextSurfaceAsDrawTarget in BasicCompositor and remove #ifdefs. r=mattwoodrow

Depends on D44322

Comment 4

[Markus Stange [:mstange]]

Attachment: Bug 1578099 - Make CFTypeRefPtr usable as a key inside an unordered_map. r=mattwoodrow

Depends on D44323

Comment 5

[Markus Stange [:mstange]]

Attachment: Bug 1578099 - Add NativeLayer::NextSurfaceAsFramebuffer. r=mattwoodrow

This returns the raw framebuffer GLuint and lets the caller bind it.
Initially I wanted to return a RefPtr<MozFramebuffer>, but then I discovered
that MozFramebuffer is not a refcounted class and prefers UniquePtrs.

Depends on D44324

Comment 6

[Markus Stange [:mstange]]

Attachment: Bug 1578099 - Use NativeLayer::NextSurfaceAsFramebuffer for WebRender. r=mattwoodrow

Depends on D44325

Comment 7

[Markus Stange [:mstange]]

Attachment: Bug 1578099 - Change CompositingRenderTargetOGL creation API. r=mattwoodrow

Depends on D44326

Comment 8

[Markus Stange [:mstange]]

Attachment: Bug 1578099 - Tweak CompositingRenderTargetOGL initialization flow. r=mattwoodrow

Depends on D44327

Comment 9

[Markus Stange [:mstange]]

Attachment: Bug 1578099 - Use NativeLayer::NextSurfaceAsFramebuffer in CompositorOGL and remove #ifdefs. r=mattwoodrow

CompositingRenderTargetOGL objects are no longer reused between frames. They are
recreated each frame around a reused framebuffer. This lets us remove the
SetOrigin method again, because we specify the right render target origin on
creation.

Depends on D44328

Comment 10

[Markus Stange [:mstange]]

Attachment: Bug 1578099 - Remove now-unnecessary default framebuffer functionality from GLContextCGL. r=jgilbert

This essentially backs out the two patches from bug 1565668 that added this
functionality.

Depends on D44329

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/bde43dd23263
Make more NativeLayerCA methods available on NativeLayerCA. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/cbe7c0b8bf00
Add NativeLayer::NextSurfaceAsDrawTarget. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/7a5e7c582e7d
Use NativeLayer::NextSurfaceAsDrawTarget in BasicCompositor and remove #ifdefs. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/3d0e490caad0
Make CFTypeRefPtr usable as a key inside an unordered_map. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/34aa23a05c67
Add NativeLayer::NextSurfaceAsFramebuffer. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/e115223a94ca
Use NativeLayer::NextSurfaceAsFramebuffer for WebRender. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/f09be81f4242
Change CompositingRenderTargetOGL creation API. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/ddf3709af4c8
Tweak CompositingRenderTargetOGL initialization flow. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/d1d697132576
Use NativeLayer::NextSurfaceAsFramebuffer in CompositorOGL and remove #ifdefs. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/cb449c1f91ff
Remove now-unnecessary default framebuffer functionality from GLContextCGL. r=mattwoodrow

Comment 12

[Bogdan Tara[:bogdan_tara | bogdant]]

https://hg.mozilla.org/mozilla-central/rev/bde43dd23263
https://hg.mozilla.org/mozilla-central/rev/cbe7c0b8bf00
https://hg.mozilla.org/mozilla-central/rev/7a5e7c582e7d
https://hg.mozilla.org/mozilla-central/rev/3d0e490caad0
https://hg.mozilla.org/mozilla-central/rev/34aa23a05c67
https://hg.mozilla.org/mozilla-central/rev/e115223a94ca
https://hg.mozilla.org/mozilla-central/rev/f09be81f4242
https://hg.mozilla.org/mozilla-central/rev/ddf3709af4c8
https://hg.mozilla.org/mozilla-central/rev/d1d697132576
https://hg.mozilla.org/mozilla-central/rev/cb449c1f91ff