@@ -73,7 +73,7 @@ COPY docker/update-llpc.sh /vulkandriver/
7373WORKDIR /vulkandriver/builds/ci-build
7474RUN 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