Skip to content
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

Update UWP ANGLE to a modern version #24542

Merged
merged 1 commit into from Oct 28, 2019
Merged

Update UWP ANGLE to a modern version #24542

merged 1 commit into from Oct 28, 2019

Conversation

@jdm
Copy link
Member

jdm commented Oct 24, 2019

The previous UWP ANGLE builds were made from https://github.com/servo/ms-angle/tree/servo-master which was based on an abandoned revision of ANGLE from >2 years ago. This is lacking some features that are necessary for servo/webxr#46, so this is a new build produced from https://github.com/google/angle/ instead.

I've documented the process for releasing new ANGLE builds at https://github.com/servo/servo/wiki/Publishing-a-new-ANGLE-NuGet-version.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #24199
  • These changes do not require tests because the windows testing situation is sad, and the UWP testing situation is sadder
@highfive
Copy link

highfive commented Oct 24, 2019

Heads up! This PR modifies the following files:

@jdm
Copy link
Member Author

jdm commented Oct 24, 2019

r? @paulrouget
Could you give this a spin in your device? It worked fine for me in the emulator, but I'd like to avoid surprises.

@highfive highfive assigned paulrouget and unassigned nox Oct 24, 2019
@paulrouget
Copy link
Contributor

paulrouget commented Oct 25, 2019

In the new Angle package, the library name changed from libEGL.lib to libEGL.dll.lib. simpleservo compilation fails because it can't find the library.

@paulrouget
Copy link
Contributor

paulrouget commented Oct 25, 2019

Getting this error while compiling the VS project:

Error | C2065 | 'EGL_ANGLE_SURFACE_RENDER_TO_BACK_BUFFER': undeclared identifier | ServoApp | support\hololens\servoapp\servocontrol\opengles.cpp | 197 |  
Error | C2065 | 'EGL_ANGLE_DISPLAY_ALLOW_RENDER_TO_BACK_BUFFER': undeclared identifier | ServoApp | support\hololens\servoapp\servocontrol\opengles.cpp | 56 |  
Error | C2065 | 'EGL_ANGLE_DISPLAY_ALLOW_RENDER_TO_BACK_BUFFER': undeclared identifier | ServoApp | servo\support\hololens\servoapp\servocontrol\opengles.cpp | 82 |  
Error | C2065 | 'EGL_PLATFORM_ANGLE_DEVICE_TYPE_WARP_ANGLE': undeclared identifier | ServoApp | servo\support\hololens\servoapp\servocontrol\opengles.cpp | 96 |  
Error | C2065 | 'EGL_ANGLE_DISPLAY_ALLOW_RENDER_TO_BACK_BUFFER': undeclared identifier | ServoApp | servo\support\hololens\servoapp\servocontrol\opengles.cpp | 97 |  

@jdm
Copy link
Member Author

jdm commented Oct 25, 2019

Whoops; some local changes I made didn't get added to the PR.

@jdm jdm force-pushed the jdm:angle-up branch from e9d1223 to d59fd0f Oct 25, 2019
@jdm
Copy link
Member Author

jdm commented Oct 25, 2019

Verified locally that these changes compiled.

@paulrouget
Copy link
Contributor

paulrouget commented Oct 28, 2019

Works as expected.

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Oct 28, 2019

📌 Commit d59fd0f has been approved by paulrouget

@bors-servo
Copy link
Contributor

bors-servo commented Oct 28, 2019

Testing commit d59fd0f with merge b052a1a...

bors-servo added a commit that referenced this pull request Oct 28, 2019
Update UWP ANGLE to a modern version

The previous UWP ANGLE builds were made from https://github.com/servo/ms-angle/tree/servo-master which was based on an abandoned revision of ANGLE from >2 years ago. This is lacking some features that are necessary for servo/webxr#46, so this is a new build produced from https://github.com/google/angle/ instead.

I've documented the process for releasing new ANGLE builds at https://github.com/servo/servo/wiki/Publishing-a-new-ANGLE-NuGet-version.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24199
- [x] These changes do not require tests because the windows testing situation is sad, and the UWP testing situation is sadder
@bors-servo
Copy link
Contributor

bors-servo commented Oct 28, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: paulrouget
Pushing b052a1a to master...

@bors-servo bors-servo merged commit d59fd0f into servo:master Oct 28, 2019
2 checks passed
2 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
homu Test successful
Details
@jdm jdm mentioned this pull request Oct 29, 2019
4 of 4 tasks complete
bors-servo added a commit that referenced this pull request Oct 29, 2019
Fix GL panic with updated ANGLE

Our OES_texture_float extension implementation relied on the GL implementation to convert from unsized formats like RGBA when using the FLOAT/HALF_FLOAT type to an internal sized format that was acceptable. ANGLE no longer appears to do that since #24542, so we should enable the format conversion unconditionally.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24578
- [x] There are tests for these changes
bors-servo added a commit that referenced this pull request Oct 29, 2019
Fix GL panic with updated ANGLE

Our OES_texture_float extension implementation relied on the GL implementation to convert from unsized formats like RGBA when using the FLOAT/HALF_FLOAT type to an internal sized format that was acceptable. ANGLE no longer appears to do that since #24542, so we should enable the format conversion unconditionally.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #24578
- [x] There are tests for these changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

5 participants
You can’t perform that action at this time.