Add type checks for hitObjectNV

Test/baseResults/spv.nv.hitobject-errors.rgen.out

@@ -0,0 +1,9 @@
+spv.nv.hitobject-errors.rgen
+ERROR: 0:7: 'hitObjectNV' : hitObjectNV can only be declared in global or function scope with no storage qualifier: uHitObj
+ERROR: 0:9: 'hitObjectNV' : hitObjectNV can only be declared in global or function scope with no storage qualifier: hobjIn
+ERROR: 0:10: 'hitObjectNV' : hitObjectNV can only be declared in global or function scope with no storage qualifier: hobjOut
+ERROR: 0:21: 'structure' : struct contains hitObjectNV : wrapper
+ERROR: 4 compilation errors. No code generated.
+
+
+SPIR-V is not generated for failed compile or link

Test/spv.nv.hitobject-errors.rgen

@@ -0,0 +1,24 @@
+#version 460
+#extension GL_EXT_ray_tracing : enable
+#extension GL_NV_shader_invocation_reorder : enable
+
+
+hitObjectNV hObjGlob; // OK
+uniform hitObjectNV uHitObj; // ERROR
+
+layout(location=0) in hitObjectNV hobjIn; // ERROR
+out hitObjectNV hobjOut; // ERROR
+
+struct hObjWrapper{
+ hitObjectNV objField;
+ vec3 v;
+};
+
+void foo(hitObjectNV hObjArg) {} // OK
+
+void main()
+{
+ hObjWrapper wrapper; // ERROR
+ hitObjectNV localHitObj; // OK
+ foo(localHitObj); // OK
+}

glslang/MachineIndependent/ParseHelper.cpp

@@ -3936,6 +3936,18 @@ void TParseContext::accStructCheck(const TSourceLoc& loc, const TType& type, con
 
 }
 
+void TParseContext::hitObjectNVCheck(const TSourceLoc & loc, const TType & type, const TString & identifier)
+{
+ if (type.getBasicType() == EbtStruct && containsFieldWithBasicType(type, EbtHitObjectNV)) {
+ error(loc, "struct contains hitObjectNV :", type.getBasicTypeString().c_str(), identifier.c_str());
+ } else if (type.getBasicType() == EbtHitObjectNV) {
+ TStorageQualifier qualifier = type.getQualifier().storage;
+ if (qualifier != EvqGlobal && qualifier != EvqTemporary) {
+ error(loc, "hitObjectNV can only be declared in global or function scope with no storage qualifier:", "hitObjectNV", identifier.c_str());
+ }
+ }
+}
+
 void TParseContext::transparentOpaqueCheck(const TSourceLoc& loc, const TType& type, const TString& identifier)
 {
  if (parsingBuiltins)
@@ -7875,6 +7887,7 @@ TIntermNode* TParseContext::declareVariable(const TSourceLoc& loc, TString& iden
  transparentOpaqueCheck(loc, type, identifier);
  atomicUintCheck(loc, type, identifier);
  accStructCheck(loc, type, identifier);
+ hitObjectNVCheck(loc, type, identifier);
  checkAndResizeMeshViewDim(loc, type, /*isBlockMember*/ false);
  if (type.getQualifier().storage == EvqConst && type.containsReference()) {
  error(loc, "variables with reference type can't have qualifier 'const'", "qualifier", "");

glslang/MachineIndependent/ParseHelper.h

@@ -397,6 +397,7 @@ class TParseContext : public TParseContextBase {
  void samplerCheck(const TSourceLoc&, const TType&, const TString& identifier, TIntermTyped* initializer);
  void atomicUintCheck(const TSourceLoc&, const TType&, const TString& identifier);
  void accStructCheck(const TSourceLoc & loc, const TType & type, const TString & identifier);
+ void hitObjectNVCheck(const TSourceLoc & loc, const TType & type, const TString & identifier);
  void transparentOpaqueCheck(const TSourceLoc&, const TType&, const TString& identifier);
  void memberQualifierCheck(glslang::TPublicType&);
  void globalQualifierFixCheck(const TSourceLoc&, TQualifier&, bool isMemberCheck = false, const TPublicType* publicType = nullptr);

gtests/Spv.FromFile.cpp

@@ -710,6 +710,7 @@ INSTANTIATE_TEST_SUITE_P(
 
  // SPV_NV_shader_execution_reorder
 
+ "spv.nv.hitobject-errors.rgen",
  "spv.nv.hitobject-allops.rgen",
  "spv.nv.hitobject-allops.rchit",
  "spv.nv.hitobject-allops.rmiss",