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 | 2 layers/windows/VkLayer_draw_state.json | 17 layers/windows/VkLayer_image.json | 2 layers/windows/VkLayer_mem_tracker.json | 17 layers/windows/VkLayer_object_tracker.json | 2 layers/windows/VkLayer_param_checker.json | 17 layers/windows/VkLayer_parameter_validation.json | 17 layers/windows/VkLayer_swapchain.json | 2 layers/windows/VkLayer_threading.json | 2 layers/windows/VkLayer_unique_objects.json | 2 libs/vkjson/vkjson.cc | 8 libs/vkjson/vkjson_device.cc | 2 libs/vkjson/vkjson_info.cc | 2 loader/CMakeLists.txt | 10 loader/LoaderAndLayerInterface.md | 4 loader/debug_report.c | 108 loader/debug_report.h | 21 loader/dirent_on_windows.c | 2 loader/loader.c | 284 loader/loader.h | 51 loader/trampoline.c | 192 loader/wsi.c | 279 loader/wsi.h | 3 spirv-tools_revision | 2 tests/CMakeLists.txt | 42 tests/layer_validation_tests.cpp | 199 tests/test_environment.cpp | 2 tests/vk_layer_settings.txt | 10 tests/vkrenderframework.cpp | 21 tests/vkrenderframework.h | 14 tests/vktestbinding.cpp | 2 tests/vktestbinding.h | 49 tests/vktestframeworkandroid.cpp | 80 tests/vulkan_wrapper.cpp | 401 tests/vulkan_wrapper.h | 232 update_external_sources.bat | 8 vk-layer-generate.py | 411 vk.xml | 830 vk_layer_documentation_generate.py | 12 111 files changed, 21121 insertions(+), 21227 deletions(-)
New commits: commit 9166065b44e33a920b5c71f3e457270179b816d8 Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Apr 14 13:58:13 2016 +0300 release to unstable diff --git a/debian/changelog b/debian/changelog index 16ee915..9d68646 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vulkan (1.0.8.0+dfsg1-1) UNRELEASED; urgency=medium +vulkan (1.0.8.0+dfsg1-1) unstable; urgency=medium * New upstream release. * patches: Refreshed. @@ -12,7 +12,7 @@ vulkan (1.0.8.0+dfsg1-1) UNRELEASED; urgency=medium * control: Bump policy to 3.9.7, no changes. * control: Use https for Vcs-Git. - -- Timo Aaltonen <tjaal...@debian.org> Tue, 15 Mar 2016 15:27:12 +0200 + -- Timo Aaltonen <tjaal...@debian.org> Thu, 14 Apr 2016 13:57:37 +0300 vulkan (1.0.3.1+dfsg1-1) unstable; urgency=low commit 31ac880e1ada18324fec6c48f9888ee75e35320f Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Apr 14 13:57:22 2016 +0300 control: Use https for Vcs-Git. diff --git a/debian/changelog b/debian/changelog index 2022cf5..16ee915 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ vulkan (1.0.8.0+dfsg1-1) UNRELEASED; urgency=medium * watch: Match more tags. * copyright: Add buildAndroid to Files-Excluded. * control: Bump policy to 3.9.7, no changes. + * control: Use https for Vcs-Git. -- Timo Aaltonen <tjaal...@debian.org> Tue, 15 Mar 2016 15:27:12 +0200 diff --git a/debian/control b/debian/control index 2b37c6a..31863c7 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9), Standards-Version: 3.9.7 Section: libs Homepage: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers -Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/lib/vulkan.git +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 commit cdcbf009bbfc041eaf89a408703f2218a31248f0 Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Apr 14 13:56:40 2016 +0300 control: Bump policy to 3.9.7, no changes. diff --git a/debian/changelog b/debian/changelog index f11265e..2022cf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ vulkan (1.0.8.0+dfsg1-1) UNRELEASED; urgency=medium * copyright: Fix Files-Excluded. * watch: Match more tags. * copyright: Add buildAndroid to Files-Excluded. + * control: Bump policy to 3.9.7, no changes. -- Timo Aaltonen <tjaal...@debian.org> Tue, 15 Mar 2016 15:27:12 +0200 diff --git a/debian/control b/debian/control index 7231448..2b37c6a 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), python3, python3-lxml, quilt, -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Section: libs Homepage: https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/lib/vulkan.git commit 392cb5b50418160ac45c7ef4c83e0bb7bb20d910 Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Apr 14 13:56:14 2016 +0300 remove buildAndroid, we don't need it diff --git a/buildAndroid/android-generate.bat b/buildAndroid/android-generate.bat deleted file mode 100644 index bf05352..0000000 --- a/buildAndroid/android-generate.bat +++ /dev/null @@ -1,33 +0,0 @@ -@echo off -REM # Copyright 2015 The Android Open Source Project -REM # Copyright (C) 2015 Valve Corporation -REM -REM # Licensed under the Apache License, Version 2.0 (the "License"); -REM # you may not use this file except in compliance with the License. -REM # You may obtain a copy of the License at -REM -REM # http://www.apache.org/licenses/LICENSE-2.0 -REM -REM # Unless required by applicable law or agreed to in writing, software -REM # distributed under the License is distributed on an "AS IS" BASIS, -REM # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM # See the License for the specific language governing permissions and -REM # limitations under the License. - -if exist generated ( - rmdir /s /q generated -) -mkdir generated - -python ../vk-generate.py Android dispatch-table-ops layer > generated/vk_dispatch_table_helper.h - -python ../vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated -python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated - -python ../vk-layer-generate.py Android object_tracker ../include/vulkan/vulkan.h > generated/object_tracker.cpp -python ../vk-layer-generate.py Android unique_objects ../include/vulkan/vulkan.h > generated/unique_objects.cpp - -cd generated -python ../../genvk.py threading -registry ../../vk.xml thread_check.h -python ../../genvk.py paramchecker -registry ../../vk.xml parameter_validation.h -cd .. diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh deleted file mode 100755 index 928a176..0000000 --- a/buildAndroid/android-generate.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# Copyright 2015 The Android Open Source Project -# Copyright (C) 2015 Valve Corporation - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P) -cd $dir - -rm -rf generated -mkdir -p generated -python ../vk-generate.py Android dispatch-table-ops layer > generated/vk_dispatch_table_helper.h - -python ../vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated -python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated - -python ../vk-layer-generate.py Android object_tracker ../include/vulkan/vulkan.h > generated/object_tracker.cpp -python ../vk-layer-generate.py Android unique_objects ../include/vulkan/vulkan.h > generated/unique_objects.cpp -( cd generated; python ../../genvk.py threading -registry ../../vk.xml thread_check.h ) -( cd generated; python ../../genvk.py paramchecker -registry ../../vk.xml parameter_validation.h ) - -exit 0 diff --git a/buildAndroid/glslang_revision_android b/buildAndroid/glslang_revision_android deleted file mode 100644 index c48dee1..0000000 --- a/buildAndroid/glslang_revision_android +++ /dev/null @@ -1 +0,0 @@ -3c5b1e6b31aca0eb52fe7e82a963ff735f1de31b diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk deleted file mode 100644 index 334c0f7..0000000 --- a/buildAndroid/jni/Android.mk +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 2015 The Android Open Source Project -# Copyright (C) 2015 Valve Corporation - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(abspath $(call my-dir)) -MY_PATH := $(LOCAL_PATH) -SRC_DIR := $(LOCAL_PATH)/../../ - -include $(CLEAR_VARS) -LOCAL_MODULE := layer_utils -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_config.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_extension_utils.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_utils.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/loader -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_core_validation -LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_validation.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(MY_PATH)/../generated \ - $(SRC_DIR)/loader \ - $(SRC_DIR)/../glslang -LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_device_limits -LOCAL_SRC_FILES += $(SRC_DIR)/layers/device_limits.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(MY_PATH)/../generated \ - $(SRC_DIR)/loader -LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_image -LOCAL_SRC_FILES += $(SRC_DIR)/layers/image.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(MY_PATH)/../generated \ - $(SRC_DIR)/loader -LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_parameter_validation -LOCAL_SRC_FILES += $(SRC_DIR)/layers/parameter_validation.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(MY_PATH)/../generated \ - $(SRC_DIR)/layers \ - $(SRC_DIR)/loader -LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_object_tracker -LOCAL_SRC_FILES += $(MY_PATH)/../generated/object_tracker.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(MY_PATH)/../generated \ - $(SRC_DIR)/loader -LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_threading -LOCAL_SRC_FILES += $(SRC_DIR)/layers/threading.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(MY_PATH)/../generated \ - $(SRC_DIR)/loader -LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_unique_objects -LOCAL_SRC_FILES += $(MY_PATH)/../generated/unique_objects.cpp -LOCAL_SRC_FILES += $(MY_PATH)/../generated/vk_safe_struct.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(MY_PATH)/../generated \ - $(SRC_DIR)/loader -LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_swapchain -LOCAL_SRC_FILES += $(SRC_DIR)/layers/swapchain.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(MY_PATH)/../generated \ - $(SRC_DIR)/loader -LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) - -# Pull in prebuilt shaderc -include $(CLEAR_VARS) -LOCAL_MODULE := shaderc-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libshaderc.a -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := glslang-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libglslang.a -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := OGLCompiler-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libOGLCompiler.a -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := OSDependent-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libOSDependent.a -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := shaderc_util-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libshaderc_util.a -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := SPIRV-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV.a -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := SPIRV-Tools-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV-Tools.a -include $(PREBUILT_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := VkLayerValidationTests -LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \ - $(SRC_DIR)/tests/vktestbinding.cpp \ - $(SRC_DIR)/tests/vktestframeworkandroid.cpp \ - $(SRC_DIR)/tests/vkrenderframework.cpp \ - $(SRC_DIR)/tests/vulkan_wrapper.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(SRC_DIR)/libs \ - $(SRC_DIR)/icd/common \ - $(SRC_DIR)/../shaderc/libshaderc/include/ - -LOCAL_STATIC_LIBRARIES := googletest_main layer_utils -LOCAL_SHARED_LIBRARIES += shaderc-prebuilt glslang-prebuilt OGLCompiler-prebuilt OSDependent-prebuilt shaderc_util-prebuilt SPIRV-prebuilt SPIRV-Tools-prebuilt -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/tests/vulkan_wrapper.h -LOCAL_LDLIBS := -llog -include $(BUILD_EXECUTABLE) - -$(call import-module,third_party/googletest) diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk deleted file mode 100644 index 70d7cc2..0000000 --- a/buildAndroid/jni/Application.mk +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2015 The Android Open Source Project -# Copyright (C) 2015 Valve Corporation - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64 -APP_PLATFORM := android-22 -APP_STL := gnustl_static -APP_MODULES := layer_utils VkLayer_core_validation VkLayer_device_limits VkLayer_image VkLayer_parameter_validation VkLayer_object_tracker VkLayer_threading VkLayer_swapchain VkLayer_unique_objects VkLayerValidationTests -APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -NDK_TOOLCHAIN_VERSION := clang diff --git a/buildAndroid/shaderc_revision_android b/buildAndroid/shaderc_revision_android deleted file mode 100644 index 04b2324..0000000 --- a/buildAndroid/shaderc_revision_android +++ /dev/null @@ -1 +0,0 @@ -53cf6692879c6dcd5f4ccdffb8c10bb17b5e9d55 diff --git a/buildAndroid/spirv-tools_revision_android b/buildAndroid/spirv-tools_revision_android deleted file mode 100644 index e83c901..0000000 --- a/buildAndroid/spirv-tools_revision_android +++ /dev/null @@ -1 +0,0 @@ -9149a66ca406d86967b104cac209bad309fd2c33 diff --git a/buildAndroid/update_external_sources_android.bat b/buildAndroid/update_external_sources_android.bat deleted file mode 100755 index f2b719f..0000000 --- a/buildAndroid/update_external_sources_android.bat +++ /dev/null @@ -1,238 +0,0 @@ -@echo off -REM Update source for glslang, spirv-tools, and shaderc - -REM -REM Copyright 2016 The Android Open Source Project -REM Copyright (C) 2015 Valve Corporation -REM -REM Licensed under the Apache License, Version 2.0 (the "License"); -REM you may not use this file except in compliance with the License. -REM You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. -REM - -setlocal EnableDelayedExpansion -set errorCode=0 -set ANDROID_BUILD_DIR=%~dp0 -set BUILD_DIR=%ANDROID_BUILD_DIR%.. -set BASE_DIR=%BUILD_DIR%\.. -set GLSLANG_DIR=%BASE_DIR%\glslang -set SPIRV_TOOLS_DIR=%BASE_DIR%\spirv-tools -set SHADERC_DIR=%BASE_DIR%\shaderc - -for %%X in (where.exe) do (set FOUND=%%~$PATH:X) -if not defined FOUND ( - echo Dependency check failed: - echo where.exe not found - echo This script requires Windows Vista or later, which includes where.exe. - set errorCode=1 -) - -where /q git.exe -if %ERRORLEVEL% equ 1 ( - echo Dependency check failed: - echo git.exe not found - echo Git for Windows can be downloaded here: https://git-scm.com/download/win - echo Install and ensure git.exe makes it into your PATH - set errorCode=1 -) - -where /q ndk-build.cmd -if %ERRORLEVEL% equ 1 ( - echo Dependency check failed: - echo ndk-build.cmd not found - echo Android NDK can be downloaded here: http://developer.android.com/ndk/guides/setup.html - echo Install and ensure ndk-build.cmd makes it into your PATH - set errorCode=1 -) - -REM ensure where is working with below false test -REM where /q foo -REM if %ERRORLEVEL% equ 1 ( -REM echo foo -REM ) - -:main - -if %errorCode% neq 0 (goto:error) - -REM Read the target versions from external file, which is shared with Linux script - -if not exist %ANDROID_BUILD_DIR%\glslang_revision_android ( - echo. - echo Missing glslang_revision_android file. Place it in %ANDROID_BUILD_DIR% - goto:error -) - -if not exist %ANDROID_BUILD_DIR%\spirv-tools_revision_android ( - echo. - echo Missing spirv-tools_revision_android file. Place it in %ANDROID_BUILD_DIR% - set errorCode=1 - goto:error -) - -if not exist %ANDROID_BUILD_DIR%\shaderc_revision_android ( - echo. - echo Missing shaderc_revision_android file. Place it in %ANDROID_BUILD_DIR% - set errorCode=1 - goto:error -) - -set /p GLSLANG_REVISION= < glslang_revision_android -set /p SPIRV_TOOLS_REVISION= < spirv-tools_revision_android -set /p SHADERC_REVISION= < shaderc_revision_android -echo GLSLANG_REVISION=%GLSLANG_REVISION% -echo SPIRV_TOOLS_REVISION=%SPIRV_TOOLS_REVISION% -echo SHADERC_REVISION=%SHADERC_REVISION% - - -echo Creating and/or updating glslang, spirv-tools, shaderc in %BASE_DIR% - -set sync-glslang=1 -set sync-spirv-tools=1 -set sync-shaderc=1 -set build-shaderc=1 - -if %sync-glslang% equ 1 ( - if exist %GLSLANG_DIR% ( - rd /S /Q %GLSLANG_DIR% - ) - if not exist %GLSLANG_DIR% ( - call:create_glslang - ) - if %errorCode% neq 0 (goto:error) - call:update_glslang - if %errorCode% neq 0 (goto:error) -) - -if %sync-spirv-tools% equ 1 ( - if exist %SPIRV_TOOLS_DIR% ( - rd /S /Q %SPIRV_TOOLS_DIR% - ) - if %errorlevel% neq 0 (goto:error) - if not exist %SPIRV_TOOLS_DIR% ( - call:create_spirv-tools - ) - if %errorCode% neq 0 (goto:error) - call:update_spirv-tools - if %errorCode% neq 0 (goto:error) -) - -if %sync-shaderc% equ 1 ( - if exist %SHADERC_DIR% ( - rd /S /Q %SHADERC_DIR% - ) - if not exist %SHADERC_DIR% ( - call:create_shaderc - ) - if %errorCode% neq 0 (goto:error) - call:update_shaderc - if %errorCode% neq 0 (goto:error) -) - -if %build-shaderc% equ 1 ( - call:build_shaderc - if %errorCode% neq 0 (goto:error) -) - -echo. -echo Exiting -goto:finish - -:error -echo. -echo Halting due to error -goto:finish - -:finish -if not "%cd%\" == "%BUILD_DIR%" ( cd %BUILD_DIR% ) -endlocal -goto:eof - - - -REM // ======== Functions ======== // - -:create_glslang - echo. - echo Creating local glslang repository %GLSLANG_DIR%) - mkdir %GLSLANG_DIR% - cd %GLSLANG_DIR% - git clone https://github.com/KhronosGroup/glslang.git . - git checkout %GLSLANG_REVISION% - if not exist %GLSLANG_DIR%\SPIRV ( - echo glslang source download failed! - set errorCode=1 - ) -goto:eof - -:update_glslang - echo. - echo Updating %GLSLANG_DIR% - cd %GLSLANG_DIR% - git fetch --all - git checkout %GLSLANG_REVISION% -goto:eof - -:create_spirv-tools - echo. - echo Creating local spirv-tools repository %SPIRV_TOOLS_DIR%) - mkdir %SPIRV_TOOLS_DIR% - cd %SPIRV_TOOLS_DIR% - git clone https://github.com/KhronosGroup/SPIRV-Tools.git . - git checkout %SPIRV_TOOLS_REVISION% - if not exist %SPIRV_TOOLS_DIR%\source ( - echo spirv-tools source download failed! - set errorCode=1 - ) -goto:eof - -:update_spirv-tools - echo. - echo Updating %SPIRV_TOOLS_DIR% - cd %SPIRV_TOOLS_DIR% - git fetch --all - git checkout %SPIRV_TOOLS_REVISION% -goto:eof - -:create_shaderc - echo. - echo Creating local shaderc repository %SHADERC_DIR%) - mkdir %SHADERC_DIR% - cd %SHADERC_DIR% - git clone g...@github.com:google/shaderc.git . - git checkout %SHADERC_REVISION% - if not exist %SHADERC_DIR%\libshaderc ( - echo shaderc source download failed! - set errorCode=1 - ) -goto:eof - -:update_shaderc - echo. - echo Updating %SHADERC_DIR% - cd %SHADERC_DIR% - git fetch --all - git checkout %SHADERC_REVISION% -goto:eof - -:build_shaderc - echo. - echo Building %SHADERC_DIR% - cd %SHADERC_DIR%\android_test - echo Building shaderc with Android NDK - call ndk-build THIRD_PARTY_PATH=../.. -j 4 - REM Check for existence of one lib, even though we should check for all results - if not exist %SHADERC_DIR%\android_test\obj\local\x86\libshaderc.a ( - echo. - echo shaderc build failed! - set errorCode=1 - ) -goto:eof diff --git a/buildAndroid/update_external_sources_android.sh b/buildAndroid/update_external_sources_android.sh deleted file mode 100755 index b40a367..0000000 --- a/buildAndroid/update_external_sources_android.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash -# Update source for glslang, spirv-tools, shaderc - -# Copyright 2016 The Android Open Source Project -# Copyright (C) 2015 Valve Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -ANDROIDBUILDDIR=$PWD -BUILDDIR=$ANDROIDBUILDDIR/.. -BASEDIR=$BUILDDIR/.. - -GLSLANG_REVISION=$(cat $ANDROIDBUILDDIR/glslang_revision_android) -SPIRV_TOOLS_REVISION=$(cat $ANDROIDBUILDDIR/spirv-tools_revision_android) -SHADERC_REVISION=$(cat $ANDROIDBUILDDIR/shaderc_revision_android) - -echo "GLSLANG_REVISION=$GLSLANG_REVISION" -echo "SPIRV_TOOLS_REVISION=$SPIRV_TOOLS_REVISION" -echo "SHADERC_REVISION=$SHADERC_REVISION" - -function create_glslang () { - rm -rf $BASEDIR/glslang - echo "Creating local glslang repository ($BASEDIR/glslang)." - mkdir -p $BASEDIR/glslang - cd $BASEDIR/glslang - git clone https://github.com/KhronosGroup/glslang.git . - git checkout $GLSLANG_REVISION -} - -function update_glslang () { - echo "Updating $BASEDIR/glslang" - cd $BASEDIR/glslang - git fetch --all - git checkout $GLSLANG_REVISION -} - -function create_spirv-tools () { - rm -rf $BASEDIR/spirv-tools - echo "Creating local spirv-tools repository ($BASEDIR/spirv-tools)." - mkdir -p $BASEDIR/spirv-tools - cd $BASEDIR/spirv-tools - git clone https://github.com/KhronosGroup/SPIRV-Tools.git . - git checkout $SPIRV_TOOLS_REVISION -} - -function update_spirv-tools () { - echo "Updating $BASEDIR/spirv-tools" - cd $BASEDIR/spirv-tools - git fetch --all - git checkout $SPIRV_TOOLS_REVISION -} - -function create_shaderc () { - rm -rf $BASEDIR/shaderc - echo "Creating local shaderc repository ($BASEDIR/shaderc)." - cd $BASEDIR - git clone g...@github.com:google/shaderc.git - cd shaderc - git checkout $SHADERC_REVISION -} - -function update_shaderc () { - echo "Updating $BASEDIR/shaderc" - cd $BASEDIR/shaderc - git fetch --all - git checkout $SHADERC_REVISION -} - -function build_shaderc () { - echo "Building $BASEDIR/shaderc" - cd $BASEDIR/shaderc/android_test - ndk-build THIRD_PARTY_PATH=../.. -j 4 -} - -if [ ! -d "$BASEDIR/glslang" -o ! -d "$BASEDIR/glslang/.git" -o -d "$BASEDIR/glslang/.svn" ]; then - create_glslang -fi - update_glslang - - -if [ ! -d "$BASEDIR/spirv-tools" -o ! -d "$BASEDIR/spirv-tools/.git" ]; then - create_spirv-tools -fi -update_spirv-tools - -if [ ! -d "$BASEDIR/shaderc" -o ! -d "$BASEDIR/shaderc/.git" ]; then - create_shaderc -fi -update_shaderc -build_shaderc - -echo "" -echo "${0##*/} finished." - commit 42f790f5308c9d04831566390dd3fe7ad44d56c9 Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Apr 14 13:54:08 2016 +0300 copyright: Add buildAndroid to Files-Excluded. diff --git a/debian/changelog b/debian/changelog index af50479..f11265e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ vulkan (1.0.8.0+dfsg1-1) UNRELEASED; urgency=medium debian/SPIRV/spirv.hpp * copyright: Fix Files-Excluded. * watch: Match more tags. + * copyright: Add buildAndroid to Files-Excluded. -- Timo Aaltonen <tjaal...@debian.org> Tue, 15 Mar 2016 15:27:12 +0200 diff --git a/debian/copyright b/debian/copyright index e3cc0aa..18b0a44 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,10 @@ 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-Excluded: + buildAndroid + tests/gtest-* + windowsRuntimeInstaller Files: * Copyright: 2015-2016 Valve Corporation commit 2ab0896d9187639b2b164bb26b95373391f89b73 Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Apr 14 13:50:41 2016 +0300 copyright: fix spirv.hpp location diff --git a/debian/copyright b/debian/copyright index 2ac7408..e3cc0aa 100644 --- a/debian/copyright +++ b/debian/copyright @@ -18,7 +18,7 @@ Files: debian/* Copyright: 2016 Timo Aaltonen <tjaal...@debian.org> License: MIT -Files: debian/local/spirv.hpp +Files: debian/SPIRV/spirv.hpp Copyright: 2014-2016 The Khronos Group Inc. License: MIT commit de47350e8bcdabfe99c6169a652b04977c59754d Author: Timo Aaltonen <tjaal...@debian.org> Date: Thu Apr 14 13:50:14 2016 +0300 refresh patches diff --git a/debian/patches/layers-dont-set-an-rpath.diff b/debian/patches/layers-dont-set-an-rpath.diff index 5d46379..7d2fd79 100644 --- a/debian/patches/layers-dont-set-an-rpath.diff +++ b/debian/patches/layers-dont-set-an-rpath.diff @@ -4,11 +4,9 @@ Date: Wed Feb 10 14:52:34 2016 -0500 layers: Don't set an rpath -diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt -index 0406a57..daa0069 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt -@@ -26,9 +26,6 @@ set(LAYER_JSON_FILES +@@ -31,9 +31,6 @@ set(LAYER_JSON_FILES VkLayer_device_limits ) diff --git a/debian/patches/layers-install-to-cmake-install-libdir.diff b/debian/patches/layers-install-to-cmake-install-libdir.diff index fc41ffd..06e0728 100644 --- a/debian/patches/layers-install-to-cmake-install-libdir.diff +++ b/debian/patches/layers-install-to-cmake-install-libdir.diff @@ -6,7 +6,7 @@ Date: Wed Feb 10 15:11:54 2016 -0500 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt -@@ -77,7 +77,7 @@ else() +@@ -75,7 +75,7 @@ else() target_link_Libraries(VkLayer_${target} layer_utils) add_dependencies(VkLayer_${target} generate_vk_layer_helpers) set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic") @@ -15,12 +15,12 @@ Date: Wed Feb 10 15:11:54 2016 -0500 endmacro() endif() -@@ -156,7 +156,7 @@ if (WIN32) +@@ -143,7 +143,7 @@ if (WIN32) set_target_properties(layer_utils_static PROPERTIES OUTPUT_NAME layer_utils) target_link_libraries(layer_utils) else() - install(TARGETS layer_utils DESTINATION ${PROJECT_BINARY_DIR}/install_staging) + install(TARGETS layer_utils DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() - - add_vk_layer(draw_state draw_state.cpp vk_layer_table.cpp) + add_vk_layer(core_validation core_validation.cpp vk_layer_table.cpp) + add_vk_layer(device_limits device_limits.cpp vk_layer_table.cpp vk_layer_utils.cpp) diff --git a/debian/patches/loader-add-install-rule.diff b/debian/patches/loader-add-install-rule.diff index 9c52313..53603cc 100644 --- a/debian/patches/loader-add-install-rule.diff +++ b/debian/patches/loader-add-install-rule.diff @@ -6,9 +6,9 @@ Date: Wed Feb 10 15:17:06 2016 -0500 --- a/loader/CMakeLists.txt