From f8d40ddf29351dadccfa86b73cbbad0eba56d0c8 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Jun 16 2017 08:50:25 +0000 Subject: Update to 1.0.51.0 release --- diff --git a/0003-layers-Don-t-set-an-rpath.patch b/0003-layers-Don-t-set-an-rpath.patch index 35b9627..edab110 100644 --- a/0003-layers-Don-t-set-an-rpath.patch +++ b/0003-layers-Don-t-set-an-rpath.patch @@ -1,7 +1,7 @@ --- a/tests/layers/CMakeLists.txt +++ b/tests/layers/CMakeLists.txt @@ -4,9 +4,6 @@ - VkLayer_wrap_objects + VkLayer_device_profile_api VkLayer_test ) - diff --git a/sources b/sources index 1eb36c5..85572b1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0.tar.gz) = dc0728c00e017a2ed0b1e34a500a6335f6dee5dd77c7801d7d450c68c6e8c7cd5dec640be6dec1dea28941d927764a636b82a628e0260ca724163afa4152d8b6 -SHA512 (SPIRV-Tools-7fe8a57a5bd72094e91f9f93e51dac2f2461dcb4.tar.gz) = 39528fdcad71ed7b5d0d9d78c2997126d5985a97297c328c35c6e8099a73cc2cccb6264828c9edcbdb5177ab6c970f4da62c7a1fb927dd49949f912e815aab60 -SHA512 (SPIRV-Headers-6c08995e6e7b94129e6086c78198c77111f2f262.tar.gz) = b58e7f41d53d8d8454104b78e86a16e0acca567f2ba1a1ed9db42dd8f92195a657640fd5b61a4261736ef759aec59a4c9aebe1041ac67275ff448a3c252291f1 -SHA512 (glslang-714e58b2fc5a45714596e6aa2f6ac8f64260365c.tar.gz) = 64dbbf0dd6c5def3cacb5a016922df8372bbf15624d832825ca2896f20c12b0fa61b0d12b79ae1fb5591dd50fd9582952656f3e35b5ba1767d3618507449b24e +SHA512 (glslang-91c46c656720a6e1e71a3411cd1f4f792b427b2d.tar.gz) = d71c3f55aacd5362612f2ea4c4d2a2f54150d725ad287ab8ff675b7653c2b0bcabd54a54d16a6cc989e7dc7b4e044ce64b2ba8b62aff2170e224eeb02b59b4a4 +SHA512 (SPIRV-Headers-63e1062a194750b354d48be8c16750d7a4d0dc4e.tar.gz) = b5c0d15bdf24f7ba4e4beee87678dee5c3fc994c7afccf6a8ddabefce1478abd32b0eee2fd740fec6fa9502ef0bf27066cab16179b9916793fdd5ee300c374e6 +SHA512 (SPIRV-Tools-7c8da66bc27cc5c4ccb6a0fa612f56c9417518ff.tar.gz) = 4934253845d2fc01c556ae33aa587907a5100f805b9160b8ad09ebb29677c14d6b2c772544e6df041dd432eb903873a52d83de3baf24158ef43cb6b0b43fb247 +SHA512 (Vulkan-LoaderAndValidationLayers-sdk-1.0.51.0.tar.gz) = 5d198fc9537c8fa3cbde19fc74f8d47595fabcb52c8db1c626fa157f171ed74ad202e086f7c9e94827c1ab682d03bae58af690c510c6705ca92db0548ee575f6 diff --git a/spirv.hpp b/spirv.hpp old mode 100755 new mode 100644 index 5580c40..91cb59e --- a/spirv.hpp +++ b/spirv.hpp @@ -61,6 +61,7 @@ enum SourceLanguage { SourceLanguageGLSL = 2, SourceLanguageOpenCL_C = 3, SourceLanguageOpenCL_CPP = 4, + SourceLanguageHLSL = 5, SourceLanguageMax = 0x7fffffff, }; @@ -137,6 +138,7 @@ enum StorageClass { StorageClassPushConstant = 9, StorageClassAtomicCounter = 10, StorageClassImage = 11, + StorageClassStorageBuffer = 12, StorageClassMax = 0x7fffffff, }; @@ -616,12 +618,16 @@ enum Capability { CapabilitySubgroupBallotKHR = 4423, CapabilityDrawParameters = 4427, CapabilitySubgroupVoteKHR = 4431, + CapabilityStorageBuffer16BitAccess = 4433, CapabilityStorageUniformBufferBlock16 = 4433, CapabilityStorageUniform16 = 4434, + CapabilityUniformAndStorageBuffer16BitAccess = 4434, CapabilityStoragePushConstant16 = 4435, CapabilityStorageInputOutput16 = 4436, CapabilityDeviceGroup = 4437, CapabilityMultiView = 4439, + CapabilityVariablePointersStorageBuffer = 4441, + CapabilityVariablePointers = 4442, CapabilitySampleMaskOverrideCoverageNV = 5249, CapabilityGeometryShaderPassthroughNV = 5251, CapabilityShaderViewportIndexLayerNV = 5254, diff --git a/vulkan.spec b/vulkan.spec index 6032066..4b2ee1e 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -9,23 +9,24 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global srcname Vulkan-LoaderAndValidationLayers +%global commit1 91c46c656720a6e1e71a3411cd1f4f792b427b2d + %if 0%{?use_layers} -%global commit1 714e58b2fc5a45714596e6aa2f6ac8f64260365c %global srcname1 glslang -%global commit2 6c08995e6e7b94129e6086c78198c77111f2f262 +%global commit2 63e1062a194750b354d48be8c16750d7a4d0dc4e %global srcname2 SPIRV-Headers -%global commit3 7fe8a57a5bd72094e91f9f93e51dac2f2461dcb4 +%global commit3 7c8da66bc27cc5c4ccb6a0fa612f56c9417518ff %global srcname3 SPIRV-Tools %endif Name: vulkan -Version: 1.0.46.0 +Version: 1.0.51.0 %if 0%{?use_git} -Release: 0.3.git%{shortcommit}%{?dist} +Release: 0.1.git%{shortcommit}%{?dist} %else -Release: 3%{?dist} +Release: 1%{?dist} %endif Summary: Vulkan loader and validation layers @@ -42,12 +43,11 @@ Source1: %url/%{srcname1}/archive/%{commit1}.tar.gz#/%{srcname1}-%{commit Source2: %url/%{srcname2}/archive/%{commit2}.tar.gz#/%{srcname2}-%{commit2}.tar.gz Source3: %url/%{srcname3}/archive/%{commit3}.tar.gz#/%{srcname3}-%{commit3}.tar.gz %else -Source4: https://raw.githubusercontent.com/KhronosGroup/glslang/master/SPIRV/spirv.hpp +Source4: https://raw.githubusercontent.com/KhronosGroup/glslang/%{commit1}/SPIRV/spirv.hpp %endif Patch0: 0003-layers-Don-t-set-an-rpath.patch Patch1: 0008-demos-Don-t-build-tri-or-cube.patch -Patch2: smoke-check-for-installed-so.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -128,7 +128,7 @@ pushd external/glslang/build/ CFLAGS="$RPM_OPT_FLAGS" ; export CFLAGS ; CXXFLAGS="$RPM_OPT_FLAGS" ; export CXXFLAGS ; LDFLAGS="$RPM_LD_FLAGS" ; export LDFLAGS ; -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. %make_build make install popd @@ -165,7 +165,8 @@ popd %if 0%{?use_layers} mkdir -p %{buildroot}%{_datadir}/vulkan/{explicit,implicit}_layer.d/ mv %{buildroot}%{_sysconfdir}/vulkan/explicit_layer.d/*.json %{buildroot}%{_datadir}/vulkan/explicit_layer.d/ -install -T build/demos/smoketest %{buildroot}%{_bindir}/vulkan-smoketest +# rename smoketest +mv %{buildroot}%{_bindir}/smoketest %{buildroot}%{_bindir}/vulkan-smoketest %else mkdir -p %{buildroot}%{_sysconfdir}/vulkan/explicit_layer.d/ mkdir -p %{buildroot}%{_datadir}/vulkan/{explicit,implicit}_layer.d/ @@ -204,6 +205,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/icd.d %dir %{_datadir}/vulkan/implicit_layer.d %changelog +* Fri Jun 16 2017 Leigh Scott - 1.0.51.0-1 +- Update to 1.0.51.0 release + * Mon May 15 2017 Fedora Release Engineering - 1.0.46.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild