Skip to content
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.

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

update shaderc #6689

Merged
merged 9 commits into from Jun 27, 2019
Merged

update shaderc #6689

merged 9 commits into from Jun 27, 2019

Conversation

doomtr666
Copy link
Contributor

New version supports NVidia Turing extensions (ray tracing). Tested on VS2019 Comunity.
Note that I was unable to activate SPVC options correctly (enables shader reflection and depends of spirv-cross), I had various link errors.

@doomtr666 doomtr666 mentioned this pull request May 30, 2019
@@ -20,7 +20,7 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()

vcpkg_fixup_cmake_targets()
#vcpkg_fixup_cmake_targets()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if glslang install/exports configs & targets this line should not be commented!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, problem was with the old cmake targets patch not being applied.

@doomtr666
Copy link
Contributor Author

I can't access Vcpkg-PR-Eager... Looking vcpkg-Linux-PR, it seems this warning causes the build to failed:
CMake Warning:
Manually-specified variables were not used by the project:

VCPKG_PLATFORM_TOOLSET

Don't know how to get rid of that ?

@NancyLi1013
Copy link
Contributor

Hi @doomtr666, thanks for your PR. I see that spirv-tools failed on x64-Linux from the current CI system.
failureLogs.zip

@doomtr666
Copy link
Contributor Author

doomtr666 commented Jun 3, 2019 via email

@vicroms
Copy link
Member

vicroms commented Jun 4, 2019

I found this problem during install on Linux, a requires Python module is not installed in the CI machines.

[14/299] cd /mnt/buildtrees/spirv-tools/x64-linux-dbg/source && /usr/bin/python3 /home/vcpkg/myagent/_work/5/s/buildtrees/spirv-tools/src/c730861b31-cb589de99b/utils/generate_registry_tables.py --xml=/home/vcpkg/myagent/_work/5/s/installed/x64-linux/include/spirv/spir-v.xml --generator-output=/mnt/buildtrees/spirv-tools/x64-linux-dbg/generators.inc
FAILED: generators.inc 
cd /mnt/buildtrees/spirv-tools/x64-linux-dbg/source && /usr/bin/python3 /home/vcpkg/myagent/_work/5/s/buildtrees/spirv-tools/src/c730861b31-cb589de99b/utils/generate_registry_tables.py --xml=/home/vcpkg/myagent/_work/5/s/installed/x64-linux/include/spirv/spir-v.xml --generator-output=/mnt/buildtrees/spirv-tools/x64-linux-dbg/generators.inc
Traceback (most recent call last):
  File "/home/vcpkg/myagent/_work/5/s/buildtrees/spirv-tools/src/c730861b31-cb589de99b/utils/generate_registry_tables.py", line 19, in <module>
    import distutils.dir_util
ModuleNotFoundError: No module named 'distutils.dir_util'
ninja: build stopped: subcommand failed.

@dan-shaw dan-shaw assigned dan-shaw and unassigned vicroms Jun 4, 2019
@Rastaban
Copy link
Contributor

Rastaban commented Jun 5, 2019

Would installing python3-distutils via apt-get on the CI machines do the trick? If so we can take care of that and rerun the tests.

@vicroms
Copy link
Member

vicroms commented Jun 5, 2019

I haven't had time to check locally, I'll test and let you know.

@doomtr666
Copy link
Contributor Author

Any news about the CI update ?

@dan-shaw
Copy link
Contributor

I've commented out the distutils line in spirv-tools in a patch, which might fix the problem on the CI. The build seems to work, but I'm not sure if this will break anything else. So feel free to remove my changes.

@doomtr666
Copy link
Contributor Author

I've done some tests, all is ok for me.

@dan-shaw dan-shaw merged commit 66f1d9a into microsoft:master Jun 27, 2019
@dan-shaw
Copy link
Contributor

Thanks for the PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants