Skip to content

Commit b6bc931

Browse files
committed
Fix Mesa source pin and fetch tag validation
1 parent 297216c commit b6bc931

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ set(WASM_BUILD_DIR "${WEBVULKAN_BUILD_DIR}/wasm" CACHE PATH "WASM sub-build dire
3030
set(WEBVULKAN_EMSCRIPTEN_TOOLCHAIN_FILE "${PROJECT_SOURCE_DIR}/cmake/toolchains/WebVulkanEmscripten.cmake" CACHE FILEPATH "Custom Emscripten toolchain file")
3131
set(MESA_SRC_DIR "${WEBVULKAN_THIRDPARTY_DIR}/mesa" CACHE PATH "Path where Mesa is cloned")
3232
set(MESA_GIT_URL "https://github.com/Devsh-Graphics-Programming/mesa.git" CACHE STRING "Mesa git repository URL")
33-
set(MESA_GIT_REF "caeeea677046411288c1a5155d81b27640aedd3a" CACHE STRING "Pinned Mesa git ref")
33+
set(MESA_GIT_REF "6da627eb8033ac32cd894a1fe659e11db733a265" CACHE STRING "Pinned Mesa git ref")
3434
if(MESA_GIT_REF STREQUAL "fc73e2257d9c2b51f64c78eaaafe878a73951eb8")
35-
set(MESA_GIT_REF "caeeea677046411288c1a5155d81b27640aedd3a" CACHE STRING "Pinned Mesa git ref" FORCE)
35+
set(MESA_GIT_REF "6da627eb8033ac32cd894a1fe659e11db733a265" CACHE STRING "Pinned Mesa git ref" FORCE)
36+
endif()
37+
if(MESA_GIT_REF STREQUAL "caeeea677046411288c1a5155d81b27640aedd3a")
38+
set(MESA_GIT_REF "6da627eb8033ac32cd894a1fe659e11db733a265" CACHE STRING "Pinned Mesa git ref" FORCE)
3639
endif()
3740
set(MESA_WASM_BUILD_DIR "${WEBVULKAN_BUILD_DIR}/mesa-wasm" CACHE PATH "Mesa WASM build directory")
3841
set(LLVM_SRC_DIR "${WEBVULKAN_THIRDPARTY_DIR}/llvm-project" CACHE PATH "Path where llvm-project is cloned")

cmake/FetchWebVulkanSources.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ function(webvulkan_fetch_git_source NAME)
7979
set(_should_fetch ON)
8080
if(EXISTS "${FETCH_SOURCE_DIR}/.git")
8181
set(_should_fetch OFF)
82+
_webvulkan_git_source_matches_tag("${FETCH_SOURCE_DIR}" "${FETCH_TAG}" _matches_tag)
83+
if(NOT _matches_tag)
84+
set(_should_fetch ON)
85+
endif()
86+
8287
if(EXISTS "${_state_file}")
8388
file(READ "${_state_file}" _state_content)
8489
string(STRIP "${_state_content}" _state_content)
8590
if(NOT _state_content STREQUAL _state_key)
8691
set(_should_fetch ON)
8792
endif()
88-
else()
89-
_webvulkan_git_source_matches_tag("${FETCH_SOURCE_DIR}" "${FETCH_TAG}" _matches_tag)
90-
if(NOT _matches_tag)
91-
set(_should_fetch ON)
92-
endif()
9393
endif()
9494
elseif(EXISTS "${FETCH_SOURCE_DIR}")
9595
message(FATAL_ERROR "Source directory exists but is not a git checkout: ${FETCH_SOURCE_DIR}")

0 commit comments

Comments
 (0)