Skip to content
This repository was archived by the owner on Sep 15, 2025. It is now read-only.

Commit 522dd55

Browse files
committed
[CI] Update build options, add workaround for a fake cppcheck error.
1 parent b36b68f commit 522dd55

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/check-cppcheck-llpc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ jobs:
1919
git submodule update --init
2020
- name: Run cppcheck
2121
run: |
22-
cppcheck -q -j$(( $(nproc) * 4 )) --error-exitcode=1 --std=c++17 --inline-suppr . \
22+
cppcheck -q -j$(( $(nproc) * 4 )) --error-exitcode=1 --std=c++17 --inline-suppr . -i llpc/tool/amdllpc.cpp \
2323
-I imported/llvm-dialects/include

docker/amdvlk.Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ COPY docker/update-llpc.sh /vulkandriver/
7373
WORKDIR /vulkandriver/builds/ci-build
7474
RUN EXTRA_COMPILER_FLAGS=() \
7575
&& EXTRA_LINKER_FLAGS=() \
76-
&& EXTRA_FLAGS=("-DXGL_BUILD_CACHE_CREATOR=ON") \
76+
&& EXTRA_FLAGS=("") \
7777
&& SANITIZERS=() \
7878
&& if echo "$FEATURES" | grep -q "+gcc" ; then \
7979
EXTRA_FLAGS+=("-DCMAKE_C_COMPILER=gcc"); \
@@ -99,14 +99,14 @@ RUN EXTRA_COMPILER_FLAGS=() \
9999
&& if [ ${#SANITIZERS[@]} -ne 0 ]; then \
100100
SANITIZERS_SEPARATED_LIST="${SANITIZERS[@]}"; \
101101
SANITIZERS_SEPARATED_LIST="${SANITIZERS_SEPARATED_LIST// /;}"; \
102-
EXTRA_FLAGS+=("-DXGL_USE_SANITIZER='${SANITIZERS_SEPARATED_LIST}'"); \
102+
EXTRA_FLAGS+=("-DVKI_USE_SANITIZER='${SANITIZERS_SEPARATED_LIST}'"); \
103103
fi \
104104
&& if echo "$FEATURES" | grep -q "+coverage" ; then \
105105
EXTRA_COMPILER_FLAGS+=("-fprofile-instr-generate=/vulkandriver/profile%2m.profraw" "-fcoverage-mapping"); \
106106
EXTRA_LINKER_FLAGS+=("-fprofile-instr-generate=/vulkandriver/profile%2m.profraw" "-fcoverage-mapping"); \
107107
fi \
108108
&& if echo "$FEATURES" | grep -q "+assertions" ; then \
109-
EXTRA_FLAGS+=("-DXGL_ENABLE_ASSERTIONS=ON"); \
109+
EXTRA_FLAGS+=("-DVKI_ENABLE_ASSERTIONS=ON"); \
110110
fi \
111111
&& if [ ${#EXTRA_COMPILER_FLAGS[@]} -ne 0 ]; then \
112112
EXTRA_FLAGS+=("-DCMAKE_C_FLAGS='${EXTRA_COMPILER_FLAGS[*]}'" "-DCMAKE_CXX_FLAGS='${EXTRA_COMPILER_FLAGS[*]}'"); \
@@ -121,9 +121,9 @@ RUN EXTRA_COMPILER_FLAGS=() \
121121
&& cmake "/vulkandriver/drivers/xgl" \
122122
-G "$GENERATOR" \
123123
-DCMAKE_BUILD_TYPE="$CONFIG" \
124-
-DXGL_BUILD_TESTS=ON \
125-
-DXGL_BUILD_TOOLS=ON \
126-
-DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF \
124+
-DVKI_BUILD_TESTS=ON \
125+
-DVKI_BUILD_TOOLS=ON \
126+
-DVKI_ANALYSIS_WARNINGS_AS_ERRORS=OFF \
127127
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
128128
"${EXTRA_FLAGS[@]}" \
129129
&& cmake --build . \

0 commit comments

Comments
 (0)