1201613 - Backout un-needed or obsoleted Gfx VR patches from Larch

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Kevin Grandon :kgrandon]

Current gfx patches in larch make merging painful. I've been told that not all of these patches will make it into M-C, or have been obsoleted by more recent patches. If we have no plans to take the patches in M-C let's please back them out.

Comment 1

[Kevin Grandon :kgrandon]

Here is a current list of all changes in the gfx directory (git hashes), that are not in m-c:

f952f42 - Brian R. Bondy: m-c merge
8c5a9f8 - Brian R. Bondy: m-c merge
fcd1f13 - Brian R. Bondy: m-c merge
a7d646d - Fabrice Desré: m-c merge
c419dfb - Vladimir Vukicevic: m-c merge
8cff409 - Fabrice Desré: m-c merge
9383106 - Paul Rouget: m-c merge
7fb8629 - Paul Rouget: m-c merge
79adbfa - Fabrice Desré: m-c merge
b5813cd - Fabrice Desré: m-c merge
bb02e07 - Fabrice Desré: m-c merge
522e907 - Fabrice Desré: m-c merge
90041d2 - Fabrice Desré: m-c merge
959201c - Kearwood (Kip) Gilbert: merge m-c
11b9951 - Fabrice Desré: m-c merge
bac7a8a - Fabrice Desré: m-c merge
567bcff - Vladimir Vukicevic: [webvr] remove unused variable
14495a4 - Vladimir Vukicevic: [webvr] Fix rendering to display when eye surface is bigger than target
d0fca41 - Vladimir Vukicevic: [webvr] Debug printf changes
189cbbe - Vladimir Vukicevic: [webvr] When mirroring textures or skipping distortion, scale the intermediate surface appropriately
4bbcc92 - Vladimir Vukicevic: [webvr] Don't depend on MOZ_HORIZON, just check vr pref
4c84b12 - Vladimir Vukicevic: [webvr] Use our own projection matrix construction function in Oculus050
1d46949 - Vladimir Vukicevic: [webvr] Support Oculus Runtime 0.5.0 even on Windows, if we couldn't initialize 0.6.0
555becf - Vladimir Vukicevic: [webvr] Pull out canvas layer bounds properly for scaling
f72bcbd - Vladimir Vukicevic: [webvr] Add support for Oculus 0.5.0 runtime, for OSX and Linux
2296e01 - Vladimir Vukicevic: [webvr] Support Oculus 0.6.0 runtime
92b7fde - Vladimir Vukicevic: m-c merge
af3d4c7 - Fabrice Desré: m-c merge
2cfc7a5 - Vladimir Vukicevic: m-c merge
a19e9f4 - Vladimir Vukicevic: [horizon] fix CalculateScissorRect to ignore the clip when VR is enabled
3360ecc - Fabrice Desré: m-c merge
28ca532 - Fabrice Desré: m-c merge
504b1be - Fabrice Desré: m-c merge
da5d679 - Fabrice Desré: m-c merge
f0757c5 - Vladimir Vukicevic: [horizon] force define MOZ_HORIZON in the one file where it matters, until we have horizon specific builds
e996bd9 - Fabrice Desré: m-c merge
61a8bb0 - Vladimir Vukicevic: [horizon] Debug printfs
aee6204 - Vladimir Vukicevic: [horizon] Use appropriate eye resolution for intermediate stereo VR surface
2c8c4dc - Vladimir Vukicevic: [horizon] Cache D3D11 ShaderResourceView on TextureSourceD3D11
e7c2c63 - Vladimir Vukicevic: [horizon] make CalculateScissorRect never shrink rect for PRESERVE_3D content
d264699 - Vladimir Vukicevic: [horizon] invalidate the entire container if it has a HMD attached
6e24ab8 - Vladimir Vukicevic: [horizon] Make DefaultComputeEffectiveTransforms do something right for VR
b006439 - Vladimir Vukicevic: [horizon] Implement VR rendering for CSS transformed elements, part 1
38b42d5 - Vladimir Vukicevic: [horizon] Add Layer::ReplaceEffectiveTransform for temporary transform changes
257882c - Vladimir Vukicevic: [horizon] Introduce complex viewport projections to Compositor; remove PrepareViewport
8593f0e - Vladimir Vukicevic: [horizon] Disable Cardboard VR device on non-mobile platforms


It appears that most of these changes were made by Vlad, but I'm not sure if you committed any of these Kip. Is there any patch here which we are going to upstream "as-is"? If not, I suggest simply overwriting the gfx directory with the gfx directory from m-c. Looks like VR stuff is the only thing in there, and backing these out would greatly help us keep larch updated.

Comment 2

[:kip (Kearwood Gilbert)]

I have done a diff on the gfx folder, comparing larch and m-c.  It appears that all of the remaining changes that haven't landed yet in m-c are part of Bug 1186575.

I'll be landing Bug 1186575 in m-c soon.  I'd suggest just replacing the gfx directory with the one from m-c.

Comment 3

[Kevin Grandon :kgrandon]

Thanks for the info, patch coming which will override the larch gfx folder with one from m-c. This should make merging easier for everyone.

Comment 4

[Kevin Grandon :kgrandon]

Attachment: [Patch] Overwrite larch gfx folder with mozilla-central gfx folder

Hello Fabrice, Kip - 

I'm hoping that either one of you has time to review this patch, it simply takes the latest gfx folder from m-c and applies it to larch.

I would also appreciate it if you could land this patch on larch for me. Thanks!

Comment 5

[:kip (Kearwood Gilbert)]

Comment on attachment 8660889 [details] [diff] [review]
[Patch] Overwrite larch gfx folder with mozilla-central gfx folder

Review of attachment 8660889 [details] [diff] [review]:
-----------------------------------------------------------------

All changes that are not part of Bug 1186575 appear to have been recent changes in m-c being pulled down to Larch.
Was able to apply the patch and build locally.

This looks good to me.

Comment 6

[[:fabrice] Fabrice Desré]

Landed:
 https://hg.mozilla.org/projects/larch/rev/78740b5dd9dc

Comment 7

[Kevin Grandon :kgrandon]

Doh, apparently people write patches for more than a single directory at a time - who knew?

This causes problems like bug 1205633.

Comment 8

[Kevin Grandon :kgrandon]

This is done and we're working on merging to m-c in bug 1204965.