mirror of
https://github.com/godotengine/godot-angle-static.git
synced 2026-01-06 02:09:55 +03:00
Revert "Terminate the display if initialization fails."
This reverts commit ebaadc6c2c.
Reason for revert: Breaking some Chrome/Dawn tests that use the VK backend
Original change's description:
> Terminate the display if initialization fails.
>
> If DisplayImpl::initialize fails, call terminate to ensure no resources
> are leaked.
>
> This is a speculative fix for dual GPU macs not falling back to the
> low power GPU. DisplayMtl leaks the metal device if it fails to
> initialize due to unsupported GPU families or vendors.
>
> Bug: chromium:1322521
> Change-Id: Ie227216bc92ef2834ec50190fbb78bec45e9c053
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4641107
> Commit-Queue: Geoff Lang <geofflang@chromium.org>
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
Bug: chromium:1322521
Change-Id: I379521130071623a8d050d2cadf2059c0b696d32
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4678359
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
This commit is contained in:
committed by
Angle LUCI CQ
parent
394c90ea70
commit
1d496191ad
@@ -1062,7 +1062,6 @@ Error Display::initialize()
|
||||
{
|
||||
// Log extended error message here
|
||||
ERR() << "ANGLE Display::initialize error " << error.getID() << ": " << error.getMessage();
|
||||
mImplementation->terminate();
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
@@ -76,8 +76,6 @@ class DisplayImpl : public EGLImplFactory, public angle::Subject
|
||||
DisplayImpl(const egl::DisplayState &state);
|
||||
~DisplayImpl() override;
|
||||
|
||||
// Initializ the display implementation. If this fails, terminate will be called to release any
|
||||
// partially-initialized resources.
|
||||
virtual egl::Error initialize(egl::Display *display) = 0;
|
||||
virtual void terminate() = 0;
|
||||
virtual egl::Error prepareForCall();
|
||||
|
||||
Reference in New Issue
Block a user