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

Fix find GPU driver dll path in windows #5141

Merged
merged 25 commits into from
Nov 10, 2023

Conversation

whyb
Copy link
Contributor

@whyb whyb commented Nov 9, 2023

#if defined _WIN32
#if defined(__x86_64__) || defined(_M_X64)
        // find driver dll in %SystemRoot%\System32\DriverStore\FileRepository (64bit)
        std::string dllpath = search_file("%SystemRoot%\\System32\\DriverStore\\FileRepository", well_known_path[i]);
#else
        // find driver dll in %SystemRoot%\SysWOW64\DriverStore\FileRepository (32bit)
        std::string dllpath = search_file("%SystemRoot%\\SysWOW64\\DriverStore\\FileRepository", well_known_path[i]);
#endif
        if (dllpath.empty())
            continue;

        ret = load_vulkan_windows(well_known_path[i]);
#elif defined __ANDROID__
        ret = load_vulkan_android(well_known_path[i]);
#else
        ret = load_vulkan_linux(well_known_path[i]);
#endif
        if (ret == 0)
            break;

@tencent-adm
Copy link
Member

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ nihui
❌ whyb
You have signed the CLA already but the status is still pending? Let us recheck it.

@codecov-commenter
Copy link

codecov-commenter commented Nov 9, 2023

Codecov Report

Merging #5141 (048fab3) into master (b4f2623) will decrease coverage by 0.17%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #5141      +/-   ##
==========================================
- Coverage   94.70%   94.54%   -0.17%     
==========================================
  Files         777      777              
  Lines      241608   241207     -401     
==========================================
- Hits       228813   228042     -771     
- Misses      12795    13165     +370     
Files Coverage Δ
src/simplevk.cpp 69.56% <ø> (-14.65%) ⬇️

... and 55 files with indirect coverage changes

@nihui nihui merged commit 2ecaf37 into Tencent:master Nov 10, 2023
106 checks passed
@nihui
Copy link
Member

nihui commented Nov 10, 2023

Thanks for your contribution !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants