We also need to update spirv.core.grammar.json at the same time. I've gone ahead and pulled the latest and squashed it into your patch. I also added
Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net> and pushed. Thanks! On Mon, Jan 8, 2018 at 10:46 AM, Caio Marcelo de Oliveira Filho < caio.olive...@intel.com> wrote: > --- > src/compiler/spirv/spirv.h | 27 ++++++++++++++++++++++++--- > 1 file changed, 24 insertions(+), 3 deletions(-) > > diff --git a/src/compiler/spirv/spirv.h b/src/compiler/spirv/spirv.h > index 61559a1c9c..233dc6d691 100644 > --- a/src/compiler/spirv/spirv.h > +++ b/src/compiler/spirv/spirv.h > @@ -1,5 +1,5 @@ > /* > -** Copyright (c) 2014-2017 The Khronos Group Inc. > +** Copyright (c) 2014-2018 The Khronos Group Inc. > ** > ** Permission is hereby granted, free of charge, to any person obtaining > a copy > ** of this software and/or associated documentation files (the > "Materials"), > @@ -51,11 +51,11 @@ > typedef unsigned int SpvId; > > #define SPV_VERSION 0x10200 > -#define SPV_REVISION 1 > +#define SPV_REVISION 3 > > static const unsigned int SpvMagicNumber = 0x07230203; > static const unsigned int SpvVersion = 0x00010200; > -static const unsigned int SpvRevision = 1; > +static const unsigned int SpvRevision = 3; > static const unsigned int SpvOpCodeMask = 0xffff; > static const unsigned int SpvWordCountShift = 16; > > @@ -134,6 +134,7 @@ typedef enum SpvExecutionMode_ { > SpvExecutionModeLocalSizeId = 38, > SpvExecutionModeLocalSizeHintId = 39, > SpvExecutionModePostDepthCoverage = 4446, > + SpvExecutionModeStencilRefReplacingEXT = 5027, > SpvExecutionModeMax = 0x7fffffff, > } SpvExecutionMode; > > @@ -458,11 +459,13 @@ typedef enum SpvBuiltIn_ { > SpvBuiltInBaryCoordSmoothCentroidAMD = 4996, > SpvBuiltInBaryCoordSmoothSampleAMD = 4997, > SpvBuiltInBaryCoordPullModelAMD = 4998, > + SpvBuiltInFragStencilRefEXT = 5014, > SpvBuiltInViewportMaskNV = 5253, > SpvBuiltInSecondaryPositionNV = 5257, > SpvBuiltInSecondaryViewportMaskNV = 5258, > SpvBuiltInPositionPerViewNV = 5261, > SpvBuiltInViewportMaskPerViewNV = 5262, > + SpvBuiltInFullyCoveredEXT = 5264, > SpvBuiltInMax = 0x7fffffff, > } SpvBuiltIn; > > @@ -661,12 +664,20 @@ typedef enum SpvCapability_ { > SpvCapabilityAtomicStorageOps = 4445, > SpvCapabilitySampleMaskPostDepthCoverage = 4447, > SpvCapabilityImageGatherBiasLodAMD = 5009, > + SpvCapabilityFragmentMaskAMD = 5010, > + SpvCapabilityStencilExportEXT = 5013, > + SpvCapabilityImageReadWriteLodAMD = 5015, > SpvCapabilitySampleMaskOverrideCoverageNV = 5249, > SpvCapabilityGeometryShaderPassthroughNV = 5251, > + SpvCapabilityShaderViewportIndexLayerEXT = 5254, > SpvCapabilityShaderViewportIndexLayerNV = 5254, > SpvCapabilityShaderViewportMaskNV = 5255, > SpvCapabilityShaderStereoViewNV = 5259, > SpvCapabilityPerViewAttributesNV = 5260, > + SpvCapabilityFragmentFullyCoveredEXT = 5265, > + SpvCapabilitySubgroupShuffleINTEL = 5568, > + SpvCapabilitySubgroupBufferBlockIOINTEL = 5569, > + SpvCapabilitySubgroupImageBlockIOINTEL = 5570, > SpvCapabilityMax = 0x7fffffff, > } SpvCapability; > > @@ -991,6 +1002,16 @@ typedef enum SpvOp_ { > SpvOpGroupFMaxNonUniformAMD = 5005, > SpvOpGroupUMaxNonUniformAMD = 5006, > SpvOpGroupSMaxNonUniformAMD = 5007, > + SpvOpFragmentMaskFetchAMD = 5011, > + SpvOpFragmentFetchAMD = 5012, > + SpvOpSubgroupShuffleINTEL = 5571, > + SpvOpSubgroupShuffleDownINTEL = 5572, > + SpvOpSubgroupShuffleUpINTEL = 5573, > + SpvOpSubgroupShuffleXorINTEL = 5574, > + SpvOpSubgroupBlockReadINTEL = 5575, > + SpvOpSubgroupBlockWriteINTEL = 5576, > + SpvOpSubgroupImageBlockReadINTEL = 5577, > + SpvOpSubgroupImageBlockWriteINTEL = 5578, > SpvOpMax = 0x7fffffff, > } SpvOp; > > -- > 2.15.1 > >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev