aboutsummaryrefslogtreecommitdiff
path: root/BUILD.gn
diff options
context:
space:
mode:
authorJonah Ryan-Davis <jonahr@google.com>2021-05-18 15:10:58 +0000
committerGeoff Lang <geofflang@chromium.org>2021-05-18 18:26:06 +0000
commitffb71dc28f9987650d79769f4f52fcefa42afd48 (patch)
tree1f5d9f943f7a2a0368eb85906c7d64becd8b54de /BUILD.gn
parent4b92e089c01e94730fe26c4c743d76d6c935088d (diff)
downloadangle-ffb71dc28f9987650d79769f4f52fcefa42afd48.tar.gz
Revert "Reland Change to module directory when loading swiftshader ICD."
This reverts commit c8c414b084fa3b6550b10dff48cf429719e04579. Reason for revert: Breaking fuchsia_x64 and ANGLE autoroller Original change's description: > Reland Change to module directory when loading swiftshader ICD. > > This is a reland of commit 3b10dda6a479612a07673b5c87d3560e0941d41b. > > Extra changes: > Be explicit about calling GetModuleHandleA > Do not use the general GetModuleHandle, which may use wide strings > > GetModuleDirectory should return the full path, not relative. > ANGLE wasn't able to locate the vulkan ICD file because it was > searching down an invalid relative path. This can be fixed by > ensuring the module directory is always the full path. > on some platforms. > > Original change's description: > > When loading vulkan, we can be running from any directory. We need > > to change to the module directory to ensure the swiftshader ICD is > > loaded properly. For example, in some Chrome releases, libGLESv2.dll > > and libvk_swiftshader.dll are in a subdirectory relative to chrome.exe > > > > Bug: chromium:1198567 > > Change-Id: I9e68927e512b239728fb2903d1a04702508a4948 > > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2873452 > > Commit-Queue: Jonah Ryan-Davis <jonahr@google.com> > > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> > > Reviewed-by: Jamie Madill <jmadill@chromium.org> > > Bug: chromium:1198567 > Bug: angleproject:5949 > Change-Id: Ib34067002c788f00b5ae2fa11d1e465f57bd7be8 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2893503 > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Reviewed-by: Cody Northrop <cnorthrop@google.com> > Commit-Queue: Jonah Ryan-Davis <jonahr@google.com> Bug: chromium:1198567 Bug: angleproject:5949 Change-Id: Ic0be8949cc27b231be4f982ea6e22beed590d24d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2903786 Reviewed-by: Jamie Madill <jmadill@chromium.org>
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn3
1 files changed, 0 insertions, 3 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 313f517ed4..8aa06cd555 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -107,9 +107,6 @@ config("internal_config") {
if (is_win) {
defines += [ "ANGLE_IS_WIN" ]
- if (angle_is_winuwp) {
- defines += [ "ANGLE_IS_WINUWP" ]
- }
} else if (is_linux || is_chromeos) {
defines += [ "ANGLE_IS_LINUX" ]
}