Skip to content

Commit

Permalink
Update headers to SPIR-V 1.5 Revision 3
Browse files Browse the repository at this point in the history
  • Loading branch information
johnkslang committed Apr 24, 2020
1 parent 3757896 commit c0df742
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion include/spirv/unified1/spirv.core.grammar.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"magic_number" : "0x07230203",
"major_version" : 1,
"minor_version" : 5,
"revision" : 1,
"revision" : 3,
"instruction_printing_class" : [
{
"tag" : "@exclude"
Expand Down
2 changes: 1 addition & 1 deletion include/spirv/unified1/spirv.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static class Specification
{
public const uint MagicNumber = 0x07230203;
public const uint Version = 0x00010500;
public const uint Revision = 1;
public const uint Revision = 3;
public const uint OpCodeMask = 0xffff;
public const uint WordCountShift = 16;

Expand Down
4 changes: 2 additions & 2 deletions include/spirv/unified1/spirv.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
typedef unsigned int SpvId;

#define SPV_VERSION 0x10500
#define SPV_REVISION 1
#define SPV_REVISION 3

static const unsigned int SpvMagicNumber = 0x07230203;
static const unsigned int SpvVersion = 0x00010500;
static const unsigned int SpvRevision = 1;
static const unsigned int SpvRevision = 3;
static const unsigned int SpvOpCodeMask = 0xffff;
static const unsigned int SpvWordCountShift = 16;

Expand Down
4 changes: 2 additions & 2 deletions include/spirv/unified1/spirv.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions include/spirv/unified1/spirv.hpp11
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion include/spirv/unified1/spirv.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
],
"MagicNumber": 119734787,
"Version": 66816,
"Revision": 1,
"Revision": 3,
"OpCodeMask": 65535,
"WordCountShift": 16
},
Expand Down
2 changes: 1 addition & 1 deletion include/spirv/unified1/spirv.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
spv = {
MagicNumber = 0x07230203,
Version = 0x00010500,
Revision = 1,
Revision = 3,
OpCodeMask = 0xffff,
WordCountShift = 16,

Expand Down
2 changes: 1 addition & 1 deletion include/spirv/unified1/spirv.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
spv = {
'MagicNumber' : 0x07230203,
'Version' : 0x00010500,
'Revision' : 1,
'Revision' : 3,
'OpCodeMask' : 0xffff,
'WordCountShift' : 16,

Expand Down
2 changes: 1 addition & 1 deletion include/spirv/unified1/spv.d
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module spv;

enum uint MagicNumber = 0x07230203;
enum uint Version = 0x00010500;
enum uint Revision = 1;
enum uint Revision = 3;
enum uint OpCodeMask = 0xffff;
enum uint WordCountShift = 16;

Expand Down
4 changes: 2 additions & 2 deletions tools/buildHeaders/header.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ namespace {

static const int DocMagicNumber = 0x07230203;
static const int DocVersion = 0x00010500;
static const int DocRevision = 1;
#define DocRevisionString "1"
static const int DocRevision = 3;
#define DocRevisionString "3"
static const std::string DocCopyright;
static const std::string DocComment1;
static const std::string DocComment2;
Expand Down
2 changes: 1 addition & 1 deletion tools/buildHeaders/jsonToSpirv.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ enum OperandClass {
OperandMemorySemantics,
OperandMemoryOperands,
OperandScope,
OperandGroupOperation,
OperandGroupOperation,
OperandKernelEnqueueFlags,
OperandKernelProfilingInfo,
OperandCapability,
Expand Down

0 comments on commit c0df742

Please sign in to comment.