From bcf6a2430e99e8fc24f9f266e99316905e6d5134 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Mon, 27 Apr 2020 02:12:05 -0600 Subject: [PATCH] Move to SPIR-V 1.5 Rev. 3, bump revision, remove a status from README. --- README.md | 2 -- SPIRV/spirv.hpp | 4 ++-- glslang/Include/revision.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 462240a1a..ff844c028 100755 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ [![Build Status](https://travis-ci.org/KhronosGroup/glslang.svg?branch=master)](https://travis-ci.org/KhronosGroup/glslang) [![Build status](https://ci.appveyor.com/api/projects/status/q6fi9cb0qnhkla68/branch/master?svg=true)](https://ci.appveyor.com/project/Khronoswebmaster/glslang/branch/master) -Note: Current master failed for process reasons in Travis CI, but is okay. - ## Planned Deprecations/Removals 1. **SPIRV Folder, 1-May, 2020.** Glslang, when installed through CMake, diff --git a/SPIRV/spirv.hpp b/SPIRV/spirv.hpp index 2b7e80f83..dae36cf20 100644 --- a/SPIRV/spirv.hpp +++ b/SPIRV/spirv.hpp @@ -50,11 +50,11 @@ namespace spv { typedef unsigned int Id; #define SPV_VERSION 0x10500 -#define SPV_REVISION 1 +#define SPV_REVISION 3 static const unsigned int MagicNumber = 0x07230203; static const unsigned int Version = 0x00010500; -static const unsigned int Revision = 1; +static const unsigned int Revision = 3; static const unsigned int OpCodeMask = 0xffff; static const unsigned int WordCountShift = 16; diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index f096716eb..744c2fb42 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -1,3 +1,3 @@ // This header is generated by the make-revision script. -#define GLSLANG_PATCH_LEVEL 3741 +#define GLSLANG_PATCH_LEVEL 3743