Skip to content

Fixing compilation issues #560

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.

Sign up for GitHub

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

Open
Kbz-8 wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −3
Open

Fixing compilation issues #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/vulkancts/framework/vulkan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ set(DEQP_VULKAN_INL_GEN_OUTPUTS
${DEQP_VULKAN_INL_GEN_OUTPUTS_DIR}/vkEntryPointValidation.inl
${DEQP_VULKAN_INL_GEN_OUTPUTS_DIR}/vkProfileTests.inl
${DEQP_VULKAN_INL_GEN_OUTPUTS_DIR}/vkKnownConformanceVersions.inl
${DEQP_VULKAN_INL_GEN_OUTPUTS_DIR}/vkFormatsLists.inl
${DEQP_VULKAN_INL_GEN_OUTPUTS_DIR}/vkFormatLists.inl
# NOTE: when new file is generated by gen_framework it should be added to this list.
${DEQP_VULKAN_INL_GEN_OUTPUTS_DIR}/vkVulkan_c.inl)

Expand Down
5 changes: 3 additions & 2 deletions external/vulkancts/scripts/gen_framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3419,9 +3419,10 @@ def generateFromCache(self, cacheVkObjectData, genOpts):
# get list of all vulkan/vulkansc tags from git
remote_urls = os.popen("git remote -v").read().split('\n')
remote_url = None
url_regexp = r'\bgerrit\.khronos\.org\b.*\bvk-gl-cts\b'
url_khronos_regexp = r'\bgerrit\.khronos\.org\b.*\bvk-gl-cts\b'
url_github_regexp = r'\bgithub\.com\b.*\bvk-gl-cts\b'
for line in remote_urls:
if re.search(url_regexp, line, re.IGNORECASE) is not None:
if re.search(url_khronos_regexp, line, re.IGNORECASE) is not None or re.search(url_github_regexp, line, re.IGNORECASE) is not None:
remote_url = line.split()[1]
break
listOfTags = os.popen("git ls-remote -t %s" % (remote_url)).read()
Expand Down