From 809d51f770bb13b632803ac82ca315f1fbc5593a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 10 Jun 2019 17:43:41 +0200 Subject: [PATCH] Release 2019.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- SPIRV-Tools_staticlib.patch | 47 --------------- sources | 2 +- spirv-tools-index-fix.patch | 112 ------------------------------------ spirv-tools.spec | 8 ++- 4 files changed, 6 insertions(+), 163 deletions(-) delete mode 100644 SPIRV-Tools_staticlib.patch delete mode 100644 spirv-tools-index-fix.patch diff --git a/SPIRV-Tools_staticlib.patch b/SPIRV-Tools_staticlib.patch deleted file mode 100644 index ba3d0f4..0000000 --- a/SPIRV-Tools_staticlib.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f/source/CMakeLists.txt -+++ SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f-new/source/CMakeLists.txt -@@ -287,7 +287,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/software_version.cpp - PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}") - --add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES}) -+add_library(${SPIRV_TOOLS} STATIC ${SPIRV_SOURCES}) - spvtools_default_compile_options(${SPIRV_TOOLS}) - target_include_directories(${SPIRV_TOOLS} - PUBLIC ${spirv-tools_SOURCE_DIR}/include - ---- SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f/source/comp/CMakeLists.txt -+++ SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f-new/source/comp/CMakeLists.txt -@@ -13,7 +13,7 @@ - # limitations under the License. - - if(SPIRV_BUILD_COMPRESSION) -- add_library(SPIRV-Tools-comp markv_codec.cpp) -+ add_library(SPIRV-Tools-comp STATIC markv_codec.cpp) - - spvtools_default_compile_options(SPIRV-Tools-comp) - target_include_directories(SPIRV-Tools-comp - ---- SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f/source/opt/CMakeLists.txt -+++ SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f-new/source/opt/CMakeLists.txt -@@ -11,7 +11,7 @@ - # 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. --add_library(SPIRV-Tools-opt -+add_library(SPIRV-Tools-opt STATIC - aggressive_dead_code_elim_pass.h - basic_block.h - block_merge_pass.h ---- SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f/source/link/CMakeLists.txt -+++ SPIRV-Tools-5834719fc17d4735fce0102738b87b70255cfd5f-new/source/link/CMakeLists.txt -@@ -11,7 +11,7 @@ - # 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. --add_library(SPIRV-Tools-link -+add_library(SPIRV-Tools-link STATIC - linker.cpp - ) - - diff --git a/sources b/sources index ffb237a..7202f85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (spirv-tools-2019.1.tar.gz) = c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4 +SHA512 (spirv-tools-2019.3.tar.gz) = 1c3a0ee2db6bb581451e1f7fcf778699ec4634ad88d69e36740ac3e9dde8e1f8ddc17bc52904728fb5019ca62ff008f12f17ce7764e09bc04aea7e8418cbe68e diff --git a/spirv-tools-index-fix.patch b/spirv-tools-index-fix.patch deleted file mode 100644 index fed9ea3..0000000 --- a/spirv-tools-index-fix.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 8d2d66f30c5c25029ac029af2bc9c4aa6979e5bc Mon Sep 17 00:00:00 2001 -From: greg-lunarg -Date: Wed, 16 Jan 2019 16:02:07 -0700 -Subject: [PATCH] Fix vertex instrumentation to use VertexIndex and - InstanceIndex (#2294) - -...instead of VertexId and InstanceId ---- - include/spirv-tools/instrument.hpp | 4 ++-- - source/opt/instrument_pass.cpp | 8 ++++---- - source/opt/ir_context.cpp | 4 ++-- - test/opt/inst_bindless_check_test.cpp | 14 +++++++------- - 4 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/include/spirv-tools/instrument.hpp b/include/spirv-tools/instrument.hpp -index 69d1ad259..f8068099c 100644 ---- a/include/spirv-tools/instrument.hpp -+++ b/include/spirv-tools/instrument.hpp -@@ -75,8 +75,8 @@ static const int kInstCommonOutCnt = 4; - // error. - // - // Vertex Shader Output Record Offsets --static const int kInstVertOutVertexId = kInstCommonOutCnt; --static const int kInstVertOutInstanceId = kInstCommonOutCnt + 1; -+static const int kInstVertOutVertexIndex = kInstCommonOutCnt; -+static const int kInstVertOutInstanceIndex = kInstCommonOutCnt + 1; - - // Frag Shader Output Record Offsets - static const int kInstFragOutFragCoordX = kInstCommonOutCnt; -diff --git a/source/opt/instrument_pass.cpp b/source/opt/instrument_pass.cpp -index 8ba8ce504..6935a43dc 100644 ---- a/source/opt/instrument_pass.cpp -+++ b/source/opt/instrument_pass.cpp -@@ -168,10 +168,10 @@ void InstrumentPass::GenStageStreamWriteCode(uint32_t stage_idx, - switch (stage_idx) { - case SpvExecutionModelVertex: { - // Load and store VertexId and InstanceId -- GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexId), -- kInstVertOutVertexId, base_offset_id, builder); -- GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceId), -- kInstVertOutInstanceId, base_offset_id, builder); -+ GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexIndex), -+ kInstVertOutVertexIndex, base_offset_id, builder); -+ GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceIndex), -+ kInstVertOutInstanceIndex, base_offset_id, builder); - } break; - case SpvExecutionModelGLCompute: { - // Load and store GlobalInvocationId. Second word is unused; store zero. -diff --git a/source/opt/ir_context.cpp b/source/opt/ir_context.cpp -index a2f207c0c..fe69027f8 100644 ---- a/source/opt/ir_context.cpp -+++ b/source/opt/ir_context.cpp -@@ -669,8 +669,8 @@ uint32_t IRContext::GetBuiltinVarId(uint32_t builtin) { - reg_type = type_mgr->GetRegisteredType(&v4float_ty); - break; - } -- case SpvBuiltInVertexId: -- case SpvBuiltInInstanceId: -+ case SpvBuiltInVertexIndex: -+ case SpvBuiltInInstanceIndex: - case SpvBuiltInPrimitiveId: - case SpvBuiltInInvocationId: - case SpvBuiltInGlobalInvocationId: { -diff --git a/test/opt/inst_bindless_check_test.cpp b/test/opt/inst_bindless_check_test.cpp -index ddafb3dc2..a426ce04c 100644 ---- a/test/opt/inst_bindless_check_test.cpp -+++ b/test/opt/inst_bindless_check_test.cpp -@@ -1650,7 +1650,7 @@ OpCapability Sampled1D - OpExtension "SPV_KHR_storage_buffer_storage_class" - %1 = OpExtInstImport "GLSL.std.450" - OpMemoryModel Logical GLSL450 --OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexID %gl_InstanceID -+OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexIndex %gl_InstanceIndex - OpSource GLSL 450 - OpName %main "main" - OpName %lod "lod" -@@ -1684,8 +1684,8 @@ OpMemberDecorate %_struct_61 0 Offset 0 - OpMemberDecorate %_struct_61 1 Offset 4 - OpDecorate %63 DescriptorSet 7 - OpDecorate %63 Binding 0 --OpDecorate %gl_VertexID BuiltIn VertexId --OpDecorate %gl_InstanceID BuiltIn InstanceId -+OpDecorate %gl_VertexIndex BuiltIn VertexIndex -+OpDecorate %gl_InstanceIndex BuiltIn InstanceIndex - %void = OpTypeVoid - %12 = OpTypeFunction %void - %float = OpTypeFloat 32 -@@ -1730,8 +1730,8 @@ OpDecorate %gl_InstanceID BuiltIn InstanceId - %uint_2 = OpConstant %uint 2 - %uint_3 = OpConstant %uint 3 - %_ptr_Input_uint = OpTypePointer Input %uint --%gl_VertexID = OpVariable %_ptr_Input_uint Input --%gl_InstanceID = OpVariable %_ptr_Input_uint Input -+%gl_VertexIndex = OpVariable %_ptr_Input_uint Input -+%gl_InstanceIndex = OpVariable %_ptr_Input_uint Input - %uint_5 = OpConstant %uint 5 - %uint_6 = OpConstant %uint 6 - %uint_7 = OpConstant %uint 7 -@@ -1819,11 +1819,11 @@ OpStore %81 %55 - %83 = OpIAdd %uint %68 %uint_3 - %84 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %83 - OpStore %84 %uint_0 --%87 = OpLoad %uint %gl_VertexID -+%87 = OpLoad %uint %gl_VertexIndex - %88 = OpIAdd %uint %68 %uint_4 - %89 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %88 - OpStore %89 %87 --%91 = OpLoad %uint %gl_InstanceID -+%91 = OpLoad %uint %gl_InstanceIndex - %93 = OpIAdd %uint %68 %uint_5 - %94 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %93 - OpStore %94 %91 diff --git a/spirv-tools.spec b/spirv-tools.spec index 85ce97c..4b9a3df 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -4,15 +4,14 @@ #global gitrel .%%{commit_date}.git%%{shortcommit} Name: spirv-tools -Version: 2019.1 -Release: 2%{?dist} +Version: 2019.3 +Release: 1%{?dist} Summary: API and commands for processing SPIR-V modules License: ASL 2.0 URL: https://github.com/KhronosGroup/SPIRV-Tools Source0: %url/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: spirv-tools-index-fix.patch BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -88,6 +87,9 @@ popd %{_libdir}/pkgconfig/SPIRV-Tools.pc %changelog +* Mon Jun 10 13:46:33 CEST 2019 Robert-André Mauchin - 2019.3-1 +- Release 2019.3 + * Thu Mar 07 2019 Dave Airlie - 2019.1-2 - Add patch to let vulkan-validation-layers build