Update ANGLE to r653

RESOLVED FIXED in mozilla6

Status

()

RESOLVED FIXED
8 years ago
7 years ago

People

(Reporter: bjacob, Assigned: bjacob)

Tracking

unspecified
mozilla6
Points:
---
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(13 attachments)

111 bytes, patch
Details | Diff | Splinter Review
111 bytes, patch
Details | Diff | Splinter Review
111 bytes, patch
Details | Diff | Splinter Review
111 bytes, patch
Details | Diff | Splinter Review
111 bytes, patch
Details | Diff | Splinter Review
111 bytes, patch
Details | Diff | Splinter Review
111 bytes, patch
Details | Diff | Splinter Review
6.43 KB, patch
Details | Diff | Splinter Review
13.57 KB, patch
Details | Diff | Splinter Review
66.96 KB, patch
Details | Diff | Splinter Review
1.51 KB, patch
Details | Diff | Splinter Review
1.44 KB, patch
Details | Diff | Splinter Review
2.60 KB, patch
Details | Diff | Splinter Review
Contrary to what we believed, newer ANGLE does not require the June 2010 DirectX SDK.
Created attachment 533050 [details] [diff] [review]
part 1. [PLACEHOLDER] Unapply r68002 (update ANGLE to r611)

This is just a placeholder for reversing r68002 (update of ANGLE to r611)
Attachment #533050 - Flags: review?(joe)
Created attachment 533051 [details] [diff] [review]
part 2. [PLACEHOLDER] Unapply r68001 (update ANGLE to r551)

Just a placeholder for reversing r68001 (update ANGLE to r551)
Attachment #533051 - Flags: review?(joe)
Attachment #533051 - Attachment description: part 1. [PLACEHOLDER] Unapply r68001 (update ANGLE to r551) → part 2. [PLACEHOLDER] Unapply r68001 (update ANGLE to r551)
Created attachment 533052 [details] [diff] [review]
part 3. [PLACEHOLDER] Unapply r68000 (ANGLE Makefiles)

placeholder for reversing r68000 (ANGLE Makefiles)
Attachment #533052 - Flags: review?(joe)
Created attachment 533053 [details] [diff] [review]
part 4. [PLACEHOLDER] Unapply r67999 (renaming debug->compilerdebug)

placeholder for reversing r67999 (renaming debug->compilerdebug)
Attachment #533053 - Flags: review?(joe)
Created attachment 533055 [details] [diff] [review]
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
Attachment #533055 - Flags: review?(joe)
Created attachment 533057 [details] [diff] [review]
part 6. [PLACEHOLDER] Upgrade ANGLE to r653

placeholder for applying the ANGLE diff from r550 to r653.
Attachment #533057 - Flags: review?(joe)
Created attachment 533058 [details] [diff] [review]
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.
Attachment #533058 - Flags: review?(joe)
Attachment #533058 - Attachment description: part 5. [PLACEHOLDER] Reapply local ANGLE patches (angle-nspr-misc and angle-shared) → part 7. [PLACEHOLDER] Reapply local ANGLE patches (angle-nspr-misc and angle-shared)
Created attachment 533060 [details] [diff] [review]
Part 8. Reapply the debug->compilerdebug change
Attachment #533060 - Flags: review?(joe)
Created attachment 533065 [details] [diff] [review]
part 9. Update and reapply the Makefiles

In addition to a few new .cpp files, we have to link to D3DCompiler.lib.
Attachment #533065 - Flags: review?(joe)
Created attachment 533066 [details] [diff] [review]
part 10. Update the local patches and the README

This will make future updates easier.
Attachment #533066 - Flags: review?(joe)
Created attachment 533346 [details] [diff] [review]
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.
Attachment #533346 - Flags: review?(joe)
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.
Depends on: 648804
Duplicate of this bug: 646229
Blocks: 657619
Created attachment 534741 [details] [diff] [review]
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.
Attachment #534741 - Flags: review?(joe)
Created attachment 534748 [details] [diff] [review]
part 13: reject the Februrary 2010 SDK at configure time

Tested on your WinXP laptop.
Attachment #534748 - Flags: review?(joe)
Attachment #533050 - Flags: review?(joe)
Attachment #533051 - Flags: review?(joe)
Attachment #533052 - Flags: review?(joe)
Attachment #533053 - Flags: review?(joe)
Attachment #533055 - Flags: review?(joe)
Attachment #533057 - Flags: review?(joe)
Attachment #533058 - Flags: review?(joe)
Attachment #533060 - Flags: review?(joe)
Attachment #533065 - Flags: review?(joe)
Attachment #533066 - Flags: review?(joe)
Attachment #533346 - Flags: review?(joe)
Attachment #534741 - Flags: review?(joe)
Attachment #534748 - Flags: review?(joe)
Status: NEW → RESOLVED
Last Resolved: 8 years ago
Resolution: --- → FIXED
Assignee: nobody → bjacob
Target Milestone: --- → mozilla6
Depends on: 674731
You need to log in before you can comment on or make changes to this bug.