vulkan: Changes to 'debian-unstable'
.gitattributes | 16 .travis.yml |9 BUILD.md |6 CMakeLists.txt | 59 COPYRIGHT.txt | 262 README.md |3 debian/changelog |6 demos/CMakeLists.txt |7 demos/android/cube-with-layers/AndroidManifest.xml | 50 demos/android/cube/AndroidManifest.xml | 50 demos/android/jni/Application.mk | 44 demos/cube.c | 25 demos/cube.cpp | 29 demos/cube.vcxproj.user | 22 demos/smoke/android/gradlew.bat | 180 demos/vulkaninfo.c | 28 demos/vulkaninfo.vcxproj.user | 22 external/glslang/.appveyor.yml |1 external/glslang/.gitignore |1 external/glslang/.travis.yml | 16 external/glslang/CMakeLists.txt | 18 external/glslang/External/CMakeLists.txt |8 external/glslang/README.md | 14 external/glslang/SPIRV/CMakeLists.txt | 11 external/glslang/SPIRV/GLSL.ext.AMD.h | 10 external/glslang/SPIRV/GlslangToSpv.cpp | 261 external/glslang/SPIRV/GlslangToSpv.h |5 external/glslang/SPIRV/SPVRemapper.cpp | 178 external/glslang/SPIRV/SPVRemapper.h | 12 external/glslang/SPIRV/SpvBuilder.cpp |5 external/glslang/SPIRV/doc.cpp | 13 external/glslang/StandAlone/DirStackFileIncluder.h |4 external/glslang/StandAlone/StandAlone.cpp | 232 external/glslang/Test/100samplerExternal.frag | 41 external/glslang/Test/300samplerExternal.frag | 41 external/glslang/Test/baseLegalResults/hlsl.aliasOpaque.frag.out | 50 external/glslang/Test/baseLegalResults/hlsl.flattenOpaque.frag.out | 65 external/glslang/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out | 49 external/glslang/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out | 49 external/glslang/Test/baseLegalResults/hlsl.flattenSubset.frag.out | 48 external/glslang/Test/baseResults/100samplerExternal.frag.out | 172 external/glslang/Test/baseResults/150.tesc.out |2 external/glslang/Test/baseResults/300samplerExternal.frag.out | 197 external/glslang/Test/baseResults/420.tese.out |2 external/glslang/Test/baseResults/constFoldIntMin.frag.out | 51 external/glslang/Test/baseResults/cppDeepNest.frag.out | 20 external/glslang/Test/baseResults/cppIntMinOverNegativeOne.frag.out | 14 external/glslang/Test/baseResults/glsl.entryPointRename.vert.bad.out | 45 external/glslang/Test/baseResults/glsl.entryPointRename.vert.out | 43 external/glslang/Test/baseResults/glsl.entryPointRename2.vert.out |4 external/glslang/Test/baseResults/glspv.version.frag.out |2 external/glslang/Test/baseResults/hlsl.aliasOpaque.frag.out | 113
vulkan: Changes to 'debian-unstable'
.appveyor.yml |1 BUILD.md | 31 CMakeLists.txt | 11 common/android_util.cpp |1 debian/changelog |8 debian/patches/install-vk-layer-dispatch-table-h.diff | 10 debian/patches/series |1 debian/patches/use-mxgot-for-mips64.patch |4 demos/android/jni/Android.mk |1 demos/cube.c | 125 demos/cube.cpp | 629 - demos/smoke/CMakeLists.txt |4 demos/smoke/ShellAndroid.cpp |1 demos/smoke/ShellWayland.cpp | 147 demos/smoke/ShellWayland.h | 51 demos/smoke/Simulation.cpp |1 demos/smoke/android/CMakeLists.txt |5 demos/vulkaninfo.c | 353 external/glslang/.gitignore |4 external/glslang/SPIRV/GLSL.ext.AMD.h | 28 external/glslang/SPIRV/GLSL.ext.KHR.h |2 external/glslang/SPIRV/GlslangToSpv.cpp | 191 external/glslang/SPIRV/SpvBuilder.cpp | 50 external/glslang/SPIRV/SpvBuilder.h | 10 external/glslang/SPIRV/doc.cpp | 10 external/glslang/SPIRV/hex_float.h |2 external/glslang/SPIRV/spirv.hpp | 25 external/glslang/SPIRV/spvIR.h |8 external/glslang/StandAlone/StandAlone.cpp | 75 external/glslang/Test/320.comp |5 external/glslang/Test/320.frag | 225 external/glslang/Test/320.geom | 134 external/glslang/Test/320.tesc | 150 external/glslang/Test/320.tese | 114 external/glslang/Test/320.vert | 255 external/glslang/Test/435.vert |2 external/glslang/Test/450.vert | 20 external/glslang/Test/460.frag | 17 external/glslang/Test/460.vert | 15 external/glslang/Test/baseResults/310.frag.out |2 external/glslang/Test/baseResults/320.comp.out | 19 external/glslang/Test/baseResults/320.frag.out | 576 external/glslang/Test/baseResults/320.geom.out | 251 external/glslang/Test/baseResults/320.tesc.out | 516 external/glslang/Test/baseResults/320.tese.out | 276 external/glslang/Test/baseResults/320.vert.out | 797 + external/glslang/Test/baseResults/435.vert.out | 25 external/glslang/Test/baseResults/450.vert.out | 54 external/glslang/Test/baseResults/460.frag.out | 55 external/glslang/Test/baseResults/460.vert.out | 51 external/glslang/Test/baseResults/glspv.frag.out |4 external/glslang/Test/baseResults/hlsl.aliasOpaque.frag.out | 58
vulkan: Changes to 'debian-unstable'
.travis.yml |2 BUILD.md |1 CMakeLists.txt |8 debian/changelog |6 demos/cube.c |8 demos/cube.cpp | 261 external/glslang/CMakeLists.txt |5 external/glslang/OGLCompilersDLL/CMakeLists.txt |9 external/glslang/SPIRV/CMakeLists.txt | 14 external/glslang/SPIRV/GLSL.ext.AMD.h |2 external/glslang/SPIRV/GLSL.ext.KHR.h |3 external/glslang/SPIRV/GlslangToSpv.cpp | 46 external/glslang/SPIRV/doc.cpp |2 external/glslang/SPIRV/spirv.hpp |6 external/glslang/StandAlone/CMakeLists.txt | 13 external/glslang/StandAlone/StandAlone.cpp | 628 external/glslang/Test/300.vert | 17 external/glslang/Test/450.frag |2 external/glslang/Test/450.geom |2 external/glslang/Test/450.tese |7 external/glslang/Test/baseResults/300.vert.out | 21 external/glslang/Test/baseResults/450.frag.out |5 external/glslang/Test/baseResults/450.geom.out |5 external/glslang/Test/baseResults/450.tese.out | 25 external/glslang/Test/baseResults/glsl.-D-U.frag.out | 55 external/glslang/Test/baseResults/hlsl.-D-U.frag.out | 65 external/glslang/Test/baseResults/hlsl.array.frag.out |9 external/glslang/Test/baseResults/hlsl.buffer.frag.out | 406 external/glslang/Test/baseResults/hlsl.clipdistance-1.vert.out | 194 external/glslang/Test/baseResults/hlsl.clipdistance-2.vert.out | 561 external/glslang/Test/baseResults/hlsl.clipdistance-3.vert.out | 229 external/glslang/Test/baseResults/hlsl.clipdistance-4.vert.out | 386 external/glslang/Test/baseResults/hlsl.clipdistance-5.vert.out | 435 external/glslang/Test/baseResults/hlsl.constructArray.vert.out | 381 external/glslang/Test/baseResults/hlsl.entry-in.frag.out | 17 external/glslang/Test/baseResults/hlsl.getsampleposition.dx10.frag.out |9 external/glslang/Test/baseResults/hlsl.hull.3.tesc.out | 382 external/glslang/Test/baseResults/hlsl.hull.void.tesc.out |3 external/glslang/Test/baseResults/hlsl.inoutquals.frag.out | 483 external/glslang/Test/baseResults/hlsl.intrinsics.comp.out | 576 external/glslang/Test/baseResults/hlsl.intrinsics.double.frag.out | 72 external/glslang/Test/baseResults/hlsl.intrinsics.evalfns.frag.out |9 external/glslang/Test/baseResults/hlsl.intrinsics.frag.out | 4980 +-- external/glslang/Test/baseResults/hlsl.intrinsics.negative.frag.out | 32 external/glslang/Test/baseResults/hlsl.intrinsics.vert.out | 2152 - external/glslang/Test/baseResults/hlsl.precedence2.frag.out | 36 external/glslang/Test/baseResults/hlsl.reflection.vert.out | 32 external/glslang/Test/baseResults/hlsl.scalar2matrix.frag.out | 506 external/glslang/Test/baseResults/hlsl.semantic.geom.out | 179 external/glslang/Test/baseResults/hlsl.semantic.vert.out |
vulkan: Changes to 'debian-unstable'
.appveyor.yml |6 .travis.yml | 10 BUILD.md | 72 CMakeLists.txt | 16 CONTRIBUTING.md | 29 debian/changelog | 10 debian/copyright |4 debian/patches/install-vk-layer-dispatch-table-h.diff | 10 debian/patches/series |1 debian/patches/smoke-check-for-installed-so.diff | 26 debian/rules |4 debian/vulkan-utils.install |2 demos/CMakeLists.txt |4 demos/cube.c | 64 demos/cube.cpp | 12 demos/cube.vert |4 demos/smoke/CMakeLists.txt |6 demos/smoke/ShellAndroid.cpp |1 demos/smoke/ShellWayland.cpp |2 demos/smoke/ShellXcb.cpp |2 demos/smoke/android/CMakeLists.txt | 54 demos/smoke/android/build-and-install |3 demos/smoke/android/build.gradle | 105 demos/smoke/android/gradle/wrapper/gradle-wrapper.properties |4 demos/vulkaninfo.c | 11 external/glslang/.travis.yml | 39 external/glslang/CMakeLists.txt | 55 external/glslang/External/CMakeLists.txt | 61 external/glslang/OGLCompilersDLL/CMakeLists.txt |6 external/glslang/SPIRV/CMakeLists.txt |8 external/glslang/SPIRV/GLSL.ext.AMD.h | 11 external/glslang/SPIRV/GLSL.ext.KHR.h | 12 external/glslang/SPIRV/GlslangToSpv.cpp | 527 external/glslang/SPIRV/GlslangToSpv.h | 13 external/glslang/SPIRV/InReadableOrder.cpp | 16 external/glslang/SPIRV/SPVRemapper.cpp | 14 external/glslang/SPIRV/SpvBuilder.cpp | 84 external/glslang/SPIRV/SpvBuilder.h | 28 external/glslang/SPIRV/doc.cpp | 16 external/glslang/SPIRV/doc.h |2 external/glslang/SPIRV/spirv.hpp |6 external/glslang/SPIRV/spvIR.h |3 external/glslang/StandAlone/CMakeLists.txt | 17 external/glslang/StandAlone/DirStackFileIncluder.h | 141 external/glslang/StandAlone/StandAlone.cpp | 227 external/glslang/StandAlone/Worklist.h | 13
vulkan: Changes to 'debian-unstable'
debian/changelog |7 +++ debian/patches/install-vk-layer-dispatch-table-h.diff | 10 ++ debian/patches/series |1 + 3 files changed, 18 insertions(+) New commits: commit d983ed9e4710d9543d00e25979eb29e9c4661632 Author: Timo AaltonenDate: Sun May 21 09:21:25 2017 +0300 install-vk-layer-dispatch-table-h.diff: Put vk_layer_dispatch_table.h in include/vulkan. (LP: #1692244) diff --git a/debian/changelog b/debian/changelog index 170c307..eced2c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vulkan (1.0.46.0+dfsg3-2) UNRELEASED; urgency=medium + + * install-vk-layer-dispatch-table-h.diff: Put +vk_layer_dispatch_table.h in include/vulkan. (LP: #1692244) + + -- Timo Aaltonen Sun, 21 May 2017 09:21:06 +0300 + vulkan (1.0.46.0+dfsg3-1) experimental; urgency=medium * rules: Fix glslang/spir-v build to always run make. diff --git a/debian/patches/install-vk-layer-dispatch-table-h.diff b/debian/patches/install-vk-layer-dispatch-table-h.diff new file mode 100644 index 000..f44b073 --- /dev/null +++ b/debian/patches/install-vk-layer-dispatch-table-h.diff @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -307,6 +307,7 @@ endif() + + if(UNIX) + install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/vulkan" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(FILES "${CMAKE_BINARY_DIR}/vk_layer_dispatch_table.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/vulkan) + + # uninstall target + configure_file( diff --git a/debian/patches/series b/debian/patches/series index 284af82..7784c0d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ demos-dont-build-cube.diff use-mxgot-for-mips64.patch install-vulkan-intel-header.diff smoke-check-for-installed-so.diff +install-vk-layer-dispatch-table-h.diff
vulkan: Changes to 'debian-unstable'
debian/changelog |8 debian/get-external.sh |6 debian/rules |9 external/spirv-tools/.appveyor.yml | 42 external/spirv-tools/.clang-format |5 external/spirv-tools/.gitignore | 13 external/spirv-tools/.travis.yml | 91 external/spirv-tools/CHANGES | 130 external/spirv-tools/CMakeLists.txt | 204 external/spirv-tools/LICENSE | 227 external/spirv-tools/README.md | 466 external/spirv-tools/example/CMakeLists.txt |9 external/spirv-tools/example/example-1.1.cpp | 42 external/spirv-tools/example/example.cpp | 37 external/spirv-tools/examples/CMakeLists.txt | 15 external/spirv-tools/examples/cpp-interface/CMakeLists.txt | 19 external/spirv-tools/examples/cpp-interface/main.cpp | 64 external/spirv-tools/external/CMakeLists.txt | 46 external/spirv-tools/external/spirv-headers/.appveyor.yml | 42 external/spirv-tools/external/spirv-headers/.clang-format |5 external/spirv-tools/external/spirv-headers/.gitattributes |7 external/spirv-tools/external/spirv-headers/.gitignore | 13 external/spirv-tools/external/spirv-headers/.travis.yml | 91 external/spirv-tools/external/spirv-headers/CHANGES | 130 external/spirv-tools/external/spirv-headers/CMakeLists.txt | 204 external/spirv-tools/external/spirv-headers/LICENSE | 227 external/spirv-tools/external/spirv-headers/README.md | 466 external/spirv-tools/external/spirv-headers/example/CMakeLists.txt |9 external/spirv-tools/external/spirv-headers/example/example-1.1.cpp | 42 external/spirv-tools/external/spirv-headers/example/example.cpp | 37 external/spirv-tools/external/spirv-headers/examples/CMakeLists.txt | 15 external/spirv-tools/external/spirv-headers/examples/cpp-interface/CMakeLists.txt | 19 external/spirv-tools/external/spirv-headers/examples/cpp-interface/main.cpp | 64 external/spirv-tools/external/spirv-headers/external/CMakeLists.txt | 46 external/spirv-tools/external/spirv-headers/include/spirv-tools/libspirv.h | 511 external/spirv-tools/external/spirv-headers/include/spirv-tools/libspirv.hpp | 121 external/spirv-tools/external/spirv-headers/include/spirv-tools/optimizer.hpp | 172 external/spirv-tools/external/spirv-headers/include/spirv/1.0/GLSL.std.450.h | 131 external/spirv-tools/external/spirv-headers/include/spirv/1.0/OpenCL.std.h | 272 external/spirv-tools/external/spirv-headers/include/spirv/1.0/extinst.glsl.std.450.grammar.json | 642 + external/spirv-tools/external/spirv-headers/include/spirv/1.0/extinst.opencl.std.100.grammar.json | 1279 ++ external/spirv-tools/external/spirv-headers/include/spirv/1.0/spirv.core.grammar.json | 5377 + external/spirv-tools/external/spirv-headers/include/spirv/1.0/spirv.h | 943 + external/spirv-tools/external/spirv-headers/include/spirv/1.0/spirv.hpp | 952 + external/spirv-tools/external/spirv-headers/include/spirv/1.0/spirv.hpp11 | 952 +
vulkan: Changes to 'debian-unstable'
.gitignore |1 debian/README.source | 17 debian/SPIRV/spirv.hpp | 879 - debian/changelog | 19 debian/get-external.sh | 22 debian/libvulkan-dev.dirs |2 debian/libvulkan-dev.install |3 debian/patches/demos-dont-build-cube.diff | 34 debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff | 103 debian/patches/series |3 debian/patches/smoke-check-for-installed-so.diff | 26 debian/rules | 44 debian/vulkan-utils.install |1 external/glslang/.appveyor.yml | 40 external/glslang/.clang-format | 12 external/glslang/.gitattributes | 17 external/glslang/.gitignore | 13 external/glslang/.travis.yml | 60 external/glslang/CMakeLists.txt | 77 external/glslang/ChooseMSVCCRT.cmake | 105 external/glslang/External/CMakeLists.txt | 34 external/glslang/OGLCompilersDLL/CMakeLists.txt | 11 external/glslang/OGLCompilersDLL/InitializeDll.cpp | 155 external/glslang/OGLCompilersDLL/InitializeDll.h | 49 external/glslang/README-spirv-remap.txt | 137 external/glslang/README.md | 306 external/glslang/SPIRV/CMakeLists.txt | 57 external/glslang/SPIRV/GLSL.ext.AMD.h | 116 external/glslang/SPIRV/GLSL.ext.KHR.h | 43 external/glslang/SPIRV/GLSL.ext.NV.h | 54 external/glslang/SPIRV/GLSL.std.450.h | 131 external/glslang/SPIRV/GlslangToSpv.cpp | 5480 ++ external/glslang/SPIRV/GlslangToSpv.h | 54 external/glslang/SPIRV/InReadableOrder.cpp | 113 external/glslang/SPIRV/Logger.cpp | 68 external/glslang/SPIRV/Logger.h | 74 external/glslang/SPIRV/SPVRemapper.cpp | 1333 + external/glslang/SPIRV/SPVRemapper.h | 296 external/glslang/SPIRV/SpvBuilder.cpp | 2584 +++ external/glslang/SPIRV/SpvBuilder.h | 608 external/glslang/SPIRV/bitutils.h | 81 external/glslang/SPIRV/disassemble.cpp | 695 external/glslang/SPIRV/disassemble.h | 52 external/glslang/SPIRV/doc.cpp | 2855 +++ external/glslang/SPIRV/doc.h | 260
vulkan: Changes to 'debian-unstable'
.appveyor.yml | 10 BUILD.md |4 CMakeLists.txt| 16 README.md |2 cmake/cmake_uninstall.cmake.in| 21 debian/changelog |6 debian/libvulkan-dev.install |1 debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff |4 debian/patches/use-mxgot-for-mips64.patch |4 demos/cube.c | 528 ++ demos/cube.cpp| 10 demos/gettime.h | 74 demos/smoke/ShellWin32.cpp|2 external_revisions/glslang_revision |2 external_revisions/spirv-headers_revision |2 external_revisions/spirv-tools_revision |2 include/vulkan/vk_icd.h |1 include/vulkan/vulkan.h | 175 include/vulkan/vulkan.hpp | 1136 - layers/CMakeLists.txt | 10 layers/buffer_validation.cpp | 1501 --- layers/buffer_validation.h| 33 layers/core_validation.cpp| 1845 - layers/core_validation_error_enums.h |2 layers/core_validation_types.h| 57 layers/descriptor_sets.cpp| 154 layers/descriptor_sets.h | 12 layers/linux/VkLayer_core_validation.json |2 layers/linux/VkLayer_object_tracker.json |2 layers/linux/VkLayer_parameter_validation.json|2 layers/linux/VkLayer_swapchain.json |2 layers/linux/VkLayer_threading.json |2 layers/linux/VkLayer_unique_objects.json |2 layers/object_tracker.cpp | 1305 -- layers/parameter_validation.cpp | 640 --- layers/parameter_validation_utils.h | 31 layers/swapchain.cpp | 67 layers/threading.cpp | 21 layers/unique_objects.cpp | 95 layers/vk_format_utils.cpp| 924 layers/vk_format_utils.h | 122 layers/vk_layer_utils.cpp | 662 --- layers/vk_layer_utils.h | 80 layers/vk_validation_error_database.txt | 346 - layers/windows/VkLayer_core_validation.json |2 layers/windows/VkLayer_object_tracker.json|2 layers/windows/VkLayer_parameter_validation.json |2 layers/windows/VkLayer_swapchain.json |2 layers/windows/VkLayer_threading.json |2 layers/windows/VkLayer_unique_objects.json|2 loader/CMakeLists.txt | 44 loader/LoaderAndLayerInterface.md | 18 loader/extension_manual.c | 586 ++ loader/extension_manual.h | 49 loader/loader.c | 253 - loader/loader.h | 18 loader/loader_cmake_config.h.in |2 loader/trampoline.c | 73 loader/vk_loader_platform.h |6 loader/vulkan.pc.in | 11 scripts/cgenerator.py |2 scripts/generator.py |9 scripts/helper_file_generator.py | 12 scripts/loader_extension_generator.py | 212 - scripts/parameter_validation_generator.py |9 scripts/threading_generator.py|1 scripts/unique_objects_generator.py | 20 scripts/vk.xml| 1098 +++-- tests/CMakeLists.txt |9 tests/layer_validation_tests.cpp | 2791 +- tests/layers/linux/VkLayer_test.json |2 tests/layers/linux/VkLayer_wrap_objects.json |2 tests/layers/windows/VkLayer_test.json|2
vulkan: Changes to 'debian-unstable'
debian/changelog |3 external_revisions/glslang_revision |2 external_revisions/spirv-headers_revision |2 external_revisions/spirv-tools_revision |2 layers/core_validation.cpp| 168 - layers/core_validation_types.h|9 + layers/unique_objects.cpp | 173 ++ layers/unique_objects.h | 10 + scripts/helper_file_generator.py | 11 + scripts/loader_extension_generator.py | 25 +--- scripts/unique_objects_generator.py |4 11 files changed, 385 insertions(+), 24 deletions(-) New commits: commit d237affedc04ba64f1b2204622267702cf92f90c Author: Timo AaltonenDate: Mon Apr 10 11:46:24 2017 +0300 update the changelog diff --git a/debian/changelog b/debian/changelog index 059a7c1..5fb2a17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -vulkan (1.0.42.0+dfsg1-2) UNRELEASED; urgency=medium +vulkan (1.0.42.2+dfsg1-1) UNRELEASED; urgency=medium + * New upstream release. * trim-build.diff, disable-mir.diff, rules: Use clang build options instead of patching CMakeFile.txt. * rules: Set build type to 'Release'. commit ee3e734713237d812847e52978629ef760e591e7 Author: Mark Young Date: Wed Mar 29 14:48:12 2017 -0600 externals: Update to glslang fix commit diff --git a/external_revisions/glslang_revision b/external_revisions/glslang_revision index 962e447..08470fa 100644 --- a/external_revisions/glslang_revision +++ b/external_revisions/glslang_revision @@ -1 +1 @@ -9fb31ce8ecdac1e0c029729177144545186c509f \ No newline at end of file +714e58b2fc5a45714596e6aa2f6ac8f64260365c \ No newline at end of file commit fd27f52f4a2b0cac6bfe3dd75aa48a3750cb1bd4 Author: Mark Young Date: Mon Mar 27 18:13:38 2017 -0600 externals: Update to latest as of this morning diff --git a/external_revisions/glslang_revision b/external_revisions/glslang_revision index c88cf78..962e447 100644 --- a/external_revisions/glslang_revision +++ b/external_revisions/glslang_revision @@ -1 +1 @@ -e751bca75c059f18d16952ae73cde29a29b85cec +9fb31ce8ecdac1e0c029729177144545186c509f \ No newline at end of file diff --git a/external_revisions/spirv-headers_revision b/external_revisions/spirv-headers_revision index 6506006..5de12fb 100644 --- a/external_revisions/spirv-headers_revision +++ b/external_revisions/spirv-headers_revision @@ -1 +1 @@ -f61848a1151856f98ebc0ee66c39b8b7745a2a22 +6c08995e6e7b94129e6086c78198c77111f2f262 \ No newline at end of file diff --git a/external_revisions/spirv-tools_revision b/external_revisions/spirv-tools_revision index dc8bc68..05d0448 100644 --- a/external_revisions/spirv-tools_revision +++ b/external_revisions/spirv-tools_revision @@ -1 +1 @@ -c804c125c568914aabf4d734cf85923611bdfd21 +7fe8a57a5bd72094e91f9f93e51dac2f2461dcb4 \ No newline at end of file commit 92469cdb064ad77096f933bb49dfe1389756766f Author: Mark Young Date: Fri Mar 24 07:51:14 2017 -0600 externals: Fix bad Glsang/Spirv generation The version of Glslang/Spirv we were grabbing apparently included a bug which always inserted Nvidia code into anyone's generated Spirv. This caused issues on AMD and Intel. Update to a newer version verified by AMD. diff --git a/external_revisions/glslang_revision b/external_revisions/glslang_revision index 2127105..c88cf78 100644 --- a/external_revisions/glslang_revision +++ b/external_revisions/glslang_revision @@ -1 +1 @@ -322cb1922e512b0e5f9804e7012a9b9b7f5b8df5 \ No newline at end of file +e751bca75c059f18d16952ae73cde29a29b85cec diff --git a/external_revisions/spirv-headers_revision b/external_revisions/spirv-headers_revision index 329350d..6506006 100644 --- a/external_revisions/spirv-headers_revision +++ b/external_revisions/spirv-headers_revision @@ -1 +1 @@ -b6dca2397d512e4db62f051a47bb5334d5d44360 +f61848a1151856f98ebc0ee66c39b8b7745a2a22 diff --git a/external_revisions/spirv-tools_revision b/external_revisions/spirv-tools_revision index 7c10d5a..dc8bc68 100644 --- a/external_revisions/spirv-tools_revision +++ b/external_revisions/spirv-tools_revision @@ -1 +1 @@ -c0949703b1264c33df45584efba50a8444b53022 +c804c125c568914aabf4d734cf85923611bdfd21 commit 3a93ad918f38940e5855297bfe940be91965881b Author: Mark Lobodzinski Date: Wed Mar 8 11:50:51 2017 -0700 layers: Fix template_update errors in CV Tied UpdateDescriptorSetWithTemplate into UpdateDescriptorSet validation. Change-Id: I00fdd9b90f99b34bb7119eb9c8dd433571f22f1d diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 42c8737..ef20ce0 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -11496,11 +11496,88 @@ VKAPI_ATTR void VKAPI_CALL DestroyDescriptorUpdateTemplateKHR(VkDevice device,
vulkan: Changes to 'debian-unstable'
debian/changelog|8 debian/patches/disable-mir.diff | 11 --- debian/patches/series |2 -- debian/patches/trim-build.diff | 16 debian/rules|7 ++- 5 files changed, 14 insertions(+), 30 deletions(-) New commits: commit a32242cc7643375fd5b03e16ce63bb6c4c890469 Author: Timo AaltonenDate: Sun Apr 9 11:27:08 2017 +0300 rules: Set build type to 'Release'. diff --git a/debian/changelog b/debian/changelog index b938069..059a7c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ vulkan (1.0.42.0+dfsg1-2) UNRELEASED; urgency=medium * trim-build.diff, disable-mir.diff, rules: Use clang build options instead of patching CMakeFile.txt. + * rules: Set build type to 'Release'. -- Timo Aaltonen Sun, 09 Apr 2017 11:19:11 +0300 diff --git a/debian/rules b/debian/rules index cebe717..47f9bb9 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,7 @@ override_dh_clean: override_dh_auto_configure: dh_auto_configure -- \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \ -DGLSLANG_SPIRV_INCLUDE_DIR=$(CURDIR)/debian \ -DBUILD_LAYERS=OFF \ commit a91de39eba0680db8568729422d30f15a0ac8500 Author: Timo Aaltonen Date: Sun Apr 9 11:19:22 2017 +0300 trim-build.diff, disable-mir.diff, rules: Use clang build options instead of patching CMakeFile.txt. diff --git a/debian/changelog b/debian/changelog index 6dcb551..b938069 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vulkan (1.0.42.0+dfsg1-2) UNRELEASED; urgency=medium + + * trim-build.diff, disable-mir.diff, rules: Use clang build options +instead of patching CMakeFile.txt. + + -- Timo Aaltonen Sun, 09 Apr 2017 11:19:11 +0300 + vulkan (1.0.42.0+dfsg1-1) experimental; urgency=medium * New upstream release. (Closes: #857185) diff --git a/debian/patches/disable-mir.diff b/debian/patches/disable-mir.diff deleted file mode 100644 index a47ca7e..000 --- a/debian/patches/disable-mir.diff +++ /dev/null @@ -1,11 +0,0 @@ a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -25,7 +25,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) - option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) - option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON) --option(BUILD_WSI_MIR_SUPPORT "Build Mir WSI support" ON) -+option(BUILD_WSI_MIR_SUPPORT "Build Mir WSI support" OFF) - set(DEMOS_WSI_SELECTION "XCB" CACHE STRING "Select WSI target for demos (XCB, XLIB, WAYLAND, MIR, DISPLAY)") - - if (BUILD_WSI_XCB_SUPPORT) diff --git a/debian/patches/series b/debian/patches/series index a86f6e7..9548ae4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -trim-build.diff demos-dont-build-tri-or-cube-or-smoke.diff use-mxgot-for-mips64.patch install-vulkan-intel-header.diff -disable-mir.diff diff --git a/debian/patches/trim-build.diff b/debian/patches/trim-build.diff deleted file mode 100644 index 40dfafd..000 --- a/debian/patches/trim-build.diff +++ /dev/null @@ -1,16 +0,0 @@ a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,10 +110,10 @@ else() - endif() - - option(BUILD_LOADER "Build loader" ON) --option(BUILD_TESTS "Build tests" ON) --option(BUILD_LAYERS "Build layers" ON) -+option(BUILD_TESTS "Build tests" OFF) -+option(BUILD_LAYERS "Build layers" OFF) - option(BUILD_DEMOS "Build demos" ON) --option(BUILD_VKJSON "Build vkjson" ON) -+option(BUILD_VKJSON "Build vkjson" OFF) - option(CUSTOM_GLSLANG_BIN_ROOT "Use the user defined GLSLANG_BINARY_ROOT" OFF) - option(CUSTOM_SPIRV_TOOLS_BIN_ROOT "Use the user defined SPIRV_TOOLS_BINARY_ROOT" OFF) - diff --git a/debian/rules b/debian/rules index 25809ca..cebe717 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,11 @@ override_dh_clean: override_dh_auto_configure: dh_auto_configure -- \ -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \ - -DGLSLANG_SPIRV_INCLUDE_DIR=$(CURDIR)/debian + -DGLSLANG_SPIRV_INCLUDE_DIR=$(CURDIR)/debian \ + -DBUILD_LAYERS=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_VKJSON=OFF \ + -DBUILD_WSI_MIR_SUPPORT=OFF override_dh_auto_install: dh_auto_install --destdir=debian/tmp
vulkan: Changes to 'debian-unstable'
.clang-format |5 .travis.yml |4 BUILD.md|2 CMakeLists.txt | 57 CONTRIBUTING.md | 15 common/android_util.cpp | 31 common/android_util.h |6 common/vulkan_wrapper.cpp | 113 common/vulkan_wrapper.h |3 debian/changelog|7 debian/patches/disable-mir.diff |4 debian/patches/use-mxgot-for-mips64.patch |8 demos/CMakeLists.txt|2 demos/android/include/cube.frag.h | 56 demos/android/include/cube.vert.h | 139 demos/android/include/lunarg.ppm.h |25750 demos/cube.c| 380 demos/cube.cpp | 1676 demos/linmath.h | 126 demos/smoke/Game.cpp|3 demos/smoke/Game.h | 16 demos/smoke/Helpers.h | 31 demos/smoke/Main.cpp| 24 demos/smoke/Meshes.cpp | 287 demos/smoke/Meshes.h|6 demos/smoke/Meshes.teapot.h | 1152 demos/smoke/Shell.cpp | 180 demos/smoke/Shell.h | 30 demos/smoke/ShellAndroid.cpp| 162 demos/smoke/ShellAndroid.h | 12 demos/smoke/ShellWayland.cpp| 119 demos/smoke/ShellWayland.h | 23 demos/smoke/ShellWin32.cpp | 140 demos/smoke/ShellWin32.h| 13 demos/smoke/ShellXcb.cpp| 176 demos/smoke/ShellXcb.h |6 demos/smoke/Simulation.cpp | 175 demos/smoke/Simulation.h| 14 demos/smoke/Smoke.cpp | 312 demos/smoke/Smoke.h | 10 demos/smoke/android/src/main/jni/Smoke.frag.h | 42 demos/smoke/android/src/main/jni/Smoke.push_constant.vert.h | 251 demos/smoke/android/src/main/jni/Smoke.vert.h | 252 demos/vulkaninfo.c | 376 external_revisions/glslang_giturl |1 external_revisions/glslang_revision |2 external_revisions/spirv-headers_giturl |1 external_revisions/spirv-headers_revision |2 external_revisions/spirv-tools_giturl |1 external_revisions/spirv-tools_revision |2 include/vulkan/vk_layer.h | 269 include/vulkan/vk_platform.h|2 include/vulkan/vulkan.h | 1013 include/vulkan/vulkan.hpp |22269 ++ layers/.clang-format|7 layers/CMakeLists.txt | 56 layers/README.md|7 layers/buffer_validation.cpp| 2847 + layers/buffer_validation.h | 229 layers/core_validation.cpp | 8451 +-- layers/core_validation.h| 99 layers/core_validation_error_enums.h| 12 layers/core_validation_types.h | 299 layers/descriptor_sets.cpp | 805 layers/descriptor_sets.h| 45 layers/image.cpp| 1471 layers/image.h | 68 layers/linux/VkLayer_core_validation.json |2 layers/linux/VkLayer_image.json | 17 layers/linux/VkLayer_object_tracker.json|2 layers/linux/VkLayer_parameter_validation.json |2 layers/linux/VkLayer_swapchain.json |2
vulkan: Changes to 'debian-unstable'
debian/changelog |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 18abbe46f46296f3183d4ec254b0391999a61292 Author: Timo AaltonenDate: Thu Jan 26 17:45:02 2017 +0200 release to sid diff --git a/debian/changelog b/debian/changelog index 1b07e6a..a0f81b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -vulkan (1.0.39.0+dfsg1-1) UNRELEASED; urgency=medium +vulkan (1.0.39.0+dfsg1-1) unstable; urgency=medium + [ Andreas Boll ] * New upstream release. * Refresh patches. * control: Add libxrandr-dev to build-depends. - -- Andreas Boll Thu, 26 Jan 2017 15:21:20 +0100 + -- Timo Aaltonen Thu, 26 Jan 2017 17:43:33 +0200 vulkan (1.0.37.0+dfsg1-1) unstable; urgency=medium
vulkan: Changes to 'debian-unstable'
.appveyor.yml | 28 .clang-format |1 .gitignore|1 .travis.yml | 62 BUILD.md |2 CMakeLists.txt|2 README.md |6 debian/changelog |8 debian/control|1 debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff |4 debian/patches/disable-mir.diff |4 debian/patches/use-mxgot-for-mips64.patch |8 demos/cube.c | 283 demos/cube.cpp| 35 demos/smoke/Game.h|7 demos/smoke/Meshes.cpp| 90 demos/smoke/Simulation.cpp|4 demos/smoke/Smoke.cpp | 30 demos/smoke/Smoke.h |1 demos/vulkaninfo.c| 24 dev/null |binary external_revisions/glslang_revision |2 external_revisions/spirv-tools_revision |2 include/vulkan/vk_icd.h | 22 include/vulkan/vk_layer.h | 77 include/vulkan/vulkan.h | 367 + include/vulkan/vulkan.hpp | 1390 layers/.clang-format |1 layers/CMakeLists.txt | 52 layers/core_validation.cpp| 2996 - layers/core_validation.h |7 layers/core_validation_error_enums.h |1 layers/core_validation_types.h| 15 layers/descriptor_sets.cpp| 116 layers/descriptor_sets.h | 35 layers/image.cpp | 409 - layers/linux/VkLayer_core_validation.json |2 layers/linux/VkLayer_image.json |2 layers/linux/VkLayer_object_tracker.json |2 layers/linux/VkLayer_parameter_validation.json|2 layers/linux/VkLayer_swapchain.json |2 layers/linux/VkLayer_threading.json |2 layers/linux/VkLayer_unique_objects.json |2 layers/object_tracker.cpp | 568 + layers/object_tracker.h |2 layers/parameter_validation.cpp | 937 ++ layers/parameter_validation_utils.h | 77 layers/spec.py| 20 layers/swapchain.cpp | 153 layers/swapchain.h| 14 layers/threading.cpp | 49 layers/threading.h|6 layers/unique_objects.cpp | 73 layers/vk_layer_config.h |1 layers/vk_layer_table.cpp |4 layers/vk_layer_utils.cpp |5 layers/vk_layer_utils.h |4 layers/vk_validation_error_database.txt | 4570 +++--- layers/vk_validation_error_messages.h | 34 layers/vk_validation_stats.py | 126 layers/windows/VkLayer_core_validation.json |2 layers/windows/VkLayer_image.json |2 layers/windows/VkLayer_object_tracker.json|2 layers/windows/VkLayer_parameter_validation.json |2 layers/windows/VkLayer_swapchain.json |2 layers/windows/VkLayer_threading.json |2 layers/windows/VkLayer_unique_objects.json|2 libs/vkjson/vkjson_unittest.cc|4 loader/CMakeLists.txt | 16 loader/LoaderAndLayerInterface.md | 3233 + loader/debug_report.c | 18 loader/dev_ext_trampoline.c | 2509 +-- loader/extensions.c | 507 + loader/extensions.h
vulkan: Changes to 'debian-unstable'
.gitignore|4 .travis.yml |9 BUILD.md | 64 CMakeLists.txt| 44 README.md |5 build_windows_targets.bat |2 cmake/FindMir.cmake | 37 debian/changelog |7 debian/control|1 debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff | 10 debian/patches/disable-mir.diff | 11 debian/patches/series |1 debian/patches/use-mxgot-for-mips64.patch |8 demos/CMakeLists.txt | 73 demos/cube.c | 131 demos/cube.cpp| 291 demos/smoke/Main.cpp |9 demos/smoke/Shell.cpp |2 demos/smoke/ShellAndroid.cpp | 58 demos/smoke/ShellAndroid.h|2 demos/smoke/ShellWayland.cpp |2 demos/smoke/ShellWin32.cpp|2 demos/smoke/ShellXcb.cpp |2 demos/smoke/Smoke.cpp |7 demos/smoke/android/build.gradle |6 demos/vulkaninfo.c| 385 determine_vs_version.py | 115 external_revisions/glslang_revision |1 external_revisions/spirv-headers_revision |1 external_revisions/spirv-tools_revision |1 generator.py | 498 - glslang_revision |1 include/vulkan/vk_layer.h | 10 include/vulkan/vulkan.h | 247 include/vulkan/vulkan.hpp | 6041 +- layers/CMakeLists.txt | 60 layers/VkLayer_core_validation.def| 29 layers/VkLayer_image.def | 29 layers/VkLayer_object_tracker.def | 29 layers/VkLayer_parameter_validation.def | 29 layers/VkLayer_swapchain.def | 29 layers/VkLayer_threading.def | 29 layers/VkLayer_unique_objects.def | 29 layers/core_validation.cpp| 1654 ++- layers/core_validation.h | 28 layers/core_validation_error_enums.h | 383 layers/core_validation_types.h| 34 layers/descriptor_sets.cpp| 144 layers/descriptor_sets.h | 21 layers/image.cpp | 145 layers/linux/VkLayer_core_validation.json |2 layers/linux/VkLayer_image.json |2 layers/linux/VkLayer_object_tracker.json |2 layers/linux/VkLayer_parameter_validation.json|2 layers/linux/VkLayer_swapchain.json |2 layers/linux/VkLayer_threading.json |2 layers/linux/VkLayer_unique_objects.json |2 layers/object_tracker.cpp | 682 + layers/object_tracker.h |9 layers/parameter_validation.cpp | 810 + layers/spec.py|2 layers/swapchain.cpp | 643 - layers/swapchain.h| 21 layers/threading.h| 10 layers/unique_objects.cpp | 40 layers/vk_validation_error_database.txt | 1844 ++-- layers/vk_validation_error_messages.h | 1535 ++- layers/vk_validation_layer_details.md | 391 layers/vk_validation_stats.py | 53 layers/windows/VkLayer_core_validation.json |2 layers/windows/VkLayer_image.json |2 layers/windows/VkLayer_object_tracker.json|2 layers/windows/VkLayer_parameter_validation.json |2 layers/windows/VkLayer_swapchain.json |2
vulkan: Changes to 'debian-unstable'
.gitignore |2 BUILD.md | 101 CMakeLists.txt | 41 CONTRIBUTING.md |2 build_windows_targets.bat|8 cmake/FindImageMagick.cmake | 153 common/android_util.cpp | 87 common/android_util.h| 32 debian/changelog |9 debian/patches/demos-add-install-rule.diff |9 debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff| 87 debian/patches/layers-install-to-cmake-install-libdir.diff | 26 debian/patches/loader-add-install-rule.diff | 14 debian/patches/series|3 debian/patches/trim-build.diff |2 debian/patches/use-mxgot-for-mips64.patch|4 demos/CMakeLists.txt | 92 demos/android/AndroidManifest.xml.cube | 22 demos/android/AndroidManifest.xml.tri| 22 demos/android/cube-with-layers/AndroidManifest.xml | 27 demos/android/cube-with-layers/custom_rules.xml | 25 demos/android/cube-with-layers/res/values/strings.xml| 24 demos/android/cube/AndroidManifest.xml | 27 demos/android/cube/custom_rules.xml |6 demos/android/cube/res/values/strings.xml| 24 demos/android/include/tri.frag.h | 95 demos/android/include/tri.vert.h | 128 demos/android/jni/Android.mk | 16 demos/android/jni/Application.mk |2 demos/android/res/values/strings.xml | 24 demos/cube.c | 653 demos/cube.cpp | 2880 + demos/smoke/CMakeLists.txt |5 demos/smoke/Game.cpp | 36 demos/smoke/Game.h | 36 demos/smoke/Smoke.cpp| 10 demos/smoke/android/build-and-install| 27 demos/smoke/android/build.gradle |6 demos/smoke/android/gradle/wrapper/gradle-wrapper.properties |2 demos/smoke/android/src/main/AndroidManifest.xml |5 demos/smoke/generate-dispatch-table | 492 demos/smoke/generate-dispatch-table.py | 492 demos/tri.c | 2797 - demos/tri.frag | 29 demos/tri.vcxproj.user | 11 demos/tri.vert | 33 demos/vulkaninfo.c | 37 generator.py | 3318 - genvk.py | 358 glslang_revision |2 include/vulkan/vk_icd.h |9 include/vulkan/vk_platform.h |2 include/vulkan/vulkan.h | 44 include/vulkan/vulkan.hpp| 407 layers/CMakeLists.txt| 78 layers/README.md | 19 layers/core_validation.cpp | 4345 + layers/core_validation.h | 106 layers/core_validation_error_enums.h | 13 layers/core_validation_types.h | 215 layers/descriptor_sets.cpp | 382 layers/descriptor_sets.h | 34 layers/image.cpp | 399 layers/image.h |4 layers/linux/VkLayer_core_validation.json|2 layers/linux/VkLayer_image.json |2 layers/linux/VkLayer_object_tracker.json |2 layers/linux/VkLayer_parameter_validation.json |2 layers/linux/VkLayer_swapchain.json |2 layers/linux/VkLayer_threading.json |2 layers/linux/VkLayer_unique_objects.json |2
vulkan: Changes to 'debian-unstable'
debian/changelog|7 ++ debian/copyright|4 + debian/patches/install-vulkan-intel-header.diff | 68 debian/patches/series |1 4 files changed, 80 insertions(+) New commits: commit 7cdce4b723313f6d36a97c244c860f9872e4702a Author: Andreas BollDate: Thu Oct 6 11:59:45 2016 +0200 Ship vulkan_intel.h via libvulkan-dev (Imported from Mesa source package). diff --git a/debian/changelog b/debian/changelog index 4df80be..7cb1345 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vulkan (1.0.26.0+dfsg1-2) UNRELEASED; urgency=medium + + * Ship vulkan_intel.h via libvulkan-dev (Imported from Mesa source +package). + + -- Andreas Boll Thu, 06 Oct 2016 11:59:16 +0200 + vulkan (1.0.26.0+dfsg1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/copyright b/debian/copyright index c1a06fb..f493a5f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -40,6 +40,10 @@ Files: debian/* Copyright: 2016 Timo Aaltonen License: MIT +Files: debian/patches/install-vulkan-intel-header.diff +Copyright: 2015 Intel Corporation +License: MIT + Files: debian/SPIRV/spirv.hpp Copyright: 2014-2016 The Khronos Group Inc. License: MIT diff --git a/debian/patches/install-vulkan-intel-header.diff b/debian/patches/install-vulkan-intel-header.diff new file mode 100644 index 000..18bad9c --- /dev/null +++ b/debian/patches/install-vulkan-intel-header.diff @@ -0,0 +1,68 @@ +diff --git a/include/vulkan/vulkan_intel.h b/include/vulkan/vulkan_intel.h +new file mode 100644 +index 000..8ede61b +--- /dev/null b/include/vulkan/vulkan_intel.h +@@ -0,0 +1,62 @@ ++/* ++ * Copyright © 2015 Intel Corporation ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. ++ */ ++ ++#ifndef __VULKAN_INTEL_H__ ++#define __VULKAN_INTEL_H__ ++ ++#include "vulkan.h" ++ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif // __cplusplus ++ ++#define VK_STRUCTURE_TYPE_DMA_BUF_IMAGE_CREATE_INFO_INTEL 1024 ++typedef struct VkDmaBufImageCreateInfo_ ++{ ++VkStructureType sType; // Must be VK_STRUCTURE_TYPE_DMA_BUF_IMAGE_CREATE_INFO_INTEL ++const void* pNext; // Pointer to next structure. ++int fd; ++VkFormatformat; ++VkExtent3D extent; // Depth must be 1 ++uint32_tstrideInBytes; ++} VkDmaBufImageCreateInfo; ++ ++typedef VkResult (VKAPI_PTR *PFN_vkCreateDmaBufImageINTEL)(VkDevice device, const VkDmaBufImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMem, VkImage* pImage); ++ ++#ifndef VK_NO_PROTOTYPES ++ ++VKAPI_ATTR VkResult VKAPI_CALL vkCreateDmaBufImageINTEL( ++VkDevice_device, ++const VkDmaBufImageCreateInfo* pCreateInfo, ++const VkAllocationCallbacks*pAllocator, ++VkDeviceMemory* pMem, ++VkImage*pImage); ++ ++#endif ++ ++#ifdef __cplusplus ++} // extern "C" ++#endif // __cplusplus ++ ++#endif // __VULKAN_INTEL_H__ diff --git a/debian/patches/series b/debian/patches/series index d8cfb66..611ed45 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ loader-add-install-rule.diff demos-add-install-rule.diff layers-install-to-cmake-install-libdir.diff use-mxgot-for-mips64.patch +install-vulkan-intel-header.diff
vulkan: Changes to 'debian-unstable'
CMakeLists.txt | 21 README.md |8 build_windows_targets.bat | 12 debian/changelog |7 debian/patches/layers-install-to-cmake-install-libdir.diff |2 debian/patches/loader-add-install-rule.diff|4 debian/patches/trim-build.diff |2 debian/patches/use-mxgot-for-mips64.patch |6 demos/android/include/lunarg.ppm.h | 4776 +-- demos/cube.c | 372 demos/cube.vert|4 demos/lunarg.ppm | 248 demos/tri.c| 45 demos/vulkaninfo.c | 105 generator.py | 146 glslang_revert_a5c33d.patch.txt| 18 glslang_revision |2 include/vulkan/vk_layer.h | 13 include/vulkan/vk_platform.h | 14 include/vulkan/vulkan.h| 169 include/vulkan/vulkan.hpp |20419 + layers/CMakeLists.txt | 10 layers/README.md |2 layers/core_validation.cpp | 2431 + layers/core_validation.h | 86 layers/core_validation_error_enums.h | 14 layers/core_validation_types.h | 192 layers/descriptor_sets.cpp | 195 layers/descriptor_sets.h | 14 layers/image.cpp | 137 layers/linux/VkLayer_core_validation.json |2 layers/linux/VkLayer_image.json|2 layers/linux/VkLayer_object_tracker.json |2 layers/linux/VkLayer_parameter_validation.json |2 layers/linux/VkLayer_swapchain.json|2 layers/linux/VkLayer_threading.json|2 layers/linux/VkLayer_unique_objects.json |2 layers/object_tracker.cpp | 4050 ++ layers/object_tracker.h| 1176 layers/parameter_name.h| 148 layers/parameter_validation.cpp| 2342 - layers/parameter_validation_utils.h| 299 layers/swapchain.cpp | 1593 - layers/swapchain.h | 60 layers/unique_objects.h| 196 layers/vk_layer_config.cpp |4 layers/vk_layer_config.h |2 layers/vk_layer_logging.h |9 layers/vk_layer_settings.txt |6 layers/vk_layer_table.cpp |1 layers/vk_layer_utils.cpp | 416 layers/vk_layer_utils.h|1 layers/vk_validation_layer_details.md | 77 layers/windows/VkLayer_core_validation.json|2 layers/windows/VkLayer_image.json |2 layers/windows/VkLayer_object_tracker.json |2 layers/windows/VkLayer_parameter_validation.json |2 layers/windows/VkLayer_swapchain.json |2 layers/windows/VkLayer_threading.json |2 layers/windows/VkLayer_unique_objects.json |2 libs/vkjson/CMakeLists.txt |4 libs/vkjson/vkjson_instance.cc |9 loader/CMakeLists.txt |4 loader/LoaderAndLayerInterface.md | 124 loader/debug_report.c | 87 loader/dev_ext_trampoline.c| 1500 loader/extensions.c| 171 loader/extensions.h| 38 loader/gpa_helper.h|4 loader/loader.c| 496 loader/loader.h| 39 loader/loader.rc |4 loader/table_ops.h | 28
vulkan: Changes to 'debian-unstable'
Rebased ref, commits from common ancestor: commit 4db793decacfe9f0c97f903d37a0729972c9d37e Author: Timo AaltonenDate: Fri Aug 19 00:30:16 2016 +0300 release to sid diff --git a/debian/changelog b/debian/changelog index 37b9b63..c9f3e5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vulkan (1.0.21.0+dfsg1-1) UNRELEASED; urgency=medium +vulkan (1.0.21.0+dfsg1-1) unstable; urgency=medium * New upstream release. * copyright: Update excludes. @@ -15,7 +15,7 @@ vulkan (1.0.21.0+dfsg1-1) UNRELEASED; urgency=medium a patch to fix the build on mips64 in case the build is revived later. (Closes: #827651) - -- Timo Aaltonen Thu, 30 Jun 2016 13:28:49 +0300 + -- Timo Aaltonen Fri, 19 Aug 2016 00:29:31 +0300 vulkan (1.0.8.0+dfsg1-1) unstable; urgency=medium commit d7ed2d1e996f04e0ec79b3b3253b21b57da6aa58 Author: Timo Aaltonen Date: Fri Aug 19 00:29:28 2016 +0300 drop layer stuff from libvulkan1 diff --git a/debian/libvulkan1.install b/debian/libvulkan1.install index f55d4cf..3ddde58 100644 --- a/debian/libvulkan1.install +++ b/debian/libvulkan1.install @@ -1,3 +1 @@ usr/lib/*/lib*.so.* -usr/share/vulkan/explicit_layer.d -usr/share/vulkan/implicit_layer.d diff --git a/debian/rules b/debian/rules index 1659a40..25809ca 100755 --- a/debian/rules +++ b/debian/rules @@ -23,12 +23,12 @@ override_dh_auto_install: mkdir -p debian/tmp/usr/include cp -rp include/vulkan debian/tmp/usr/include - mkdir -p debian/tmp/usr/share/vulkan/explicit_layer.d \ -debian/tmp/usr/share/vulkan/implicit_layer.d - for i in $(shell cd layers/linux/; ls *.json) ; do \ - sed 's@./@@' layers/linux/$$i > \ - debian/tmp/usr/share/vulkan/explicit_layer.d/$$i \ - ; done +# mkdir -p debian/tmp/usr/share/vulkan/explicit_layer.d \ +# debian/tmp/usr/share/vulkan/implicit_layer.d +# for i in $(shell cd layers/linux/; ls *.json) ; do \ +# sed 's@./@@' layers/linux/$$i > \ +# debian/tmp/usr/share/vulkan/explicit_layer.d/$$i \ +# ; done override_dh_install: dh_install --fail-missing
vulkan: Changes to 'debian-unstable'
CMakeLists.txt | 10 build_windows_targets.bat | 12 cmake/FindWayland.cmake| 66 debian/changelog | 16 debian/control | 12 debian/libvulkan1.install |2 debian/libvulkan1.postinst | 13 debian/libvulkan1.postrm | 13 debian/patches/demos-add-install-rule.diff |2 debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff |2 debian/patches/layers-install-to-cmake-install-libdir.diff |4 debian/patches/loader-add-install-rule.diff|4 debian/patches/series |1 debian/patches/trim-build.diff |3 debian/patches/use-mxgot-for-mips64.patch | 18 demos/CMakeLists.txt | 32 demos/android/include/lunarg.ppm.h |4 demos/cube.c | 228 demos/smoke/CMakeLists.txt | 19 demos/smoke/Helpers.h |9 demos/smoke/Main.cpp | 15 demos/smoke/Shell.cpp | 25 demos/smoke/Shell.h|1 demos/smoke/ShellWayland.cpp | 290 demos/smoke/ShellWayland.h | 69 demos/smoke/generate-dispatch-table|1 demos/tri.c| 183 demos/vulkaninfo.c |2 generator.py | 17 glslang_revert_a5c33d.patch.txt| 18 glslang_revision |2 include/vulkan/vulkan.h| 34 layers/CMakeLists.txt |2 layers/README.md |5 layers/core_validation.cpp | 3810 +++-- layers/core_validation.h | 65 layers/core_validation_error_enums.h | 20 layers/core_validation_types.h | 86 layers/descriptor_sets.cpp | 98 layers/descriptor_sets.h | 14 layers/device_limits.cpp | 816 -- layers/device_limits.h | 70 layers/linux/VkLayer_core_validation.json |2 layers/linux/VkLayer_device_limits.json| 17 layers/linux/VkLayer_image.json|2 layers/linux/VkLayer_object_tracker.json |2 layers/linux/VkLayer_parameter_validation.json |2 layers/linux/VkLayer_swapchain.json|2 layers/linux/VkLayer_threading.json|2 layers/linux/VkLayer_unique_objects.json |2 layers/object_tracker.h| 122 layers/parameter_validation.cpp| 235 layers/parameter_validation_utils.h|4 layers/swapchain.cpp | 377 + layers/swapchain.h | 10 layers/threading.cpp | 94 layers/threading.h | 52 layers/unique_objects.h| 203 layers/vk_layer_config.cpp |4 layers/vk_layer_settings.txt |4 layers/vk_validation_layer_details.md | 80 layers/windows/VkLayer_core_validation.json|2 layers/windows/VkLayer_device_limits.json | 17 layers/windows/VkLayer_image.json |2 layers/windows/VkLayer_object_tracker.json |2 layers/windows/VkLayer_parameter_validation.json |2 layers/windows/VkLayer_swapchain.json |2 layers/windows/VkLayer_threading.json |2 layers/windows/VkLayer_unique_objects.json |2 libs/vkjson/vkjson_info.cc |2 loader/CMakeLists.txt |3 loader/LoaderAndLayerInterface.md | 155 loader/cJSON.c |4 loader/cJSON.h
vulkan: Changes to 'debian-unstable'
debian/changelog |1 + debian/control |6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 6eef923fb29730b5083e53f2108e255630b049b6 Author: Timo AaltonenDate: Mon Jul 18 13:34:07 2016 +0300 control: Build only on linux. diff --git a/debian/changelog b/debian/changelog index 8e002b7..cc023a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ vulkan (1.0.17.0+dfsg1-1) UNRELEASED; urgency=medium * New upstream release. * copyright: Update excludes. * patches: Refreshed. + * control: Build only on linux, others are not supported. -- Timo Aaltonen Thu, 30 Jun 2016 13:28:49 +0300 diff --git a/debian/control b/debian/control index 31863c7..b1c6ca4 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/vulkan.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/vulkan.git Package: libvulkan1 -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Vulkan loader library The Loader implements the main VK library. It handles layer management and @@ -29,7 +29,7 @@ Description: Vulkan loader library Package: libvulkan-dev Section: libdevel -Architecture: any +Architecture: linux-any Depends: libvulkan1 (= ${binary:Version}), ${misc:Depends}, @@ -42,7 +42,7 @@ Description: Vulkan loader library -- development files This package includes files needed for development. Package: vulkan-utils -Architecture: any +Architecture: linux-any Section: graphics Depends: ${shlibs:Depends}, ${misc:Depends}, libvulkan1,
vulkan: Changes to 'debian-unstable'
debian/copyright |1 + 1 file changed, 1 insertion(+) New commits: commit e8ffab86a38319e83b8badbdba70e12a4a8b94a8 Author: Timo AaltonenDate: Mon Apr 18 11:18:25 2016 +0300 drop gradle-wrapper.jar from the tarball diff --git a/debian/copyright b/debian/copyright index f8ffc21..126b19b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,6 +3,7 @@ Upstream-Name: Vulkan-LoaderAndValidationLayers Source: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers Files-Excluded: buildAndroid + demos/smoke/android/gradle/wrapper/gradle-wrapper.jar tests/gtest-* windowsRuntimeInstaller
vulkan: Changes to 'debian-unstable'
debian/copyright | 24 +--- 1 file changed, 21 insertions(+), 3 deletions(-) New commits: commit 68b724d44495c3d74eed1b5557e9bfc88ace935c Author: Timo AaltonenDate: Fri Apr 15 13:36:50 2016 +0300 update copyright a bit. diff --git a/debian/copyright b/debian/copyright index 18b0a44..f8ffc21 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,9 +12,27 @@ Copyright: 2015-2016 Valve Corporation 2015-2016 The Khronos Group Inc 2005-2014 G-Truc Creation 2015-2016 LunarG, Inc - 2009 Dave Gamble - 1997, 2003 Kevlin Henney - 2014 joseph werle +License: MIT + +Files: loader/cJSON.* +Copyright: 2009 Dave Gamble + 2015-2016 The Khronos Group Inc + 2015-2016 Valve Corporation + 2015-2016 LunarG, Inc +License: MIT + +Files: loader/dirent_on_windows.* +Copyright: 1997, 2003 Kevlin Henney + 2015-2016 The Khronos Group Inc + 2015-2016 Valve Corporation + 2015-2016 LunarG, Inc +License: MIT + +Files: loader/murmurhash.* +Copyright: 2014 joseph werle + 2015-2016 The Khronos Group Inc + 2015-2016 Valve Corporation + 2015-2016 LunarG, Inc License: MIT Files: debian/*
vulkan: Changes to 'debian-unstable'
BUILD.md | 64 CMakeLists.txt | 117 buildAndroid/android-generate.bat | 33 buildAndroid/android-generate.sh | 29 buildAndroid/jni/Android.mk| 143 buildAndroid/jni/Application.mk| 21 build_windows_targets.bat | 76 debian/SPIRV/spirv.hpp | 879 + debian/changelog | 11 debian/control |4 debian/copyright |8 debian/local/spirv.hpp | 879 - debian/patches/layers-dont-set-an-rpath.diff |4 debian/patches/layers-install-to-cmake-install-libdir.diff |8 debian/patches/layers-use-local-spirv-hpp.diff | 11 debian/patches/loader-add-install-rule.diff|4 debian/patches/series |1 debian/patches/trim-build.diff |6 debian/rules |3 debian/watch |2 demos/CMakeLists.txt | 32 demos/cube.c | 170 demos/cube.vcxproj.user|6 demos/smoke/CMakeLists.txt | 10 demos/smoke/Shell.cpp |2 demos/tri.c| 162 demos/tri.vcxproj.user |6 demos/vulkaninfo.c | 76 demos/vulkaninfo.vcxproj.user |6 generator.py | 547 genvk.py | 59 glslang_revision |2 include/vulkan/vk_layer.h | 31 include/vulkan/vk_platform.h |8 include/vulkan/vulkan.h| 75 layers/CMakeLists.txt | 31 layers/README.md | 15 layers/core_validation.cpp |11041 + layers/core_validation.h | 933 + layers/device_limits.cpp | 73 layers/draw_state.cpp | 8427 - layers/draw_state.h| 702 layers/image.cpp | 310 layers/image.h |3 layers/linux/VkLayer_core_validation.json | 22 layers/linux/VkLayer_device_limits.json|2 layers/linux/VkLayer_draw_state.json | 17 layers/linux/VkLayer_image.json|2 layers/linux/VkLayer_mem_tracker.json | 17 layers/linux/VkLayer_object_tracker.json |2 layers/linux/VkLayer_param_checker.json| 17 layers/linux/VkLayer_parameter_validation.json | 17 layers/linux/VkLayer_swapchain.json|2 layers/linux/VkLayer_threading.json|2 layers/linux/VkLayer_unique_objects.json |2 layers/mem_tracker.cpp | 3255 --- layers/mem_tracker.h | 218 layers/object_tracker.h| 31 layers/param_checker.cpp | 5131 -- layers/param_checker_utils.h | 308 layers/parameter_validation.cpp| 3872 layers/parameter_validation_utils.h| 571 layers/swapchain.cpp | 164 layers/swapchain.h |5 layers/threading.cpp | 39 layers/unique_objects.h|1 layers/vk_layer_logging.h | 23 layers/vk_layer_settings.txt | 25 layers/vk_layer_utils.cpp | 49 layers/vk_layer_utils.h|7 layers/vk_validation_layer_details.md | 139 layers/windows/VkLayer_core_validation.json| 17 layers/windows/VkLayer_device_limits.json |
vulkan: Changes to 'debian-unstable'
.gitignore |2 BUILD.md | 338 CMakeLists.txt | 43 CONTRIBUTING.md | 90 LunarGLASS_revision |1 LunarGLASS_revision_R32 |1 README.md| 34 buildAndroid/android-generate.bat| 33 buildAndroid/android-generate.sh |8 buildAndroid/jni/Android.mk | 277 buildAndroid/jni/Application.mk |6 debian/changelog |9 debian/control |2 debian/patches/demos-add-install-rule.diff |7 debian/patches/demos-dont-build-tri-or-cube-or-smoke.diff| 40 debian/patches/demos-dont-build-tri-or-cube.diff | 39 debian/patches/layers-install-to-cmake-install-libdir.diff |6 debian/patches/layers-use-local-spirv-hpp.diff |2 debian/patches/loader-add-install-rule.diff |6 debian/patches/series|2 debian/patches/trim-build.diff |2 demos/CMakeLists.txt |9 demos/cube.c | 66 demos/smoke/CMakeLists.txt | 78 demos/smoke/Game.h | 133 demos/smoke/Helpers.h| 131 demos/smoke/Main.cpp | 90 demos/smoke/Meshes.cpp | 537 demos/smoke/Meshes.h | 67 demos/smoke/Meshes.teapot.h | 2666 +++ demos/smoke/README.md|1 demos/smoke/Shell.cpp| 591 demos/smoke/Shell.h | 162 demos/smoke/ShellAndroid.cpp | 227 demos/smoke/ShellAndroid.h | 68 demos/smoke/ShellWin32.cpp | 256 demos/smoke/ShellWin32.h | 63 demos/smoke/ShellXcb.cpp | 344 demos/smoke/ShellXcb.h | 62 demos/smoke/Simulation.cpp | 327 demos/smoke/Simulation.h | 112 demos/smoke/Smoke.cpp| 915 + demos/smoke/Smoke.frag | 12 demos/smoke/Smoke.h | 195 demos/smoke/Smoke.push_constant.vert | 27 demos/smoke/Smoke.vert | 27 demos/smoke/android/build-and-install| 30 demos/smoke/android/build.gradle | 87 demos/smoke/android/gradle/wrapper/gradle-wrapper.jar|binary demos/smoke/android/gradle/wrapper/gradle-wrapper.properties |6 demos/smoke/android/gradlew | 160 demos/smoke/android/gradlew.bat | 90 demos/smoke/android/src/main/AndroidManifest.xml | 20 demos/smoke/android/src/main/jni/Smoke.frag.h| 78 demos/smoke/android/src/main/jni/Smoke.push_constant.vert.h | 352 demos/smoke/android/src/main/jni/Smoke.vert.h| 354 demos/smoke/android/src/main/res/values/strings.xml |4 demos/smoke/generate-dispatch-table | 498 demos/smoke/glsl-to-spirv| 100 demos/tri.c | 232 demos/vulkaninfo.c | 100 generator.py | 3254 genvk.py | 337 glslang_revision |2 include/vulkan/vk_debug_marker_layer.h | 44 include/vulkan/vk_icd.h | 13 include/vulkan/vk_layer.h| 15 include/vulkan/vk_lunarg_debug_marker.h | 98 include/vulkan/vk_platform.h |2 include/vulkan/vulkan.h | 34 layers/.clang-format |6
vulkan: Changes to 'debian-unstable'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 62b72a5d7fdf282dcf0185f04bf9e3136ee3c964 Author: Timo AaltonenDate: Thu Mar 10 14:28:51 2016 +0200 upload to unstable diff --git a/debian/changelog b/debian/changelog index d710023..67300fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -vulkan (1.0.3.1+dfsg1-1) UNRELEASED; urgency=low +vulkan (1.0.3.1+dfsg1-1) unstable; urgency=low * Initial release (Closes: #814922) - -- Timo Aaltonen Fri, 22 Jan 2016 00:37:00 +0200 + -- Timo Aaltonen Thu, 10 Mar 2016 14:08:35 +0200
vulkan: Changes to 'debian-unstable'
debian/changelog|2 debian/control |3 - debian/copyright|2 debian/patches/demos-add-install-rule.diff |5 - debian/patches/demos-dont-build-tri-or-cube.diff| 39 + debian/patches/demos-read-from-installed-paths.diff | 59 debian/patches/demos-use-prebuilt-spvs.diff | 44 -- debian/patches/layers-dont-set-an-rpath.diff|2 debian/patches/series |3 - debian/rules|4 - debian/vulkan-utils.install |5 - debian/watch|6 -- dev/null|binary 13 files changed, 49 insertions(+), 125 deletions(-) New commits: commit bb8d67ad57553cf721985d75889d5c0d7a86751c Author: Timo AaltonenDate: Thu Mar 10 13:52:43 2016 +0200 try to use mk-origtargz diff --git a/debian/changelog b/debian/changelog index 06ebd71..d710023 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vulkan (1.0.3.1-1) UNRELEASED; urgency=low +vulkan (1.0.3.1+dfsg1-1) UNRELEASED; urgency=low * Initial release (Closes: #814922) diff --git a/debian/copyright b/debian/copyright index 14bb325..156ce2e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,8 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Vulkan-LoaderAndValidationLayers Source: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers +Files-Excluded: tests/gtest-* windowsruntimeinstaller + Files: * Copyright: 2015-2016 Valve Corporation 2015-2016 Google, Inc diff --git a/debian/watch b/debian/watch index 4e4e6f8..d39766f 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,4 @@ version=3 -opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/vulkan-$1.tar.gz/" \ +opts="repack,uversionmangle=s/$/+dfsg1/,filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/vulkan-$1.tar.gz/" \ https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags (?:.*?/)sdk_(\d[\d.]*)\.tar\.gz - -# https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz commit 16f2c88aff8954f7de0d92daa014f3b691b344e3 Author: Timo Aaltonen Date: Thu Mar 10 12:59:00 2016 +0200 watch: updated diff --git a/debian/watch b/debian/watch index 78c30d7..4e4e6f8 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,6 @@ version=3 opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/vulkan-$1.tar.gz/" \ - https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags (?:.*?/)sdk-(\d[\d.]*)\.tar\.gz + https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags (?:.*?/)sdk_(\d[\d.]*)\.tar\.gz # https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz commit f5c4a7f4e3fecf0fc1e0d3452f0f81bc331ec540 Author: Timo Aaltonen Date: Thu Mar 10 12:34:57 2016 +0200 Revert "build cube & tri, and hack around so they have what they need to work" This reverts commit 871ea91322a66793869c3c60fd4e068c8358ff88. the binary blobs aren't distributable diff --git a/debian/control b/debian/control index 015d81a..a695565 100644 --- a/debian/control +++ b/debian/control @@ -45,5 +45,4 @@ Section: graphics Depends: ${shlibs:Depends}, ${misc:Depends}, libvulkan1, Description: Miscellaneous Vulkan utilities - This package provides a few demo programs to test Vulkan functionality, - including vkcube, vktri and vulkaninfo. + This package provides utilities for Vulkan, including vulkaninfo. diff --git a/debian/local/cube-frag.spv b/debian/local/cube-frag.spv deleted file mode 100644 index 15db12c..000 Binary files a/debian/local/cube-frag.spv and /dev/null differ diff --git a/debian/local/cube-vert.spv b/debian/local/cube-vert.spv deleted file mode 100644 index 0e27210..000 Binary files a/debian/local/cube-vert.spv and /dev/null differ diff --git a/debian/local/tri-frag.spv b/debian/local/tri-frag.spv deleted file mode 100644 index 122c06f..000 Binary files a/debian/local/tri-frag.spv and /dev/null differ diff --git a/debian/local/tri-vert.spv b/debian/local/tri-vert.spv deleted file mode 100644 index 45ca768..000 Binary files a/debian/local/tri-vert.spv and /dev/null differ diff --git a/debian/patches/demos-add-install-rule.diff b/debian/patches/demos-add-install-rule.diff index ce2580e..c1f56e2 100644 --- a/debian/patches/demos-add-install-rule.diff +++ b/debian/patches/demos-add-install-rule.diff @@ -1,11 +1,8 @@ Description: Add an install rule for vulkaninfo --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -93,6 +93,7 @@ else() +@@ -93,3 +93,4 @@ else()
vulkan: Changes to 'debian-unstable'
debian/control |1 - debian/patches/trim-build.diff | 11 --- 2 files changed, 12 deletions(-) New commits: commit 7c58376f561779ea97a0db5d494984a7afcba6eb Author: Timo AaltonenDate: Sun Feb 21 13:48:41 2016 +0200 don't try to build wayland support, with a typo fixed it just fails to build diff --git a/debian/control b/debian/control index 2e83e9b..015d81a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Maintainer: Debian X Strike Force Uploaders: Timo Aaltonen Build-Depends: debhelper (>= 9), cmake, - libwayland-dev, libxcb1-dev, pkg-config, python3, diff --git a/debian/patches/trim-build.diff b/debian/patches/trim-build.diff index 9694798..aeace9d 100644 --- a/debian/patches/trim-build.diff +++ b/debian/patches/trim-build.diff @@ -1,16 +1,5 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -31,8 +31,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux - # add_definitions(-DVK_USE_PLATFORM_MIR_KHR) - # set(DisplayServer Mir) - --# add_definitions(-DVK_USEPLATFORM_WAYLAND_KHR) --# set(DisplayServer Wayland) -+add_definitions(-DVK_USEPLATFORM_WAYLAND_KHR) -+set(DisplayServer Wayland) - - else() - message(FATAL_ERROR "Unsupported Platform!") @@ -65,10 +65,10 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_C endif()
vulkan: Changes to 'debian-unstable'
debian/source/format |2 +- debian/source/include-binaries |4 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 41d01f9b3aa55da7d1e8654ba3fb6560385643b0 Author: Timo AaltonenDate: Fri Feb 19 00:39:32 2016 +0200 use source 3.0 (quilt) because of the prebuilt shader binaries.. diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 000..69d9fa9 --- /dev/null +++ b/debian/source/include-binaries @@ -0,0 +1,4 @@ +debian/local/cube-frag.spv +debian/local/cube-vert.spv +debian/local/tri-frag.spv +debian/local/tri-vert.spv
vulkan: Changes to 'debian-unstable'
debian/control |9 +++ debian/libvulkan1.install |4 - debian/local/cube-frag.spv |binary debian/local/cube-vert.spv |binary debian/local/tri-frag.spv |binary debian/local/tri-vert.spv |binary debian/patches/demos-add-install-rule.diff |5 + debian/patches/demos-dont-build-tri-or-cube.diff| 39 - debian/patches/demos-read-from-installed-paths.diff | 59 debian/patches/demos-use-prebuilt-spvs.diff | 44 ++ debian/patches/layers-dont-set-an-rpath.diff|2 debian/patches/series |3 - debian/rules|4 + debian/vulkan-utils.install |5 + 14 files changed, 129 insertions(+), 45 deletions(-) New commits: commit 871ea91322a66793869c3c60fd4e068c8358ff88 Author: Timo AaltonenDate: Thu Feb 18 20:36:17 2016 +0200 build cube & tri, and hack around so they have what they need to work diff --git a/debian/control b/debian/control index 4cec439..2e83e9b 100644 --- a/debian/control +++ b/debian/control @@ -39,3 +39,12 @@ Description: Vulkan loader library -- development files layers, based on the GPU object selected by the application. . This package includes files needed for development. + +Package: vulkan-utils +Architecture: any +Section: graphics +Depends: ${shlibs:Depends}, ${misc:Depends}, + libvulkan1, +Description: Miscellaneous Vulkan utilities + This package provides a few demo programs to test Vulkan functionality, + including vkcube, vktri and vulkaninfo. diff --git a/debian/libvulkan1.install b/debian/libvulkan1.install index 6f85934..b90e938 100644 --- a/debian/libvulkan1.install +++ b/debian/libvulkan1.install @@ -1,5 +1,5 @@ -usr/bin/vulkaninfo usr/lib/*/lib*.so.* usr/lib/*/liblayer_utils.so usr/lib/*/libVk*.so -usr/share/vulkan +usr/share/vulkan/explicit_layer.d +usr/share/vulkan/implicit_layer.d diff --git a/debian/local/cube-frag.spv b/debian/local/cube-frag.spv new file mode 100644 index 000..15db12c Binary files /dev/null and b/debian/local/cube-frag.spv differ diff --git a/debian/local/cube-vert.spv b/debian/local/cube-vert.spv new file mode 100644 index 000..0e27210 Binary files /dev/null and b/debian/local/cube-vert.spv differ diff --git a/debian/local/tri-frag.spv b/debian/local/tri-frag.spv new file mode 100644 index 000..122c06f Binary files /dev/null and b/debian/local/tri-frag.spv differ diff --git a/debian/local/tri-vert.spv b/debian/local/tri-vert.spv new file mode 100644 index 000..45ca768 Binary files /dev/null and b/debian/local/tri-vert.spv differ diff --git a/debian/patches/demos-add-install-rule.diff b/debian/patches/demos-add-install-rule.diff index c1f56e2..ce2580e 100644 --- a/debian/patches/demos-add-install-rule.diff +++ b/debian/patches/demos-add-install-rule.diff @@ -1,8 +1,11 @@ Description: Add an install rule for vulkaninfo --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -93,3 +93,4 @@ else() +@@ -93,6 +93,7 @@ else() add_executable(vulkaninfo WIN32 vulkaninfo.c) endif() target_link_libraries(vulkaninfo ${LIBRARIES}) +install(TARGETS vulkaninfo RUNTIME DESTINATION /usr/bin) + + if(UNIX) + add_executable(tri tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv) diff --git a/debian/patches/demos-dont-build-tri-or-cube.diff b/debian/patches/demos-dont-build-tri-or-cube.diff deleted file mode 100644 index f26490e..000 --- a/debian/patches/demos-dont-build-tri-or-cube.diff +++ /dev/null @@ -1,39 +0,0 @@ -commit f63cbe944107b5cd8f150ceaaec43b26099d5688 -Author: Adam Jackson -Date: Tue Feb 16 10:05:25 2016 -0500 - -demos: Don't build tri or cube - -There are more interesting demos, all we really want here is vulkaninfo. -This helps because we don't need to pre-build glslang/llvm/lunarglass -just to get the loader and layers. - -diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt -index ebc406b..a21760b 100644 a/demos/CMakeLists.txt -+++ b/demos/CMakeLists.txt -@@ -93,24 +93,3 @@ else() - add_executable(vulkaninfo WIN32 vulkaninfo.c) - endif() - target_link_libraries(vulkaninfo ${LIBRARIES}) -- --if(UNIX) --add_executable(tri tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv) --else() --add_executable(tri WIN32 tri.c ${CMAKE_BINARY_DIR}/demos/tri-vert.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv) --endif() --target_link_libraries(tri ${LIBRARIES}) -- --if(NOT WIN32) --add_executable(cube cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv) --target_link_libraries(cube ${LIBRARIES}) --else() --if (CMAKE_CL_64) --set (LIB_DIR "Win64") --else() --
vulkan: Changes to 'debian-unstable'
debian/control |1 + 1 file changed, 1 insertion(+) New commits: commit 8bed4ac6ac104db1b01041ccb434cdbfec208fe7 Author: Timo AaltonenDate: Thu Feb 18 12:57:29 2016 +0200 add python3 to build-deps diff --git a/debian/control b/debian/control index cb80840..4cec439 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9), libwayland-dev, libxcb1-dev, pkg-config, + python3, quilt, Standards-Version: 3.9.6 Section: libs
vulkan: Changes to 'debian-unstable'
debian/control |1 + debian/patches/trim-build.diff | 11 +++ 2 files changed, 12 insertions(+) New commits: commit 896be361f5e31550123d98c33cb230114eb4c642 Author: Timo AaltonenDate: Thu Feb 18 11:15:17 2016 +0200 enable waylang platform diff --git a/debian/control b/debian/control index 3a41e62..cb80840 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Maintainer: Debian X Strike Force Uploaders: Timo Aaltonen Build-Depends: debhelper (>= 9), cmake, + libwayland-dev, libxcb1-dev, pkg-config, quilt, diff --git a/debian/patches/trim-build.diff b/debian/patches/trim-build.diff index aeace9d..9694798 100644 --- a/debian/patches/trim-build.diff +++ b/debian/patches/trim-build.diff @@ -1,5 +1,16 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt +@@ -31,8 +31,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux + # add_definitions(-DVK_USE_PLATFORM_MIR_KHR) + # set(DisplayServer Mir) + +-# add_definitions(-DVK_USEPLATFORM_WAYLAND_KHR) +-# set(DisplayServer Wayland) ++add_definitions(-DVK_USEPLATFORM_WAYLAND_KHR) ++set(DisplayServer Wayland) + + else() + message(FATAL_ERROR "Unsupported Platform!") @@ -65,10 +65,10 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_C endif()
vulkan: Changes to 'debian-unstable'
debian/changelog |2 +- debian/control |6 +++--- debian/rules |2 +- debian/watch |2 +- 4 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 3901e8db2dc5824d8488ec7acab6e5d92828df4c Author: Timo AaltonenDate: Wed Feb 17 22:59:15 2016 +0200 rename the source to vulkan, it's more than just the loader diff --git a/debian/changelog b/debian/changelog index 8d26db9..7fb5ae6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vulkan-loader (1.0.3~git20160215-1) UNRELEASED; urgency=low +vulkan (1.0.3~git20160215-1) UNRELEASED; urgency=low * Initial release (Closes: #814922) diff --git a/debian/control b/debian/control index 11a29d8..3a41e62 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: vulkan-loader +Source: vulkan Priority: optional Maintainer: Debian X Strike Force Uploaders: Timo Aaltonen @@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 9), Standards-Version: 3.9.6 Section: libs Homepage: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers -Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/lib/vulkan-loader.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/vulkan-loader.git +Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/lib/vulkan.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/vulkan.git Package: libvulkan1 Architecture: any diff --git a/debian/rules b/debian/rules index 9a9f286..7dc8b5d 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ override_dh_auto_install: override_dh_install: dh_install --fail-missing -gentarball: SOURCE=vulkan-loader +gentarball: SOURCE=vulkan gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//') gentarball: git archive --format=tar upstream-unstable-trim --prefix=$(SOURCE)-$(UV)/ | gzip -9 > ../$(SOURCE)_$(UV).orig.tar.gz diff --git a/debian/watch b/debian/watch index da17f7a..78c30d7 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,6 @@ version=3 -opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/vulkan-loader-$1.tar.gz/" \ +opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/vulkan-$1.tar.gz/" \ https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags (?:.*?/)sdk-(\d[\d.]*)\.tar\.gz # https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz