build(windows): add arm64 initial support #3905
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| # windows specific dependencies | ||
|
|
||
| if(CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64") | ||
| # Make sure MinHook is installed | ||
| find_library(MINHOOK_LIBRARY libMinHook.a REQUIRED) | ||
| find_path(MINHOOK_INCLUDE_DIR MinHook.h PATH_SUFFIXES include REQUIRED) | ||
|
|
||
| add_library(minhook::minhook STATIC IMPORTED) | ||
| set_property(TARGET minhook::minhook PROPERTY IMPORTED_LOCATION ${MINHOOK_LIBRARY}) | ||
| target_include_directories(minhook::minhook INTERFACE ${MINHOOK_INCLUDE_DIR}) | ||
| endif() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,11 @@ | |
| // lib includes | ||
| #include <boost/algorithm/string/join.hpp> | ||
| #include <boost/process/v1.hpp> | ||
|
|
||
| // conditional includes | ||
| #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) | ||
| #include <MinHook.h> | ||
|
Collaborator
There was a problem hiding this comment. I don't think we can/should do this. It might work now by luck because none of the Windows ARM64 machines out in the wild have a discrete GPU, but it is definitely not guaranteed to continue working. We should look into hooking libraries that support ARM64, like Detours.
Contributor
Author
There was a problem hiding this comment. MediaTek + NVIDIA SoCs in 2026 Step by step, complete the initial support first
Member
There was a problem hiding this comment. I agree this should be resolved before being merged otherwise it's just adding to the technical debt. |
||
| #endif | ||
|
|
||
| // local includes | ||
| #include "utf_utils.h" | ||
|
|
@@ -420,6 +424,7 @@ namespace platf::dxgi { | |
| return false; | ||
| } | ||
|
|
||
| #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) | ||
| /** | ||
| * @brief Hook for NtGdiDdDDIGetCachedHybridQueryValue() from win32u.dll. | ||
| * @param gpuPreference A pointer to the location where the preference will be written. | ||
|
|
@@ -438,6 +443,7 @@ namespace platf::dxgi { | |
| return STATUS_INVALID_PARAMETER; | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| int display_base_t::init(const ::video::config_t &config, const std::string &display_name) { | ||
| std::once_flag windows_cpp_once_flag; | ||
|
|
@@ -457,12 +463,14 @@ namespace platf::dxgi { | |
| FreeLibrary(user32); | ||
| } | ||
|
|
||
| #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) | ||
| { | ||
| // We aren't calling MH_Uninitialize(), but that's okay because this hook lasts for the life of the process | ||
| MH_Initialize(); | ||
| MH_CreateHookApi(L"win32u.dll", "NtGdiDdDDIGetCachedHybridQueryValue", (void *) NtGdiDdDDIGetCachedHybridQueryValueHook, nullptr); | ||
| MH_EnableHook(MH_ALL_HOOKS); | ||
| } | ||
| #endif | ||
| }); | ||
|
|
||
| // Get rectangle of full desktop for absolute mouse coordinates | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,4 +41,4 @@ BEGIN | |
|
|
||
| END | ||
| END | ||
| SuperDuperAmazing ICON DISCARDABLE TOSTRING(PROJECT_ICON_PATH) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you open an issue here? https://github.com/google/googletest/issues
It seems like there's really only one place where atomic is used, maybe they can easily work around it when it's not available. https://github.com/search?q=repo%3Agoogle%2Fgoogletest%20atomic&type=code
Or we should use the gtest provided by msys2? https://github.com/msys2/MINGW-packages/tree/ab284e9ffd0590397c948f56ac889208464fb0dd/mingw-w64-gtest
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know, I think you can open a issue for it
:(