Merge remote-tracking branch 'aosp/upstream-master' into refresh-shaderc
Includes the following commits:
e22d57b Correct Revision numbers for previous commit.
5a06681 Update to Rev. 8 of 1.0 and Rev. 4 of 1.1. Includes enums for SPV_KHR_shader_draw_parameters.
Test: checkbuild.py Linux, Windows; manually ran unit test on Windows
Change-Id: I4a55d3caf3c2b8710b4d8006a6a3f50df4e87ae4
diff --git a/include/spirv/1.0/spirv.core.grammar.json b/include/spirv/1.0/spirv.core.grammar.json
index 1466160..a3c4fad 100644
--- a/include/spirv/1.0/spirv.core.grammar.json
+++ b/include/spirv/1.0/spirv.core.grammar.json
@@ -939,7 +939,7 @@
"operands" : [
{ "kind" : "IdResultType" },
{ "kind" : "IdResult" },
- { "kind" : "IdRef", "name" : "'Image'" },
+ { "kind" : "IdRef", "name" : "'Sampled Image'" },
{ "kind" : "IdRef", "name" : "'Coordinate'" }
],
"capabilities" : [ "ImageQuery" ]
@@ -4736,6 +4736,21 @@
"enumerant" : "SubgroupLtMaskKHR",
"value" : 4420,
"capabilities" : [ "SubgroupBallotKHR" ]
+ },
+ {
+ "enumerant" : "BaseVertex",
+ "value" : 4424,
+ "capabilities" : [ "DrawParameters" ]
+ },
+ {
+ "enumerant" : "BaseInstance",
+ "value" : 4425,
+ "capabilities" : [ "DrawParameters" ]
+ },
+ {
+ "enumerant" : "DrawIndex",
+ "value" : 4426,
+ "capabilities" : [ "DrawParameters" ]
}
]
},
@@ -5084,6 +5099,11 @@
"enumerant" : "SubgroupBallotKHR",
"value" : 4423,
"extensions" : [ "SPV_KHR_shader_ballot" ]
+ },
+ {
+ "enumerant" : "DrawParameters",
+ "value" : 4427,
+ "extensions" : [ "SPV_KHR_shader_draw_parameters" ]
}
]
},
diff --git a/include/spirv/1.0/spirv.h b/include/spirv/1.0/spirv.h
index ae8dd13..fa53397 100644
--- a/include/spirv/1.0/spirv.h
+++ b/include/spirv/1.0/spirv.h
@@ -51,11 +51,11 @@
typedef unsigned int SpvId;
#define SPV_VERSION 0x10000
-#define SPV_REVISION 7
+#define SPV_REVISION 8
static const unsigned int SpvMagicNumber = 0x07230203;
static const unsigned int SpvVersion = 0x00010000;
-static const unsigned int SpvRevision = 7;
+static const unsigned int SpvRevision = 8;
static const unsigned int SpvOpCodeMask = 0xffff;
static const unsigned int SpvWordCountShift = 16;
@@ -428,6 +428,9 @@
SpvBuiltInSubgroupGtMaskKHR = 4418,
SpvBuiltInSubgroupLeMaskKHR = 4419,
SpvBuiltInSubgroupLtMaskKHR = 4420,
+ SpvBuiltInBaseVertex = 4424,
+ SpvBuiltInBaseInstance = 4425,
+ SpvBuiltInDrawIndex = 4426,
SpvBuiltInMax = 0x7fffffff,
} SpvBuiltIn;
@@ -604,6 +607,7 @@
SpvCapabilityStorageImageWriteWithoutFormat = 56,
SpvCapabilityMultiViewport = 57,
SpvCapabilitySubgroupBallotKHR = 4423,
+ SpvCapabilityDrawParameters = 4427,
SpvCapabilityMax = 0x7fffffff,
} SpvCapability;
diff --git a/include/spirv/1.0/spirv.hpp b/include/spirv/1.0/spirv.hpp
index b80a006..41a9b4d 100644
--- a/include/spirv/1.0/spirv.hpp
+++ b/include/spirv/1.0/spirv.hpp
@@ -47,11 +47,11 @@
typedef unsigned int Id;
#define SPV_VERSION 0x10000
-#define SPV_REVISION 7
+#define SPV_REVISION 8
static const unsigned int MagicNumber = 0x07230203;
static const unsigned int Version = 0x00010000;
-static const unsigned int Revision = 7;
+static const unsigned int Revision = 8;
static const unsigned int OpCodeMask = 0xffff;
static const unsigned int WordCountShift = 16;
@@ -424,6 +424,9 @@
BuiltInSubgroupGtMaskKHR = 4418,
BuiltInSubgroupLeMaskKHR = 4419,
BuiltInSubgroupLtMaskKHR = 4420,
+ BuiltInBaseVertex = 4424,
+ BuiltInBaseInstance = 4425,
+ BuiltInDrawIndex = 4426,
BuiltInMax = 0x7fffffff,
};
@@ -600,6 +603,7 @@
CapabilityStorageImageWriteWithoutFormat = 56,
CapabilityMultiViewport = 57,
CapabilitySubgroupBallotKHR = 4423,
+ CapabilityDrawParameters = 4427,
CapabilityMax = 0x7fffffff,
};
diff --git a/include/spirv/1.0/spirv.hpp11 b/include/spirv/1.0/spirv.hpp11
index 284a378..ca93d69 100644
--- a/include/spirv/1.0/spirv.hpp11
+++ b/include/spirv/1.0/spirv.hpp11
@@ -47,11 +47,11 @@
typedef unsigned int Id;
#define SPV_VERSION 0x10000
-#define SPV_REVISION 7
+#define SPV_REVISION 8
static const unsigned int MagicNumber = 0x07230203;
static const unsigned int Version = 0x00010000;
-static const unsigned int Revision = 7;
+static const unsigned int Revision = 8;
static const unsigned int OpCodeMask = 0xffff;
static const unsigned int WordCountShift = 16;
@@ -424,6 +424,9 @@
SubgroupGtMaskKHR = 4418,
SubgroupLeMaskKHR = 4419,
SubgroupLtMaskKHR = 4420,
+ BaseVertex = 4424,
+ BaseInstance = 4425,
+ DrawIndex = 4426,
Max = 0x7fffffff,
};
@@ -600,6 +603,7 @@
StorageImageWriteWithoutFormat = 56,
MultiViewport = 57,
SubgroupBallotKHR = 4423,
+ DrawParameters = 4427,
Max = 0x7fffffff,
};
diff --git a/include/spirv/1.0/spirv.json b/include/spirv/1.0/spirv.json
index c7f5369..66f0350 100644
--- a/include/spirv/1.0/spirv.json
+++ b/include/spirv/1.0/spirv.json
@@ -52,7 +52,7 @@
],
"MagicNumber": 119734787,
"Version": 65536,
- "Revision": 7,
+ "Revision": 8,
"OpCodeMask": 65535,
"WordCountShift": 16
},
@@ -466,7 +466,10 @@
"SubgroupGeMaskKHR": 4417,
"SubgroupGtMaskKHR": 4418,
"SubgroupLeMaskKHR": 4419,
- "SubgroupLtMaskKHR": 4420
+ "SubgroupLtMaskKHR": 4420,
+ "BaseVertex": 4424,
+ "BaseInstance": 4425,
+ "DrawIndex": 4426
}
},
{
@@ -626,7 +629,8 @@
"StorageImageReadWithoutFormat": 55,
"StorageImageWriteWithoutFormat": 56,
"MultiViewport": 57,
- "SubgroupBallotKHR": 4423
+ "SubgroupBallotKHR": 4423,
+ "DrawParameters": 4427
}
},
{
diff --git a/include/spirv/1.0/spirv.lua b/include/spirv/1.0/spirv.lua
index 2f09386..dc9859b 100644
--- a/include/spirv/1.0/spirv.lua
+++ b/include/spirv/1.0/spirv.lua
@@ -42,7 +42,7 @@
spv = {
MagicNumber = 0x07230203,
Version = 0x00010000,
- Revision = 7,
+ Revision = 8,
OpCodeMask = 0xffff,
WordCountShift = 16,
@@ -396,6 +396,9 @@
SubgroupGtMaskKHR = 4418,
SubgroupLeMaskKHR = 4419,
SubgroupLtMaskKHR = 4420,
+ BaseVertex = 4424,
+ BaseInstance = 4425,
+ DrawIndex = 4426,
},
SelectionControlShift = {
@@ -562,6 +565,7 @@
StorageImageWriteWithoutFormat = 56,
MultiViewport = 57,
SubgroupBallotKHR = 4423,
+ DrawParameters = 4427,
},
Op = {
diff --git a/include/spirv/1.0/spirv.py b/include/spirv/1.0/spirv.py
index 550ab69..91b3cbb 100644
--- a/include/spirv/1.0/spirv.py
+++ b/include/spirv/1.0/spirv.py
@@ -42,7 +42,7 @@
spv = {
'MagicNumber' : 0x07230203,
'Version' : 0x00010000,
- 'Revision' : 7,
+ 'Revision' : 8,
'OpCodeMask' : 0xffff,
'WordCountShift' : 16,
@@ -396,6 +396,9 @@
'SubgroupGtMaskKHR' : 4418,
'SubgroupLeMaskKHR' : 4419,
'SubgroupLtMaskKHR' : 4420,
+ 'BaseVertex' : 4424,
+ 'BaseInstance' : 4425,
+ 'DrawIndex' : 4426,
},
'SelectionControlShift' : {
@@ -562,6 +565,7 @@
'StorageImageWriteWithoutFormat' : 56,
'MultiViewport' : 57,
'SubgroupBallotKHR' : 4423,
+ 'DrawParameters' : 4427,
},
'Op' : {
diff --git a/include/spirv/1.1/spirv.core.grammar.json b/include/spirv/1.1/spirv.core.grammar.json
index ae2e053..088306e 100644
--- a/include/spirv/1.1/spirv.core.grammar.json
+++ b/include/spirv/1.1/spirv.core.grammar.json
@@ -939,7 +939,7 @@
"operands" : [
{ "kind" : "IdResultType" },
{ "kind" : "IdResult" },
- { "kind" : "IdRef", "name" : "'Image'" },
+ { "kind" : "IdRef", "name" : "'Sampled Image'" },
{ "kind" : "IdRef", "name" : "'Coordinate'" }
],
"capabilities" : [ "ImageQuery" ]
@@ -4884,6 +4884,21 @@
"enumerant" : "SubgroupLtMaskKHR",
"value" : 4420,
"capabilities" : [ "SubgroupBallotKHR" ]
+ },
+ {
+ "enumerant" : "BaseVertex",
+ "value" : 4424,
+ "capabilities" : [ "DrawParameters" ]
+ },
+ {
+ "enumerant" : "BaseInstance",
+ "value" : 4425,
+ "capabilities" : [ "DrawParameters" ]
+ },
+ {
+ "enumerant" : "DrawIndex",
+ "value" : 4426,
+ "capabilities" : [ "DrawParameters" ]
}
]
},
@@ -5247,6 +5262,11 @@
"enumerant" : "SubgroupBallotKHR",
"value" : 4423,
"extensions" : [ "SPV_KHR_shader_ballot" ]
+ },
+ {
+ "enumerant" : "DrawParameters",
+ "value" : 4427,
+ "extensions" : [ "SPV_KHR_shader_draw_parameters" ]
}
]
},
diff --git a/include/spirv/1.1/spirv.h b/include/spirv/1.1/spirv.h
index d23f21d..769c102 100644
--- a/include/spirv/1.1/spirv.h
+++ b/include/spirv/1.1/spirv.h
@@ -51,11 +51,11 @@
typedef unsigned int SpvId;
#define SPV_VERSION 0x10100
-#define SPV_REVISION 3
+#define SPV_REVISION 4
static const unsigned int SpvMagicNumber = 0x07230203;
static const unsigned int SpvVersion = 0x00010100;
-static const unsigned int SpvRevision = 3;
+static const unsigned int SpvRevision = 4;
static const unsigned int SpvOpCodeMask = 0xffff;
static const unsigned int SpvWordCountShift = 16;
@@ -433,6 +433,9 @@
SpvBuiltInSubgroupGtMaskKHR = 4418,
SpvBuiltInSubgroupLeMaskKHR = 4419,
SpvBuiltInSubgroupLtMaskKHR = 4420,
+ SpvBuiltInBaseVertex = 4424,
+ SpvBuiltInBaseInstance = 4425,
+ SpvBuiltInDrawIndex = 4426,
SpvBuiltInMax = 0x7fffffff,
} SpvBuiltIn;
@@ -616,6 +619,7 @@
SpvCapabilityNamedBarrier = 59,
SpvCapabilityPipeStorage = 60,
SpvCapabilitySubgroupBallotKHR = 4423,
+ SpvCapabilityDrawParameters = 4427,
SpvCapabilityMax = 0x7fffffff,
} SpvCapability;
diff --git a/include/spirv/1.1/spirv.hpp b/include/spirv/1.1/spirv.hpp
index 48cdc04..02426fc 100644
--- a/include/spirv/1.1/spirv.hpp
+++ b/include/spirv/1.1/spirv.hpp
@@ -47,11 +47,11 @@
typedef unsigned int Id;
#define SPV_VERSION 0x10100
-#define SPV_REVISION 3
+#define SPV_REVISION 4
static const unsigned int MagicNumber = 0x07230203;
static const unsigned int Version = 0x00010100;
-static const unsigned int Revision = 3;
+static const unsigned int Revision = 4;
static const unsigned int OpCodeMask = 0xffff;
static const unsigned int WordCountShift = 16;
@@ -429,6 +429,9 @@
BuiltInSubgroupGtMaskKHR = 4418,
BuiltInSubgroupLeMaskKHR = 4419,
BuiltInSubgroupLtMaskKHR = 4420,
+ BuiltInBaseVertex = 4424,
+ BuiltInBaseInstance = 4425,
+ BuiltInDrawIndex = 4426,
BuiltInMax = 0x7fffffff,
};
@@ -612,6 +615,7 @@
CapabilityNamedBarrier = 59,
CapabilityPipeStorage = 60,
CapabilitySubgroupBallotKHR = 4423,
+ CapabilityDrawParameters = 4427,
CapabilityMax = 0x7fffffff,
};
diff --git a/include/spirv/1.1/spirv.hpp11 b/include/spirv/1.1/spirv.hpp11
index 5edabfa..2a84893 100644
--- a/include/spirv/1.1/spirv.hpp11
+++ b/include/spirv/1.1/spirv.hpp11
@@ -47,11 +47,11 @@
typedef unsigned int Id;
#define SPV_VERSION 0x10100
-#define SPV_REVISION 3
+#define SPV_REVISION 4
static const unsigned int MagicNumber = 0x07230203;
static const unsigned int Version = 0x00010100;
-static const unsigned int Revision = 3;
+static const unsigned int Revision = 4;
static const unsigned int OpCodeMask = 0xffff;
static const unsigned int WordCountShift = 16;
@@ -429,6 +429,9 @@
SubgroupGtMaskKHR = 4418,
SubgroupLeMaskKHR = 4419,
SubgroupLtMaskKHR = 4420,
+ BaseVertex = 4424,
+ BaseInstance = 4425,
+ DrawIndex = 4426,
Max = 0x7fffffff,
};
@@ -612,6 +615,7 @@
NamedBarrier = 59,
PipeStorage = 60,
SubgroupBallotKHR = 4423,
+ DrawParameters = 4427,
Max = 0x7fffffff,
};
diff --git a/include/spirv/1.1/spirv.json b/include/spirv/1.1/spirv.json
index 2ae3881..5000289 100644
--- a/include/spirv/1.1/spirv.json
+++ b/include/spirv/1.1/spirv.json
@@ -52,7 +52,7 @@
],
"MagicNumber": 119734787,
"Version": 65792,
- "Revision": 3,
+ "Revision": 4,
"OpCodeMask": 65535,
"WordCountShift": 16
},
@@ -471,7 +471,10 @@
"SubgroupGeMaskKHR": 4417,
"SubgroupGtMaskKHR": 4418,
"SubgroupLeMaskKHR": 4419,
- "SubgroupLtMaskKHR": 4420
+ "SubgroupLtMaskKHR": 4420,
+ "BaseVertex": 4424,
+ "BaseInstance": 4425,
+ "DrawIndex": 4426
}
},
{
@@ -636,7 +639,8 @@
"SubgroupDispatch": 58,
"NamedBarrier": 59,
"PipeStorage": 60,
- "SubgroupBallotKHR": 4423
+ "SubgroupBallotKHR": 4423,
+ "DrawParameters": 4427
}
},
{
diff --git a/include/spirv/1.1/spirv.lua b/include/spirv/1.1/spirv.lua
index ad087b6..d47a53c 100644
--- a/include/spirv/1.1/spirv.lua
+++ b/include/spirv/1.1/spirv.lua
@@ -42,7 +42,7 @@
spv = {
MagicNumber = 0x07230203,
Version = 0x00010100,
- Revision = 3,
+ Revision = 4,
OpCodeMask = 0xffff,
WordCountShift = 16,
@@ -401,6 +401,9 @@
SubgroupGtMaskKHR = 4418,
SubgroupLeMaskKHR = 4419,
SubgroupLtMaskKHR = 4420,
+ BaseVertex = 4424,
+ BaseInstance = 4425,
+ DrawIndex = 4426,
},
SelectionControlShift = {
@@ -574,6 +577,7 @@
NamedBarrier = 59,
PipeStorage = 60,
SubgroupBallotKHR = 4423,
+ DrawParameters = 4427,
},
Op = {
diff --git a/include/spirv/1.1/spirv.py b/include/spirv/1.1/spirv.py
index 5ee4cbf..5f2e206 100644
--- a/include/spirv/1.1/spirv.py
+++ b/include/spirv/1.1/spirv.py
@@ -42,7 +42,7 @@
spv = {
'MagicNumber' : 0x07230203,
'Version' : 0x00010100,
- 'Revision' : 3,
+ 'Revision' : 4,
'OpCodeMask' : 0xffff,
'WordCountShift' : 16,
@@ -401,6 +401,9 @@
'SubgroupGtMaskKHR' : 4418,
'SubgroupLeMaskKHR' : 4419,
'SubgroupLtMaskKHR' : 4420,
+ 'BaseVertex' : 4424,
+ 'BaseInstance' : 4425,
+ 'DrawIndex' : 4426,
},
'SelectionControlShift' : {
@@ -574,6 +577,7 @@
'NamedBarrier' : 59,
'PipeStorage' : 60,
'SubgroupBallotKHR' : 4423,
+ 'DrawParameters' : 4427,
},
'Op' : {
