Aren/AMDVLK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct use of cmake and ninja in Build section

Browse Source 
There is no such thing as `-H.`. I am pretty sure the intention was to use `-S.` (which is a default actually).

`-H` is display help. I am not even sure how it works with `-H.`

For ninja, just use `-C`. No need to change directories, which could be confusing later.

Also the lines before for getting source code use literal directory `vulkandriver`,
so use that in the build too. There is zero reason to complicate it, and if somebody
uses different directory, they are smart enough to change things accordingly.
This commit is contained in:
Witold Baryluk 2021-03-06 18:15:42 +00:00 committed by jaxl
parent 75a34ebb15
commit 3f0d5d4310
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
README.md
View File

@ -143,18 +143,13 @@ repo sync
### Build Driver (64-bit, Release) ### Build Driver (64-bit, Release)
``` ```
cd <vulkandriver_path>/drivers/xgl cmake -G Ninja -S drivers/xgl -B drivers/xgl/builds/Release64
ninja -C drivers/xgl/builds/Release64
cmake -H. -G Ninja -Bbuilds/Release64
cd builds/Release64
ninja
``` ```
> **Note:** > **Note:**
* For RedHat 7.x, please use cmake3(>= 3.13.4) instead of cmake. * For RedHat 7.x, please use cmake3(>= 3.13.4) instead of cmake.
* For debug build, use `-DCMAKE_BUILD_TYPE=Debug -DLLVM_PARALLEL_LINK_JOBS=2` (Linking a debug build of llvm is very memory intensive, so we use only two parallel jobs). * For debug build, use `-DCMAKE_BUILD_TYPE=Debug -DLLVM_PARALLEL_LINK_JOBS=2` (Linking a debug build of llvm is very memory intensive, so we use only two parallel jobs).
* For 32-bit build, use `-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32`. * For 32-bit build, use `-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32`, and adjust build sub-directory accordingly (i.e. `Release32`).
* To enable Wayland support, use `-DBUILD_WAYLAND_SUPPORT=ON`. * To enable Wayland support, use `-DBUILD_WAYLAND_SUPPORT=ON`.
## Installation Instructions ## Installation Instructions
@ -165,13 +160,13 @@ You can download and install the SDK package [here](https://vulkan.lunarg.com/sd
#### Ubuntu #### Ubuntu
``` ```
sudo cp <vulkandriver_path>/drivers/xgl/builds/Release64/icd/amdvlk64.so /usr/lib/x86_64-linux-gnu/ sudo cp <vulkandriver_path>/drivers/xgl/builds/Release64/icd/amdvlk64.so /usr/lib/x86_64-linux-gnu/
sudo cp <vulkandriver_path>/drivers/xgl/builds/Release/icd/amdvlk32.so /usr/lib/i386-linux-gnu/ sudo cp <vulkandriver_path>/drivers/xgl/builds/Release32/icd/amdvlk32.so /usr/lib/i386-linux-gnu/
sudo cp <vulkandriver_path>/drivers/AMDVLK/json/Ubuntu/* /etc/vulkan/icd.d/ sudo cp <vulkandriver_path>/drivers/AMDVLK/json/Ubuntu/* /etc/vulkan/icd.d/
``` ```
#### RedHat #### RedHat
``` ```
sudo cp <vulkandriver_path>/drivers/xgl/builds/Release64/icd/amdvlk64.so /usr/lib64/ sudo cp <vulkandriver_path>/drivers/xgl/builds/Release64/icd/amdvlk64.so /usr/lib64/
sudo cp <vulkandriver_path>/drivers/xgl/builds/Release/icd/amdvlk32.so /usr/lib/ sudo cp <vulkandriver_path>/drivers/xgl/builds/Release32/icd/amdvlk32.so /usr/lib/
sudo cp <vulkandriver_path>/drivers/AMDVLK/json/Redhat/* /etc/vulkan/icd.d/ sudo cp <vulkandriver_path>/drivers/AMDVLK/json/Redhat/* /etc/vulkan/icd.d/
``` ```
**NOTE:** To make AMDVLK driver work correctly on system with both AMDVLK and RADV installed, AMD switchable graphics layer needs to be enabled by: **NOTE:** To make AMDVLK driver work correctly on system with both AMDVLK and RADV installed, AMD switchable graphics layer needs to be enabled by: