Use SPIR-V headers for 1.0 Rev3

Refresh from the SPIR-V registry.
This commit is contained in:
David Neto 2016-02-14 13:42:17 -05:00
parent c7a9a909a8
commit 77b48b5c6d
3 changed files with 14 additions and 6 deletions

View File

@ -27,8 +27,8 @@
#ifndef GLSLstd450_H #ifndef GLSLstd450_H
#define GLSLstd450_H #define GLSLstd450_H
const int GLSLstd450Version = 99; static const int GLSLstd450Version = 100;
const int GLSLstd450Revision = 3; static const int GLSLstd450Revision = 1;
enum GLSLstd450 { enum GLSLstd450 {
GLSLstd450Bad = 0, // Don't use GLSLstd450Bad = 0, // Don't use
@ -83,7 +83,7 @@ enum GLSLstd450 {
GLSLstd450UClamp = 44, GLSLstd450UClamp = 44,
GLSLstd450SClamp = 45, GLSLstd450SClamp = 45,
GLSLstd450FMix = 46, GLSLstd450FMix = 46,
GLSLstd450IMix = 47, GLSLstd450IMix = 47, // Reserved
GLSLstd450Step = 48, GLSLstd450Step = 48,
GLSLstd450SmoothStep = 49, GLSLstd450SmoothStep = 49,
@ -121,6 +121,10 @@ enum GLSLstd450 {
GLSLstd450InterpolateAtSample = 77, GLSLstd450InterpolateAtSample = 77,
GLSLstd450InterpolateAtOffset = 78, GLSLstd450InterpolateAtOffset = 78,
GLSLstd450NMin = 79,
GLSLstd450NMax = 80,
GLSLstd450NClamp = 81,
GLSLstd450Count GLSLstd450Count
}; };

View File

@ -51,11 +51,11 @@
typedef unsigned int SpvId; typedef unsigned int SpvId;
#define SPV_VERSION 0x10000 #define SPV_VERSION 0x10000
#define SPV_REVISION 2 #define SPV_REVISION 3
static const unsigned int SpvMagicNumber = 0x07230203; static const unsigned int SpvMagicNumber = 0x07230203;
static const unsigned int SpvVersion = 0x00010000; static const unsigned int SpvVersion = 0x00010000;
static const unsigned int SpvRevision = 2; static const unsigned int SpvRevision = 3;
static const unsigned int SpvOpCodeMask = 0xffff; static const unsigned int SpvOpCodeMask = 0xffff;
static const unsigned int SpvWordCountShift = 16; static const unsigned int SpvWordCountShift = 16;
@ -567,6 +567,7 @@ typedef enum SpvCapability_ {
SpvCapabilityGeometryStreams = 54, SpvCapabilityGeometryStreams = 54,
SpvCapabilityStorageImageReadWithoutFormat = 55, SpvCapabilityStorageImageReadWithoutFormat = 55,
SpvCapabilityStorageImageWriteWithoutFormat = 56, SpvCapabilityStorageImageWriteWithoutFormat = 56,
SpvCapabilityMultiViewport = 57,
} SpvCapability; } SpvCapability;
typedef enum SpvOp_ { typedef enum SpvOp_ {
@ -863,6 +864,7 @@ typedef enum SpvOp_ {
SpvOpNoLine = 317, SpvOpNoLine = 317,
SpvOpAtomicFlagTestAndSet = 318, SpvOpAtomicFlagTestAndSet = 318,
SpvOpAtomicFlagClear = 319, SpvOpAtomicFlagClear = 319,
SpvOpImageSparseRead = 320,
} SpvOp; } SpvOp;
#endif // #ifndef spirv_H #endif // #ifndef spirv_H

View File

@ -42,7 +42,7 @@
spv = { spv = {
'MagicNumber' : 0x07230203, 'MagicNumber' : 0x07230203,
'Version' : 0x00010000, 'Version' : 0x00010000,
'Revision' : 2, 'Revision' : 3,
'OpCodeMask' : 0xffff, 'OpCodeMask' : 0xffff,
'WordCountShift' : 16, 'WordCountShift' : 16,
@ -554,6 +554,7 @@ spv = {
'GeometryStreams' : 54, 'GeometryStreams' : 54,
'StorageImageReadWithoutFormat' : 55, 'StorageImageReadWithoutFormat' : 55,
'StorageImageWriteWithoutFormat' : 56, 'StorageImageWriteWithoutFormat' : 56,
'MultiViewport' : 57,
}, },
'Op' : { 'Op' : {
@ -850,6 +851,7 @@ spv = {
'OpNoLine' : 317, 'OpNoLine' : 317,
'OpAtomicFlagTestAndSet' : 318, 'OpAtomicFlagTestAndSet' : 318,
'OpAtomicFlagClear' : 319, 'OpAtomicFlagClear' : 319,
'OpImageSparseRead' : 320,
}, },
} }