vulkan-loader: 1.0.21.0 -> 1.0.26.0

Also added asserts to ensure everything stays in sync.
This commit is contained in:
Benjamin Saunders
2016-10-12 13:19:34 +01:00
committed by Joe Hermaszewski
parent b52e8809d6
commit e0e27c83ab
4 changed files with 40 additions and 25 deletions
@@ -1,21 +1,22 @@
{ stdenv, fetchFromGitHub, cmake, bison }:
stdenv.mkDerivation rec {
name = "glslang-${version}";
version = "2016-07-16";
name = "glslang-git-${version}";
version = "2016-08-26";
# `vulkan-loader` requires a specific version of `glslang` as specified in
# `<vulkan-loader-repo>/glslang_revision`.
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "e4821e43c86d97bcf65fb07c1f70471b7102978d";
sha256 = "0vnfl8r5ssil1sffgk9sf7c7n5l3775pfizxgb1bcyvm84vw0pr3";
rev = "81cd764b5ffc475bc73f1fb35f75fd1171bb2343";
sha256 = "1vfwl6lzkjh9nh29q32b7zca4q1abf3q4nqkahskijgznw5lr59g";
};
patches = [ ./install-headers.patch ];
buildInputs = [ cmake bison ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
inherit (src.meta) homepage;
@@ -1,23 +1,23 @@
diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
index 50cda68..d4ba381 100755
index 48a6c46..593d941 100755
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -26,3 +26,8 @@ endif(WIN32)
install(TARGETS SPIRV
@@ -42,3 +42,8 @@ endif(WIN32)
install(TARGETS SPIRV SPVRemapper
ARCHIVE DESTINATION lib)
+
+foreach(file ${HEADERS})
+foreach(file ${HEADERS} ${SPVREMAP_HEADERS})
+ get_filename_component(dir ${file} DIRECTORY)
+ install(FILES ${file} DESTINATION include/SPIRV/${dir})
+endforeach()
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index 28f4742..5a25cbb 100644
index ff91135..4318279 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -87,3 +87,8 @@ endif(WIN32)
install(TARGETS glslang
@@ -90,3 +90,8 @@ endif(WIN32)
install(TARGETS glslang
ARCHIVE DESTINATION lib)
+
+foreach(file ${HEADERS})