657748 - Update ANGLE to r653

Status: RESOLVED FIXED

(Core :: Graphics: CanvasWebGL, defect)

Description

[Benoit Jacob [:bjacob] (mostly away)]

Contrary to what we believed, newer ANGLE does not require the June 2010 DirectX SDK.

Comment 1

[Benoit Jacob [:bjacob] (mostly away)]

Try push:
http://tbpl.mozilla.org/?tree=Try&rev=8012d1e9211d

Comment 2

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 1. [PLACEHOLDER] Unapply r68002 (update ANGLE to r611)

This is just a placeholder for reversing r68002 (update of ANGLE to r611)

Comment 3

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 2. [PLACEHOLDER] Unapply r68001 (update ANGLE to r551)

Just a placeholder for reversing r68001 (update ANGLE to r551)

Comment 4

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 3. [PLACEHOLDER] Unapply r68000 (ANGLE Makefiles)

placeholder for reversing r68000 (ANGLE Makefiles)

Comment 5

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 4. [PLACEHOLDER] Unapply r67999 (renaming debug->compilerdebug)

placeholder for reversing r67999 (renaming debug->compilerdebug)

Comment 6

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 5. [PLACEHOLDER] Unapply local ANGLE patches

placeholder for unapplying our local ANGLE patches:
  angle-fixes.patch
  angle-nspr-misc.patch
  angle-pbuffers.patch
  angle-shared.patch

Comment 7

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 6. [PLACEHOLDER] Upgrade ANGLE to r653

placeholder for applying the ANGLE diff from r550 to r653.

Comment 8

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 7. [PLACEHOLDER] Reapply local ANGLE patches (angle-nspr-misc and angle-shared)

placeholder for reapplying angle-nspr-misc.patch and angle-shared.patch.

The other two patches we had have been merged upstream.

Comment 9

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: Part 8. Reapply the debug->compilerdebug change

Comment 10

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 9. Update and reapply the Makefiles

In addition to a few new .cpp files, we have to link to D3DCompiler.lib.

Comment 11

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 10. Update the local patches and the README

This will make future updates easier.

Comment 12

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 11: work around intrin.h compilation error on MSVS2005

This is a fix for ANGLE issue, http://code.google.com/p/angleproject/issues/detail?id=158

It works around a MSVS 2005 build problem.

Comment 13

[Benoit Jacob [:bjacob] (mostly away)]

At this point, what's blocking us from proceeding with this ANGLE upgrade is that newer ANGLE requires the June 2010 SDK, that's not installed on our builders.
See http://code.google.com/p/angleproject/issues/detail?id=158
and bug 648804.

Comment 15

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 12: disable fshaderWith256CharacterIdentifier test, crashes linux test slaves

This fixes an orange I had on linux test slaves: this sub-test was crashing the NVIDIA 190.42 linux driver. Not worth fighting against. The reason why that wasn't crashing before is that ANGLE used to block that and now it forwards it to the GL.

Comment 16

[Benoit Jacob [:bjacob] (mostly away)]

green on try:
http://tbpl.mozilla.org/?tree=Try&rev=81fdbb3e5bfb

Comment 17

[Benoit Jacob [:bjacob] (mostly away)]

Attachment: part 13: reject the Februrary 2010 SDK at configure time

Tested on your WinXP laptop.