Merge pull request #2458 from ShchchowAMD/unique_id-fix
Fix issue for new unique id system.
diff --git a/.travis.yml b/.travis.yml
index 1fa3fc0..87838b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,17 @@
fi
before_script:
- - git clone --depth=1 https://github.com/google/googletest.git External/googletest
+ # check out pre-breakage version of googletest; can be deleted when
+ # issue 3128 is fixed
+ # git clone --depth=1 https://github.com/google/googletest.git External/googletest
+ - mkdir -p External/googletest
+ - cd External/googletest
+ - git init
+ - git remote add origin https://github.com/google/googletest.git
+ - git fetch --depth 1 origin 0c400f67fcf305869c5fb113dd296eca266c9725
+ - git reset --hard FETCH_HEAD
+ - cd ../..
+ # get spirv-tools and spirv-headers
- ./update_glslang_sources.py
script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ada2b8f..d582926 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,7 +186,7 @@
if(NOT ENABLE_RTTI)
string(FIND "${CMAKE_CXX_FLAGS}" "/GR" MSVC_HAS_GR)
if(MSVC_HAS_GR)
- string(REGEX REPLACE /GR /GR- CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ string(REGEX REPLACE "/GR" "/GR-" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
else()
add_compile_options(/GR-) # Disable RTTI
endif()
@@ -234,55 +234,33 @@
endmacro()
endif()
-# CMake needs to find the right version of python, right from the beginning,
-# otherwise, it will find the wrong version and fail later
-find_host_package(PythonInterp 3 REQUIRED)
-
# Root directory for build-time generated include files
set(GLSLANG_GENERATED_INCLUDEDIR "${CMAKE_BINARY_DIR}/include")
################################################################################
# Build version information generation
################################################################################
+include(parse_version.cmake)
set(GLSLANG_CHANGES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.md")
-set(GLSLANG_BUILD_INFO_PY "${CMAKE_CURRENT_SOURCE_DIR}/build_info.py")
set(GLSLANG_BUILD_INFO_H_TMPL "${CMAKE_CURRENT_SOURCE_DIR}/build_info.h.tmpl")
set(GLSLANG_BUILD_INFO_H "${GLSLANG_GENERATED_INCLUDEDIR}/glslang/build_info.h")
-# Command to build the build_info.h file
-add_custom_command(
- OUTPUT ${GLSLANG_BUILD_INFO_H}
- COMMAND ${PYTHON_EXECUTABLE} "${GLSLANG_BUILD_INFO_PY}"
- ${CMAKE_CURRENT_SOURCE_DIR}
- "-i" ${GLSLANG_BUILD_INFO_H_TMPL}
- "-o" ${GLSLANG_BUILD_INFO_H}
- DEPENDS ${GLSLANG_BUILD_INFO_PY}
- ${GLSLANG_CHANGES_FILE}
- ${GLSLANG_BUILD_INFO_H_TMPL}
- COMMENT "Generating ${GLSLANG_BUILD_INFO_H}")
+parse_version(${GLSLANG_CHANGES_FILE} GLSLANG)
-# Target to build the build_info.h file
-add_custom_target(glslang-build-info DEPENDS ${GLSLANG_BUILD_INFO_H})
+function(configurate_version)
+ set(major ${GLSLANG_VERSION_MAJOR})
+ set(minor ${GLSLANG_VERSION_MINOR})
+ set(patch ${GLSLANG_VERSION_PATCH})
+ set(flavor ${GLSLANG_VERSION_FLAVOR})
+ configure_file(${GLSLANG_BUILD_INFO_H_TMPL} ${GLSLANG_BUILD_INFO_H} @ONLY)
+endfunction()
-# Populate the CMake GLSLANG_VERSION* variables with the build version
-# information.
-execute_process(
- COMMAND ${PYTHON_EXECUTABLE} "${GLSLANG_BUILD_INFO_PY}"
- ${CMAKE_CURRENT_SOURCE_DIR} "<major>.<minor>.<patch><-flavor>;<major>;<minor>;<patch>;<flavor>"
- OUTPUT_VARIABLE "GLSLANG_VERSIONS"
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-list(GET "GLSLANG_VERSIONS" 0 "GLSLANG_VERSION")
-list(GET "GLSLANG_VERSIONS" 1 "GLSLANG_VERSION_MAJOR")
-list(GET "GLSLANG_VERSIONS" 2 "GLSLANG_VERSION_MINOR")
-list(GET "GLSLANG_VERSIONS" 3 "GLSLANG_VERSION_PATCH")
-list(GET "GLSLANG_VERSIONS" 4 "GLSLANG_VERSION_FLAVOR")
-configure_file(${GLSLANG_CHANGES_FILE} "${CMAKE_CURRENT_BINARY_DIR}/CHANGES.md") # Required to re-run cmake on version change
+configurate_version()
# glslang_add_build_info_dependency() adds the glslang-build-info dependency and
# generated include directories to target.
function(glslang_add_build_info_dependency target)
target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${GLSLANG_GENERATED_INCLUDEDIR}>)
- add_dependencies(${target} glslang-build-info)
endfunction()
# glslang_only_export_explicit_symbols() makes the symbol visibility hidden by
@@ -316,6 +294,8 @@
endif()
if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
+ find_package(PythonInterp 3 REQUIRED)
+
# We depend on these for later projects, so they should come first.
add_subdirectory(External)
endif()
diff --git a/README.md b/README.md
index 7ad4ace..9b8cfb3 100644
--- a/README.md
+++ b/README.md
@@ -125,6 +125,15 @@
git clone https://github.com/google/googletest.git External/googletest
```
+TEMPORARY NOTICE: additionally perform the following to avoid a current
+breakage in googletest:
+
+```bash
+cd External/googletest
+git checkout 0c400f67fcf305869c5fb113dd296eca266c9725
+cd ../..
+```
+
If you wish to assure that SPIR-V generated from HLSL is legal for Vulkan,
wish to invoke -Os to reduce SPIR-V size from HLSL or GLSL, or wish to run the
integrated test suite, install spirv-tools with this:
diff --git a/SPIRV/GLSL.ext.KHR.h b/SPIRV/GLSL.ext.KHR.h
index 9610c6e..175fa8d 100644
--- a/SPIRV/GLSL.ext.KHR.h
+++ b/SPIRV/GLSL.ext.KHR.h
@@ -50,5 +50,6 @@
static const char* const E_SPV_KHR_ray_query = "SPV_KHR_ray_query";
static const char* const E_SPV_KHR_fragment_shading_rate = "SPV_KHR_fragment_shading_rate";
static const char* const E_SPV_KHR_terminate_invocation = "SPV_KHR_terminate_invocation";
+static const char* const E_SPV_KHR_workgroup_memory_explicit_layout = "SPV_KHR_workgroup_memory_explicit_layout";
#endif // #ifndef GLSLextKHR_H
diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index d061726..8528955 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -149,6 +149,7 @@
spv::Decoration TranslateInterpolationDecoration(const glslang::TQualifier& qualifier);
spv::Decoration TranslateAuxiliaryStorageDecoration(const glslang::TQualifier& qualifier);
spv::Decoration TranslateNonUniformDecoration(const glslang::TQualifier& qualifier);
+ spv::Decoration TranslateNonUniformDecoration(const spv::Builder::AccessChain::CoherentFlags& coherentFlags);
spv::Builder::AccessChain::CoherentFlags TranslateCoherent(const glslang::TType& type);
spv::MemoryAccessMask TranslateMemoryAccess(const spv::Builder::AccessChain::CoherentFlags &coherentFlags);
spv::ImageOperandsMask TranslateImageOperands(const spv::Builder::AccessChain::CoherentFlags &coherentFlags);
@@ -189,6 +190,7 @@
bool originalParam(glslang::TStorageQualifier, const glslang::TType&, bool implicitThisParam);
void makeFunctions(const glslang::TIntermSequence&);
void makeGlobalInitializers(const glslang::TIntermSequence&);
+ void collectRayTracingLinkerObjects();
void visitFunctions(const glslang::TIntermSequence&);
void handleFunctionEntry(const glslang::TIntermAggregate* node);
void translateArguments(const glslang::TIntermAggregate& node, std::vector<spv::Id>& arguments,
@@ -272,6 +274,9 @@
// requiring local translation to and from SPIR-V type on every access.
// Maps <builtin-variable-id -> AST-required-type-id>
std::unordered_map<spv::Id, spv::Id> forceType;
+
+ // Used later for generating OpTraceKHR/OpExecuteCallableKHR
+ std::unordered_map<unsigned int, glslang::TIntermSymbol *> locationToSymbol[2];
};
//
@@ -375,6 +380,7 @@
case glslang::EvqBuffer: return useStorageBuffer ? spv::DecorationBlock : spv::DecorationBufferBlock;
case glslang::EvqVaryingIn: return spv::DecorationBlock;
case glslang::EvqVaryingOut: return spv::DecorationBlock;
+ case glslang::EvqShared: return spv::DecorationBlock;
#ifndef GLSLANG_WEB
case glslang::EvqPayload: return spv::DecorationBlock;
case glslang::EvqPayloadIn: return spv::DecorationBlock;
@@ -431,6 +437,7 @@
break;
case glslang::EbtBlock:
switch (type.getQualifier().storage) {
+ case glslang::EvqShared:
case glslang::EvqUniform:
case glslang::EvqBuffer:
switch (type.getQualifier().layoutPacking) {
@@ -539,6 +546,20 @@
return spv::DecorationMax;
}
+// If lvalue flags contains nonUniform, return SPIR-V NonUniform decoration.
+spv::Decoration TGlslangToSpvTraverser::TranslateNonUniformDecoration(
+ const spv::Builder::AccessChain::CoherentFlags& coherentFlags)
+{
+#ifndef GLSLANG_WEB
+ if (coherentFlags.isNonUniform()) {
+ builder.addIncorporatedExtension("SPV_EXT_descriptor_indexing", spv::Spv_1_5);
+ builder.addCapability(spv::CapabilityShaderNonUniformEXT);
+ return spv::DecorationNonUniformEXT;
+ } else
+#endif
+ return spv::DecorationMax;
+}
+
spv::MemoryAccessMask TGlslangToSpvTraverser::TranslateMemoryAccess(
const spv::Builder::AccessChain::CoherentFlags &coherentFlags)
{
@@ -614,6 +635,7 @@
flags.volatil;
flags.isImage = type.getBasicType() == glslang::EbtSampler;
#endif
+ flags.nonUniform = type.getQualifier().nonUniform;
return flags;
}
@@ -709,7 +731,10 @@
return spv::BuiltInCullDistance;
case glslang::EbvViewportIndex:
- builder.addCapability(spv::CapabilityMultiViewport);
+ if (glslangIntermediate->getStage() == EShLangGeometry ||
+ glslangIntermediate->getStage() == EShLangFragment) {
+ builder.addCapability(spv::CapabilityMultiViewport);
+ }
if (glslangIntermediate->getStage() == EShLangVertex ||
glslangIntermediate->getStage() == EShLangTessControl ||
glslangIntermediate->getStage() == EShLangTessEvaluation) {
@@ -738,7 +763,10 @@
if (glslangIntermediate->getStage() == EShLangMeshNV) {
return spv::BuiltInLayer;
}
- builder.addCapability(spv::CapabilityGeometry);
+ if (glslangIntermediate->getStage() == EShLangGeometry ||
+ glslangIntermediate->getStage() == EShLangFragment) {
+ builder.addCapability(spv::CapabilityGeometry);
+ }
if (glslangIntermediate->getStage() == EShLangVertex ||
glslangIntermediate->getStage() == EShLangTessControl ||
glslangIntermediate->getStage() == EShLangTessEvaluation) {
@@ -980,7 +1008,17 @@
case glslang::EbvInstanceCustomIndex:
return spv::BuiltInInstanceCustomIndexKHR;
case glslang::EbvHitT:
- return spv::BuiltInHitTKHR;
+ {
+ // this is a GLSL alias of RayTmax
+ // in SPV_NV_ray_tracing it has a dedicated builtin
+ // but in SPV_KHR_ray_tracing it gets mapped to RayTmax
+ auto& extensions = glslangIntermediate->getRequestedExtensions();
+ if (extensions.find("GL_NV_ray_tracing") != extensions.end()) {
+ return spv::BuiltInHitTNV;
+ } else {
+ return spv::BuiltInRayTmaxKHR;
+ }
+ }
case glslang::EbvHitKind:
return spv::BuiltInHitKindKHR;
case glslang::EbvObjectToWorld:
@@ -1210,7 +1248,7 @@
spv::StorageClass TGlslangToSpvTraverser::TranslateStorageClass(const glslang::TType& type)
{
if (type.getBasicType() == glslang::EbtRayQuery)
- return spv::StorageClassFunction;
+ return spv::StorageClassPrivate;
if (type.getQualifier().isPipeInput())
return spv::StorageClassInput;
if (type.getQualifier().isPipeOutput())
@@ -1242,6 +1280,12 @@
return spv::StorageClassUniformConstant;
}
+ if (type.getQualifier().storage == glslang::EvqShared && type.getBasicType() == glslang::EbtBlock) {
+ builder.addExtension(spv::E_SPV_KHR_workgroup_memory_explicit_layout);
+ builder.addCapability(spv::CapabilityWorkgroupMemoryExplicitLayoutKHR);
+ return spv::StorageClassWorkgroup;
+ }
+
switch (type.getQualifier().storage) {
case glslang::EvqGlobal: return spv::StorageClassPrivate;
case glslang::EvqConstReadOnly: return spv::StorageClassFunction;
@@ -1376,6 +1420,8 @@
if (parent.writeonly)
child.writeonly = true;
#endif
+ if (parent.nonUniform)
+ child.nonUniform = true;
}
bool HasNonLayoutQualifiers(const glslang::TType& type, const glslang::TQualifier& qualifier)
@@ -1477,7 +1523,7 @@
}
if (glslangIntermediate->getLayoutPrimitiveCulling()) {
- builder.addCapability(spv::CapabilityRayTraversalPrimitiveCullingProvisionalKHR);
+ builder.addCapability(spv::CapabilityRayTraversalPrimitiveCullingKHR);
}
unsigned int mode;
@@ -1644,7 +1690,7 @@
{
auto& extensions = glslangIntermediate->getRequestedExtensions();
if (extensions.find("GL_NV_ray_tracing") == extensions.end()) {
- builder.addCapability(spv::CapabilityRayTracingProvisionalKHR);
+ builder.addCapability(spv::CapabilityRayTracingKHR);
builder.addExtension("SPV_KHR_ray_tracing");
}
else {
@@ -1881,9 +1927,11 @@
spv::Id leftRValue = accessChainLoad(node->getLeft()->getType());
// do the operation
+ spv::Builder::AccessChain::CoherentFlags coherentFlags = TranslateCoherent(node->getLeft()->getType());
+ coherentFlags |= TranslateCoherent(node->getRight()->getType());
OpDecorations decorations = { TranslatePrecisionDecoration(node->getOperationPrecision()),
TranslateNoContractionDecoration(node->getType().getQualifier()),
- TranslateNonUniformDecoration(node->getType().getQualifier()) };
+ TranslateNonUniformDecoration(coherentFlags) };
rValue = createBinaryOperation(node->getOp(), decorations,
convertGlslangToSpvType(node->getType()), leftRValue, rValue,
node->getType().getBasicType());
@@ -1914,13 +1962,16 @@
if (! node->getLeft()->getType().isArray() &&
node->getLeft()->getType().isVector() &&
node->getOp() == glslang::EOpIndexDirect) {
+ // Swizzle is uniform so propagate uniform into access chain
+ spv::Builder::AccessChain::CoherentFlags coherentFlags = TranslateCoherent(node->getLeft()->getType());
+ coherentFlags.nonUniform = 0;
// This is essentially a hard-coded vector swizzle of size 1,
// so short circuit the access-chain stuff with a swizzle.
std::vector<unsigned> swizzle;
swizzle.push_back(glslangIndex);
int dummySize;
builder.accessChainPushSwizzle(swizzle, convertGlslangToSpvType(node->getLeft()->getType()),
- TranslateCoherent(node->getLeft()->getType()),
+ coherentFlags,
glslangIntermediate->getBaseAlignmentScalar(
node->getLeft()->getType(), dummySize));
} else {
@@ -1951,9 +2002,14 @@
}
}
+ // Struct reference propagates uniform lvalue
+ spv::Builder::AccessChain::CoherentFlags coherentFlags =
+ TranslateCoherent(node->getLeft()->getType());
+ coherentFlags.nonUniform = 0;
+
// normal case for indexing array or structure or block
builder.accessChainPush(builder.makeIntConstant(spvIndex),
- TranslateCoherent(node->getLeft()->getType()),
+ coherentFlags,
node->getLeft()->getType().getBufferReferenceAlignment());
// Add capabilities here for accessing PointSize and clip/cull distance.
@@ -1987,15 +2043,20 @@
// restore the saved access chain
builder.setAccessChain(partial);
+ // Only if index is nonUniform should we propagate nonUniform into access chain
+ spv::Builder::AccessChain::CoherentFlags index_flags = TranslateCoherent(node->getRight()->getType());
+ spv::Builder::AccessChain::CoherentFlags coherent_flags = TranslateCoherent(node->getLeft()->getType());
+ coherent_flags.nonUniform = index_flags.nonUniform;
+
if (! node->getLeft()->getType().isArray() && node->getLeft()->getType().isVector()) {
int dummySize;
- builder.accessChainPushComponent(index, convertGlslangToSpvType(node->getLeft()->getType()),
- TranslateCoherent(node->getLeft()->getType()),
+ builder.accessChainPushComponent(
+ index, convertGlslangToSpvType(node->getLeft()->getType()), coherent_flags,
glslangIntermediate->getBaseAlignmentScalar(node->getLeft()->getType(),
dummySize));
} else
- builder.accessChainPush(index, TranslateCoherent(node->getLeft()->getType()),
- node->getLeft()->getType().getBufferReferenceAlignment());
+ builder.accessChainPush(index, coherent_flags,
+ node->getLeft()->getType().getBufferReferenceAlignment());
}
return false;
case glslang::EOpVectorSwizzle:
@@ -2079,8 +2140,9 @@
// these require changing a 64-bit scaler -> a vector of 32-bit components
if (glslangType.isVector())
break;
- std::pair<spv::Id, spv::Id> ret(builder.makeVectorType(builder.makeUintType(32), 4),
- builder.makeUintType(64));
+ spv::Id ivec4_type = builder.makeVectorType(builder.makeUintType(32), 4);
+ spv::Id uint64_type = builder.makeUintType(64);
+ std::pair<spv::Id, spv::Id> ret(ivec4_type, uint64_type);
return ret;
}
// There are no SPIR-V builtins defined for these and map onto original non-transposed
@@ -2119,7 +2181,7 @@
// handle 32-bit v.xy* -> 64-bit
builder.clearAccessChain();
builder.setAccessChainLValue(object);
- object = builder.accessChainLoad(spv::NoPrecision, spv::DecorationMax, objectTypeId);
+ object = builder.accessChainLoad(spv::NoPrecision, spv::DecorationMax, spv::DecorationMax, objectTypeId);
std::vector<spv::Id> components;
components.push_back(builder.createCompositeExtract(object, builder.getContainedTypeId(objectTypeId), 0));
components.push_back(builder.createCompositeExtract(object, builder.getContainedTypeId(objectTypeId), 1));
@@ -2135,7 +2197,7 @@
// and we insert a transpose after loading the original non-transposed builtins
builder.clearAccessChain();
builder.setAccessChainLValue(object);
- object = builder.accessChainLoad(spv::NoPrecision, spv::DecorationMax, objectTypeId);
+ object = builder.accessChainLoad(spv::NoPrecision, spv::DecorationMax, spv::DecorationMax, objectTypeId);
return builder.createUnaryOp(spv::OpTranspose, desiredTypeId, object);
} else {
@@ -2322,7 +2384,7 @@
// The result of operation is always stored, but conditionally the
// consumed result. The consumed result is always an r-value.
builder.accessChainStore(result,
- TranslateNonUniformDecoration(node->getOperand()->getType().getQualifier()));
+ TranslateNonUniformDecoration(builder.getAccessChain().coherentFlags));
builder.clearAccessChain();
if (node->getOp() == glslang::EOpPreIncrement ||
node->getOp() == glslang::EOpPreDecrement)
@@ -2398,7 +2460,6 @@
spv::Id invertedType = spv::NoType; // to use to override the natural type of the node
std::vector<spv::Builder::AccessChain> complexLvalues; // for holding swizzling l-values too complex for
// SPIR-V, for an out parameter
- std::vector<glslang::TQualifier> complexLValueQualifiers;
std::vector<spv::Id> temporaryLvalues; // temporaries to pass, as proxies for complexLValues
auto resultType = [&invertedType, &node, this](){ return invertedType != spv::NoType ?
@@ -2452,6 +2513,10 @@
// anything else gets there, so visit out of order, doing them all now.
makeGlobalInitializers(node->getAsAggregate()->getSequence());
+ //Pre process linker objects for ray tracing stages
+ if (glslangIntermediate->isRayTracingStage())
+ collectRayTracingLinkerObjects();
+
// Initializers are done, don't want to visit again, but functions and link objects need to be processed,
// so do them manually.
visitFunctions(node->getAsAggregate()->getSequence());
@@ -2761,10 +2826,12 @@
binOp = node->getOp();
break;
- case glslang::EOpIgnoreIntersection:
- case glslang::EOpTerminateRay:
- case glslang::EOpTrace:
- case glslang::EOpExecuteCallable:
+ case glslang::EOpIgnoreIntersectionNV:
+ case glslang::EOpTerminateRayNV:
+ case glslang::EOpTraceNV:
+ case glslang::EOpTraceKHR:
+ case glslang::EOpExecuteCallableNV:
+ case glslang::EOpExecuteCallableKHR:
case glslang::EOpWritePackedPrimitiveIndices4x8NV:
noReturnValue = true;
break;
@@ -2773,7 +2840,7 @@
case glslang::EOpRayQueryGenerateIntersection:
case glslang::EOpRayQueryConfirmIntersection:
builder.addExtension("SPV_KHR_ray_query");
- builder.addCapability(spv::CapabilityRayQueryProvisionalKHR);
+ builder.addCapability(spv::CapabilityRayQueryKHR);
noReturnValue = true;
break;
case glslang::EOpRayQueryProceed:
@@ -2796,7 +2863,7 @@
case glslang::EOpRayQueryGetIntersectionObjectToWorld:
case glslang::EOpRayQueryGetIntersectionWorldToObject:
builder.addExtension("SPV_KHR_ray_query");
- builder.addCapability(spv::CapabilityRayQueryProvisionalKHR);
+ builder.addCapability(spv::CapabilityRayQueryKHR);
break;
case glslang::EOpCooperativeMatrixLoad:
case glslang::EOpCooperativeMatrixStore:
@@ -3020,7 +3087,6 @@
// receive the result, and must later swizzle that into the original
// l-value.
complexLvalues.push_back(builder.getAccessChain());
- complexLValueQualifiers.push_back(glslangOperands[arg]->getAsTyped()->getType().getQualifier());
temporaryLvalues.push_back(builder.createVariable(
spv::NoPrecision, spv::StorageClassFunction,
builder.accessChainGetInferredType(), "swizzleTemp"));
@@ -3050,11 +3116,18 @@
)) {
bool cond = glslangOperands[arg]->getAsConstantUnion()->getConstArray()[0].getBConst();
operands.push_back(builder.makeIntConstant(cond ? 1 : 0));
- }
- else {
+ } else if ((arg == 10 && glslangOp == glslang::EOpTraceKHR) ||
+ (arg == 1 && glslangOp == glslang::EOpExecuteCallableKHR)) {
+ const int opdNum = glslangOp == glslang::EOpTraceKHR ? 10 : 1;
+ const int set = glslangOp == glslang::EOpTraceKHR ? 0 : 1;
+ const int location = glslangOperands[opdNum]->getAsConstantUnion()->getConstArray()[0].getUConst();
+ auto itNode = locationToSymbol[set].find(location);
+ visitSymbol(itNode->second);
+ spv::Id symId = getSymbolId(itNode->second);
+ operands.push_back(symId);
+ } else {
operands.push_back(accessChainLoad(glslangOperands[arg]->getAsTyped()->getType()));
- }
-
+ }
}
}
@@ -3125,7 +3198,8 @@
for (unsigned int i = 0; i < temporaryLvalues.size(); ++i) {
builder.setAccessChain(complexLvalues[i]);
- builder.accessChainStore(builder.createLoad(temporaryLvalues[i], spv::NoPrecision), TranslateNonUniformDecoration(complexLValueQualifiers[i]));
+ builder.accessChainStore(builder.createLoad(temporaryLvalues[i], spv::NoPrecision),
+ TranslateNonUniformDecoration(complexLvalues[i].coherentFlags));
}
}
@@ -3456,11 +3530,11 @@
switch (node->getFlowOp()) {
case glslang::EOpKill:
- builder.makeDiscard();
+ builder.makeStatementTerminator(spv::OpKill, "post-discard");
break;
case glslang::EOpTerminateInvocation:
builder.addExtension(spv::E_SPV_KHR_terminate_invocation);
- builder.makeTerminateInvocation();
+ builder.makeStatementTerminator(spv::OpTerminateInvocation, "post-terminate-invocation");
break;
case glslang::EOpBreak:
if (breakForLoop.top())
@@ -3497,6 +3571,12 @@
builder.addExtension(spv::E_SPV_EXT_demote_to_helper_invocation);
builder.addCapability(spv::CapabilityDemoteToHelperInvocationEXT);
break;
+ case glslang::EOpTerminateRayKHR:
+ builder.makeStatementTerminator(spv::OpTerminateRayKHR, "post-terminateRayKHR");
+ break;
+ case glslang::EOpIgnoreIntersectionKHR:
+ builder.makeStatementTerminator(spv::OpIgnoreIntersectionKHR, "post-ignoreIntersectionKHR");
+ break;
#endif
default:
@@ -3551,6 +3631,11 @@
break;
#endif
default:
+ if (storageClass == spv::StorageClassWorkgroup &&
+ node->getType().getBasicType() == glslang::EbtBlock) {
+ builder.addCapability(spv::CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR);
+ break;
+ }
if (node->getType().contains16BitFloat())
builder.addCapability(spv::CapabilityFloat16);
if (node->getType().contains16BitInt())
@@ -3569,6 +3654,9 @@
} else if (storageClass == spv::StorageClassStorageBuffer) {
builder.addIncorporatedExtension(spv::E_SPV_KHR_8bit_storage, spv::Spv_1_5);
builder.addCapability(spv::CapabilityStorageBuffer8BitAccess);
+ } else if (storageClass == spv::StorageClassWorkgroup &&
+ node->getType().getBasicType() == glslang::EbtBlock) {
+ builder.addCapability(spv::CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR);
} else {
builder.addCapability(spv::CapabilityInt8);
}
@@ -3580,13 +3668,14 @@
spv::Id initializer = spv::NoResult;
- if (node->getType().getQualifier().storage == glslang::EvqUniform &&
- !node->getConstArray().empty()) {
- int nextConst = 0;
- initializer = createSpvConstantFromConstUnionArray(node->getType(),
- node->getConstArray(),
- nextConst,
- false /* specConst */);
+ if (node->getType().getQualifier().storage == glslang::EvqUniform && !node->getConstArray().empty()) {
+ int nextConst = 0;
+ initializer = createSpvConstantFromConstUnionArray(node->getType(),
+ node->getConstArray(),
+ nextConst,
+ false /* specConst */);
+ } else if (node->getType().getQualifier().isNullInit()) {
+ initializer = builder.makeNullConstant(spvType);
}
return builder.createVariable(spv::NoPrecision, storageClass, spvType, name, initializer);
@@ -3716,10 +3805,36 @@
spvType = builder.makeUintType(32);
break;
case glslang::EbtAccStruct:
+ switch (glslangIntermediate->getStage()) {
+ case EShLangRayGen:
+ case EShLangIntersect:
+ case EShLangAnyHit:
+ case EShLangClosestHit:
+ case EShLangMiss:
+ case EShLangCallable:
+ // these all should have the RayTracingNV/KHR capability already
+ break;
+ default:
+ {
+ auto& extensions = glslangIntermediate->getRequestedExtensions();
+ if (extensions.find("GL_EXT_ray_query") != extensions.end()) {
+ builder.addExtension(spv::E_SPV_KHR_ray_query);
+ builder.addCapability(spv::CapabilityRayQueryKHR);
+ }
+ }
+ break;
+ }
spvType = builder.makeAccelerationStructureType();
break;
case glslang::EbtRayQuery:
- spvType = builder.makeRayQueryType();
+ {
+ auto& extensions = glslangIntermediate->getRequestedExtensions();
+ if (extensions.find("GL_EXT_ray_query") != extensions.end()) {
+ builder.addExtension(spv::E_SPV_KHR_ray_query);
+ builder.addCapability(spv::CapabilityRayQueryKHR);
+ }
+ spvType = builder.makeRayQueryType();
+ }
break;
case glslang::EbtReference:
{
@@ -4135,6 +4250,7 @@
alignment |= type.getBufferReferenceAlignment();
spv::Id loadedId = builder.accessChainLoad(TranslatePrecisionDecoration(type),
+ TranslateNonUniformDecoration(builder.getAccessChain().coherentFlags),
TranslateNonUniformDecoration(type.getQualifier()),
nominalTypeId,
spv::MemoryAccessMask(TranslateMemoryAccess(coherentFlags) & ~spv::MemoryAccessMakePointerAvailableKHRMask),
@@ -4202,7 +4318,7 @@
unsigned int alignment = builder.getAccessChain().alignment;
alignment |= type.getBufferReferenceAlignment();
- builder.accessChainStore(rvalue, TranslateNonUniformDecoration(type.getQualifier()),
+ builder.accessChainStore(rvalue, TranslateNonUniformDecoration(builder.getAccessChain().coherentFlags),
spv::MemoryAccessMask(TranslateMemoryAccess(coherentFlags) &
~spv::MemoryAccessMakePointerVisibleKHRMask),
TranslateMemoryScope(coherentFlags), alignment);
@@ -4307,6 +4423,7 @@
// has to be a uniform or buffer block or task in/out blocks
if (type.getQualifier().storage != glslang::EvqUniform &&
type.getQualifier().storage != glslang::EvqBuffer &&
+ type.getQualifier().storage != glslang::EvqShared &&
!type.getQualifier().isTaskMemory())
return glslang::ElpNone;
@@ -4590,7 +4707,39 @@
}
}
}
+// Walk over all linker objects to create a map for payload and callable data linker objects
+// and their location to be used during codegen for OpTraceKHR and OpExecuteCallableKHR
+// This is done here since it is possible that these linker objects are not be referenced in the AST
+void TGlslangToSpvTraverser::collectRayTracingLinkerObjects()
+{
+ glslang::TIntermAggregate* linkerObjects = glslangIntermediate->findLinkerObjects();
+ for (auto& objSeq : linkerObjects->getSequence()) {
+ auto objNode = objSeq->getAsSymbolNode();
+ if (objNode != nullptr) {
+ if (objNode->getQualifier().hasLocation()) {
+ unsigned int location = objNode->getQualifier().layoutLocation;
+ auto st = objNode->getQualifier().storage;
+ int set;
+ switch (st)
+ {
+ case glslang::EvqPayload:
+ case glslang::EvqPayloadIn:
+ set = 0;
+ break;
+ case glslang::EvqCallableData:
+ case glslang::EvqCallableDataIn:
+ set = 1;
+ break;
+ default:
+ set = -1;
+ }
+ if (set != -1)
+ locationToSymbol[set].insert(std::make_pair(location, objNode));
+ }
+ }
+ }
+}
// Process all the functions, while skipping initializers.
void TGlslangToSpvTraverser::visitFunctions(const glslang::TIntermSequence& glslFunctions)
{
@@ -4734,8 +4883,10 @@
}
if (lvalue) {
- arguments.push_back(builder.accessChainGetLValue());
+ spv::Id lvalue_id = builder.accessChainGetLValue();
+ arguments.push_back(lvalue_id);
lvalueCoherentFlags = builder.getAccessChain().coherentFlags;
+ builder.addDecoration(lvalue_id, TranslateNonUniformDecoration(lvalueCoherentFlags));
lvalueCoherentFlags |= TranslateCoherent(glslangArguments[i]->getAsTyped()->getType());
} else
#endif
@@ -5415,6 +5566,7 @@
// 3. Make the call.
spv::Id result = builder.createFunctionCall(function, spvArgs);
builder.setPrecision(result, TranslatePrecisionDecoration(node->getType()));
+ builder.addDecoration(result, TranslateNonUniformDecoration(node->getType().getQualifier()));
// 4. Copy back out an "out" arguments.
lValueCount = 0;
@@ -5424,6 +5576,7 @@
else if (writableParam(qualifiers[a])) {
if (qualifiers[a] == glslang::EvqOut || qualifiers[a] == glslang::EvqInOut) {
spv::Id copy = builder.createLoad(spvArgs[a], spv::NoPrecision);
+ builder.addDecoration(copy, TranslateNonUniformDecoration(argTypes[a]->getQualifier()));
builder.setAccessChain(lValues[lValueCount]);
multiTypeStore(*argTypes[a], copy);
}
@@ -6211,6 +6364,11 @@
case glslang::EOpConstructReference:
unaryOp = spv::OpBitcast;
break;
+
+ case glslang::EOpConvUint64ToAccStruct:
+ case glslang::EOpConvUvec2ToAccStruct:
+ unaryOp = spv::OpConvertUToAccelerationStructureKHR;
+ break;
#endif
case glslang::EOpCopyObject:
@@ -6855,6 +7013,10 @@
builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
}
+ if (builder.getConstantScalar(scopeId) == spv::ScopeQueueFamily) {
+ builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
+ }
+
if (glslangIntermediate->usingVulkanMemoryModel() && builder.getConstantScalar(scopeId) == spv::ScopeDevice) {
builder.addCapability(spv::CapabilityVulkanMemoryModelDeviceScopeKHR);
}
@@ -7797,10 +7959,16 @@
typeId = builder.makeBoolType();
opCode = spv::OpReportIntersectionKHR;
break;
- case glslang::EOpTrace:
+ case glslang::EOpTraceNV:
+ builder.createNoResultOp(spv::OpTraceNV, operands);
+ return 0;
+ case glslang::EOpTraceKHR:
builder.createNoResultOp(spv::OpTraceRayKHR, operands);
return 0;
- case glslang::EOpExecuteCallable:
+ case glslang::EOpExecuteCallableNV:
+ builder.createNoResultOp(spv::OpExecuteCallableNV, operands);
+ return 0;
+ case glslang::EOpExecuteCallableKHR:
builder.createNoResultOp(spv::OpExecuteCallableKHR, operands);
return 0;
@@ -7845,7 +8013,7 @@
opCode = spv::OpRayQueryGetIntersectionInstanceIdKHR;
break;
case glslang::EOpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffset:
- typeId = builder.makeIntType(32);
+ typeId = builder.makeUintType(32);
opCode = spv::OpRayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR;
break;
case glslang::EOpRayQueryGetIntersectionGeometryIndex:
@@ -8088,11 +8256,11 @@
spv::Id id = builder.createBuiltinCall(typeId, getExtBuiltins(spv::E_SPV_AMD_gcn_shader), spv::TimeAMD, args);
return builder.setPrecision(id, precision);
}
- case glslang::EOpIgnoreIntersection:
- builder.createNoResultOp(spv::OpIgnoreIntersectionKHR);
+ case glslang::EOpIgnoreIntersectionNV:
+ builder.createNoResultOp(spv::OpIgnoreIntersectionNV);
return 0;
- case glslang::EOpTerminateRay:
- builder.createNoResultOp(spv::OpTerminateRayKHR);
+ case glslang::EOpTerminateRayNV:
+ builder.createNoResultOp(spv::OpTerminateRayNV);
return 0;
case glslang::EOpRayQueryInitialize:
builder.createNoResultOp(spv::OpRayQueryInitializeKHR);
@@ -8220,7 +8388,8 @@
}
#ifndef GLSLANG_WEB
- if (symbol->getType().isImage()) {
+ // Subgroup builtins which have input storage class are volatile for ray tracing stages.
+ if (symbol->getType().isImage() || symbol->getQualifier().isPipeInput()) {
std::vector<spv::Decoration> memory;
TranslateMemoryDecoration(symbol->getType().getQualifier(), memory,
glslangIntermediate->usingVulkanMemoryModel());
@@ -8228,9 +8397,6 @@
builder.addDecoration(id, memory[i]);
}
- // nonuniform
- builder.addDecoration(id, TranslateNonUniformDecoration(symbol->getType().getQualifier()));
-
if (builtIn == spv::BuiltInSampleMask) {
spv::Decoration decoration;
// GL_NV_sample_mask_override_coverage extension
diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp
index 85ffe90..1401bb0 100644
--- a/SPIRV/SpvBuilder.cpp
+++ b/SPIRV/SpvBuilder.cpp
@@ -621,13 +621,13 @@
Id Builder::makeRayQueryType()
{
Instruction *type;
- if (groupedTypes[OpTypeRayQueryProvisionalKHR].size() == 0) {
- type = new Instruction(getUniqueId(), NoType, OpTypeRayQueryProvisionalKHR);
- groupedTypes[OpTypeRayQueryProvisionalKHR].push_back(type);
+ if (groupedTypes[OpTypeRayQueryKHR].size() == 0) {
+ type = new Instruction(getUniqueId(), NoType, OpTypeRayQueryKHR);
+ groupedTypes[OpTypeRayQueryKHR].push_back(type);
constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(type));
module.mapInstruction(type);
} else {
- type = groupedTypes[OpTypeRayQueryProvisionalKHR].back();
+ type = groupedTypes[OpTypeRayQueryKHR].back();
}
return type->getResultId();
@@ -869,6 +869,30 @@
}
}
+Id Builder::makeNullConstant(Id typeId)
+{
+ Instruction* constant;
+
+ // See if we already made it.
+ Id existing = NoResult;
+ for (int i = 0; i < (int)nullConstants.size(); ++i) {
+ constant = nullConstants[i];
+ if (constant->getTypeId() == typeId)
+ existing = constant->getResultId();
+ }
+
+ if (existing != NoResult)
+ return existing;
+
+ // Make it
+ Instruction* c = new Instruction(getUniqueId(), typeId, OpConstantNull);
+ constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(c));
+ nullConstants.push_back(c);
+ module.mapInstruction(c);
+
+ return c->getResultId();
+}
+
Id Builder::makeBoolConstant(bool b, bool specConstant)
{
Id typeId = makeBoolType();
@@ -1447,17 +1471,10 @@
}
// Comments in header
-void Builder::makeDiscard()
+void Builder::makeStatementTerminator(spv::Op opcode, const char *name)
{
- buildPoint->addInstruction(std::unique_ptr<Instruction>(new Instruction(OpKill)));
- createAndSetNoPredecessorBlock("post-discard");
-}
-
-// Comments in header
-void Builder::makeTerminateInvocation()
-{
- buildPoint->addInstruction(std::unique_ptr<Instruction>(new Instruction(OpTerminateInvocation)));
- createAndSetNoPredecessorBlock("post-terminate-invocation");
+ buildPoint->addInstruction(std::unique_ptr<Instruction>(new Instruction(opcode)));
+ createAndSetNoPredecessorBlock(name);
}
// Comments in header
@@ -2798,8 +2815,9 @@
}
// Comments in header
-Id Builder::accessChainLoad(Decoration precision, Decoration nonUniform, Id resultType,
- spv::MemoryAccessMask memoryAccess, spv::Scope scope, unsigned int alignment)
+Id Builder::accessChainLoad(Decoration precision, Decoration l_nonUniform,
+ Decoration r_nonUniform, Id resultType, spv::MemoryAccessMask memoryAccess,
+ spv::Scope scope, unsigned int alignment)
{
Id id;
@@ -2863,9 +2881,9 @@
// Buffer accesses need the access chain decorated, and this is where
// loaded image types get decorated. TODO: This should maybe move to
// createImageTextureFunctionCall.
- addDecoration(id, nonUniform);
+ addDecoration(id, l_nonUniform);
id = createLoad(id, precision, memoryAccess, scope, alignment);
- addDecoration(id, nonUniform);
+ addDecoration(id, r_nonUniform);
}
// Done, unless there are swizzles to do
@@ -2886,7 +2904,7 @@
if (accessChain.component != NoResult)
id = setPrecision(createVectorExtractDynamic(id, resultType, accessChain.component), precision);
- addDecoration(id, nonUniform);
+ addDecoration(id, r_nonUniform);
return id;
}
diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
index 873c0cd..73847e1 100644
--- a/SPIRV/SpvBuilder.h
+++ b/SPIRV/SpvBuilder.h
@@ -293,6 +293,7 @@
}
// For making new constants (will return old constant if the requested one was already made).
+ Id makeNullConstant(Id typeId);
Id makeBoolConstant(bool b, bool specConstant = false);
Id makeInt8Constant(int i, bool specConstant = false)
{ return makeIntConstant(makeIntType(8), (unsigned)i, specConstant); }
@@ -357,9 +358,9 @@
// Generate all the code needed to finish up a function.
void leaveFunction();
- // Create a discard or terminate-invocation.
- void makeDiscard();
- void makeTerminateInvocation();
+ // Create block terminator instruction for certain statements like
+ // discard, terminate-invocation, terminateRayEXT, or ignoreIntersectionEXT
+ void makeStatementTerminator(spv::Op opcode, const char *name);
// Create a global or function local or IO variable.
Id createVariable(Decoration precision, StorageClass, Id type, const char* name = nullptr,
@@ -625,6 +626,7 @@
CoherentFlags operator |=(const CoherentFlags &other) { return *this; }
#else
bool isVolatile() const { return volatil; }
+ bool isNonUniform() const { return nonUniform; }
bool anyCoherent() const {
return coherent || devicecoherent || queuefamilycoherent || workgroupcoherent ||
subgroupcoherent || shadercallcoherent;
@@ -639,6 +641,7 @@
unsigned nonprivate : 1;
unsigned volatil : 1;
unsigned isImage : 1;
+ unsigned nonUniform : 1;
void clear() {
coherent = 0;
@@ -650,6 +653,7 @@
nonprivate = 0;
volatil = 0;
isImage = 0;
+ nonUniform = 0;
}
CoherentFlags operator |=(const CoherentFlags &other) {
@@ -662,6 +666,7 @@
nonprivate |= other.nonprivate;
volatil |= other.volatil;
isImage |= other.isImage;
+ nonUniform |= other.nonUniform;
return *this;
}
#endif
@@ -727,7 +732,7 @@
spv::Scope scope = spv::ScopeMax, unsigned int alignment = 0);
// use accessChain and swizzle to load an r-value
- Id accessChainLoad(Decoration precision, Decoration nonUniform, Id ResultType,
+ Id accessChainLoad(Decoration precision, Decoration l_nonUniform, Decoration r_nonUniform, Id ResultType,
spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMaskNone, spv::Scope scope = spv::ScopeMax,
unsigned int alignment = 0);
@@ -834,6 +839,8 @@
std::unordered_map<unsigned int, std::vector<Instruction*>> groupedStructConstants;
// map type opcodes to type instructions
std::unordered_map<unsigned int, std::vector<Instruction*>> groupedTypes;
+ // list of OpConstantNull instructions
+ std::vector<Instruction*> nullConstants;
// stack of switches
std::stack<Block*> switchMerges;
diff --git a/SPIRV/SpvPostProcess.cpp b/SPIRV/SpvPostProcess.cpp
index d40174d..23d7b5a 100644
--- a/SPIRV/SpvPostProcess.cpp
+++ b/SPIRV/SpvPostProcess.cpp
@@ -436,6 +436,38 @@
}
}
}
+
+ // If any Vulkan memory model-specific functionality is used, update the
+ // OpMemoryModel to match.
+ if (capabilities.find(spv::CapabilityVulkanMemoryModelKHR) != capabilities.end()) {
+ memoryModel = spv::MemoryModelVulkanKHR;
+ addIncorporatedExtension(spv::E_SPV_KHR_vulkan_memory_model, spv::Spv_1_5);
+ }
+
+ // Add Aliased decoration if there's more than one Workgroup Block variable.
+ if (capabilities.find(spv::CapabilityWorkgroupMemoryExplicitLayoutKHR) != capabilities.end()) {
+ assert(entryPoints.size() == 1);
+ auto &ep = entryPoints[0];
+
+ std::vector<Id> workgroup_variables;
+ for (int i = 0; i < (int)ep->getNumOperands(); i++) {
+ if (!ep->isIdOperand(i))
+ continue;
+
+ const Id id = ep->getIdOperand(i);
+ const Instruction *instr = module.getInstruction(id);
+ if (instr->getOpCode() != spv::OpVariable)
+ continue;
+
+ if (instr->getImmediateOperand(0) == spv::StorageClassWorkgroup)
+ workgroup_variables.push_back(id);
+ }
+
+ if (workgroup_variables.size() > 1) {
+ for (size_t i = 0; i < workgroup_variables.size(); i++)
+ addDecoration(workgroup_variables[i], spv::DecorationAliased);
+ }
+ }
}
#endif
diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp
index 16d051a..5cfc426 100644
--- a/SPIRV/SpvTools.cpp
+++ b/SPIRV/SpvTools.cpp
@@ -153,6 +153,8 @@
spv_validator_options options = spvValidatorOptionsCreate();
spvValidatorOptionsSetRelaxBlockLayout(options, intermediate.usingHlslOffsets());
spvValidatorOptionsSetBeforeHlslLegalization(options, prelegalization);
+ spvValidatorOptionsSetScalarBlockLayout(options, intermediate.usingScalarBlockLayout());
+ spvValidatorOptionsSetWorkgroupScalarBlockLayout(options, intermediate.usingScalarBlockLayout());
spvValidateWithOptions(context, options, &binary, &diagnostic);
// report
diff --git a/SPIRV/doc.cpp b/SPIRV/doc.cpp
index 3d08204..6805c3a 100644
--- a/SPIRV/doc.cpp
+++ b/SPIRV/doc.cpp
@@ -395,7 +395,7 @@
case BuiltInRayGeometryIndexKHR: return "RayGeometryIndexKHR";
case BuiltInObjectToWorldKHR: return "ObjectToWorldKHR";
case BuiltInWorldToObjectKHR: return "WorldToObjectKHR";
- case BuiltInHitTKHR: return "HitTKHR";
+ case BuiltInHitTNV: return "HitTNV";
case BuiltInHitKindKHR: return "HitKindKHR";
case BuiltInIncomingRayFlagsKHR: return "IncomingRayFlagsKHR";
case BuiltInViewportMaskNV: return "ViewportMaskNV";
@@ -915,9 +915,9 @@
case CapabilityPerViewAttributesNV: return "PerViewAttributesNV";
case CapabilityGroupNonUniformPartitionedNV: return "GroupNonUniformPartitionedNV";
case CapabilityRayTracingNV: return "RayTracingNV";
- case CapabilityRayTracingProvisionalKHR: return "RayTracingProvisionalKHR";
- case CapabilityRayQueryProvisionalKHR: return "RayQueryProvisionalKHR";
- case CapabilityRayTraversalPrimitiveCullingProvisionalKHR: return "RayTraversalPrimitiveCullingProvisionalKHR";
+ case CapabilityRayTracingKHR: return "RayTracingKHR";
+ case CapabilityRayQueryKHR: return "RayQueryKHR";
+ case CapabilityRayTraversalPrimitiveCullingKHR: return "RayTraversalPrimitiveCullingKHR";
case CapabilityComputeDerivativeGroupQuadsNV: return "ComputeDerivativeGroupQuadsNV";
case CapabilityComputeDerivativeGroupLinearNV: return "ComputeDerivativeGroupLinearNV";
case CapabilityFragmentBarycentricNV: return "FragmentBarycentricNV";
@@ -967,6 +967,10 @@
case CapabilityAtomicFloat32AddEXT: return "AtomicFloat32AddEXT";
case CapabilityAtomicFloat64AddEXT: return "AtomicFloat64AddEXT";
+ case CapabilityWorkgroupMemoryExplicitLayoutKHR: return "CapabilityWorkgroupMemoryExplicitLayoutKHR";
+ case CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR: return "CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR";
+ case CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR: return "CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR";
+
default: return "Bad";
}
}
@@ -1364,17 +1368,23 @@
case OpDecorateStringGOOGLE: return "OpDecorateStringGOOGLE";
case OpMemberDecorateStringGOOGLE: return "OpMemberDecorateStringGOOGLE";
+ case OpReportIntersectionKHR: return "OpReportIntersectionKHR";
+ case OpIgnoreIntersectionNV: return "OpIgnoreIntersectionNV";
+ case OpIgnoreIntersectionKHR: return "OpIgnoreIntersectionKHR";
+ case OpTerminateRayNV: return "OpTerminateRayNV";
+ case OpTerminateRayKHR: return "OpTerminateRayKHR";
+ case OpTraceNV: return "OpTraceNV";
+ case OpTraceRayKHR: return "OpTraceRayKHR";
+ case OpTypeAccelerationStructureKHR: return "OpTypeAccelerationStructureKHR";
+ case OpExecuteCallableNV: return "OpExecuteCallableNV";
+ case OpExecuteCallableKHR: return "OpExecuteCallableKHR";
+ case OpConvertUToAccelerationStructureKHR: return "OpConvertUToAccelerationStructureKHR";
+
case OpGroupNonUniformPartitionNV: return "OpGroupNonUniformPartitionNV";
- case OpReportIntersectionKHR: return "OpReportIntersectionKHR";
- case OpIgnoreIntersectionKHR: return "OpIgnoreIntersectionKHR";
- case OpTerminateRayKHR: return "OpTerminateRayKHR";
- case OpTraceRayKHR: return "OpTraceRayKHR";
- case OpTypeAccelerationStructureKHR: return "OpTypeAccelerationStructureKHR";
- case OpExecuteCallableKHR: return "OpExecuteCallableKHR";
case OpImageSampleFootprintNV: return "OpImageSampleFootprintNV";
case OpWritePackedPrimitiveIndices4x8NV: return "OpWritePackedPrimitiveIndices4x8NV";
- case OpTypeRayQueryProvisionalKHR: return "OpTypeRayQueryProvisionalKHR";
+ case OpTypeRayQueryKHR: return "OpTypeRayQueryKHR";
case OpRayQueryInitializeKHR: return "OpRayQueryInitializeKHR";
case OpRayQueryTerminateKHR: return "OpRayQueryTerminateKHR";
case OpRayQueryGenerateIntersectionKHR: return "OpRayQueryGenerateIntersectionKHR";
@@ -2771,7 +2781,20 @@
InstructionDesc[OpTypeAccelerationStructureKHR].setResultAndType(true, false);
- InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'NV Acceleration Structure'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'Acceleration Structure'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'Ray Flags'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'Cull Mask'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'SBT Record Offset'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'SBT Record Stride'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'Miss Index'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'Ray Origin'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'TMin'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'Ray Direction'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'TMax'");
+ InstructionDesc[OpTraceNV].operands.push(OperandId, "'Payload'");
+ InstructionDesc[OpTraceNV].setResultAndType(false, false);
+
+ InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'Acceleration Structure'");
InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'Ray Flags'");
InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'Cull Mask'");
InstructionDesc[OpTraceRayKHR].operands.push(OperandId, "'SBT Record Offset'");
@@ -2787,17 +2810,28 @@
InstructionDesc[OpReportIntersectionKHR].operands.push(OperandId, "'Hit Parameter'");
InstructionDesc[OpReportIntersectionKHR].operands.push(OperandId, "'Hit Kind'");
+ InstructionDesc[OpIgnoreIntersectionNV].setResultAndType(false, false);
+
InstructionDesc[OpIgnoreIntersectionKHR].setResultAndType(false, false);
+ InstructionDesc[OpTerminateRayNV].setResultAndType(false, false);
+
InstructionDesc[OpTerminateRayKHR].setResultAndType(false, false);
+ InstructionDesc[OpExecuteCallableNV].operands.push(OperandId, "SBT Record Index");
+ InstructionDesc[OpExecuteCallableNV].operands.push(OperandId, "CallableData ID");
+ InstructionDesc[OpExecuteCallableNV].setResultAndType(false, false);
+
InstructionDesc[OpExecuteCallableKHR].operands.push(OperandId, "SBT Record Index");
- InstructionDesc[OpExecuteCallableKHR].operands.push(OperandId, "CallableData ID");
+ InstructionDesc[OpExecuteCallableKHR].operands.push(OperandId, "CallableData");
InstructionDesc[OpExecuteCallableKHR].setResultAndType(false, false);
+ InstructionDesc[OpConvertUToAccelerationStructureKHR].operands.push(OperandId, "Value");
+ InstructionDesc[OpConvertUToAccelerationStructureKHR].setResultAndType(true, true);
+
// Ray Query
InstructionDesc[OpTypeAccelerationStructureKHR].setResultAndType(true, false);
- InstructionDesc[OpTypeRayQueryProvisionalKHR].setResultAndType(true, false);
+ InstructionDesc[OpTypeRayQueryKHR].setResultAndType(true, false);
InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'RayQuery'");
InstructionDesc[OpRayQueryInitializeKHR].operands.push(OperandId, "'AccelerationS'");
diff --git a/SPIRV/spirv.hpp b/SPIRV/spirv.hpp
index ef5670e..af629ef 100644
--- a/SPIRV/spirv.hpp
+++ b/SPIRV/spirv.hpp
@@ -50,11 +50,11 @@
typedef unsigned int Id;
#define SPV_VERSION 0x10500
-#define SPV_REVISION 3
+#define SPV_REVISION 4
static const unsigned int MagicNumber = 0x07230203;
static const unsigned int Version = 0x00010500;
-static const unsigned int Revision = 3;
+static const unsigned int Revision = 4;
static const unsigned int OpCodeMask = 0xffff;
static const unsigned int WordCountShift = 16;
@@ -168,10 +168,16 @@
ExecutionModeSampleInterlockUnorderedEXT = 5369,
ExecutionModeShadingRateInterlockOrderedEXT = 5370,
ExecutionModeShadingRateInterlockUnorderedEXT = 5371,
+ ExecutionModeSharedLocalMemorySizeINTEL = 5618,
+ ExecutionModeRoundingModeRTPINTEL = 5620,
+ ExecutionModeRoundingModeRTNINTEL = 5621,
+ ExecutionModeFloatingPointModeALTINTEL = 5622,
+ ExecutionModeFloatingPointModeIEEEINTEL = 5623,
ExecutionModeMaxWorkgroupSizeINTEL = 5893,
ExecutionModeMaxWorkDimINTEL = 5894,
ExecutionModeNoGlobalOffsetINTEL = 5895,
ExecutionModeNumSIMDWorkitemsINTEL = 5896,
+ ExecutionModeSchedulerTargetFmaxMhzINTEL = 5903,
ExecutionModeMax = 0x7fffffff,
};
@@ -204,6 +210,8 @@
StorageClassPhysicalStorageBuffer = 5349,
StorageClassPhysicalStorageBufferEXT = 5349,
StorageClassCodeSectionINTEL = 5605,
+ StorageClassDeviceOnlyINTEL = 5936,
+ StorageClassHostOnlyINTEL = 5937,
StorageClassMax = 0x7fffffff,
};
@@ -374,6 +382,8 @@
FPFastMathModeNSZShift = 2,
FPFastMathModeAllowRecipShift = 3,
FPFastMathModeFastShift = 4,
+ FPFastMathModeAllowContractFastINTELShift = 16,
+ FPFastMathModeAllowReassocINTELShift = 17,
FPFastMathModeMax = 0x7fffffff,
};
@@ -384,6 +394,8 @@
FPFastMathModeNSZMask = 0x00000004,
FPFastMathModeAllowRecipMask = 0x00000008,
FPFastMathModeFastMask = 0x00000010,
+ FPFastMathModeAllowContractFastINTELMask = 0x00010000,
+ FPFastMathModeAllowReassocINTELMask = 0x00020000,
};
enum FPRoundingMode {
@@ -484,12 +496,22 @@
DecorationRestrictPointerEXT = 5355,
DecorationAliasedPointer = 5356,
DecorationAliasedPointerEXT = 5356,
+ DecorationSIMTCallINTEL = 5599,
DecorationReferencedIndirectlyINTEL = 5602,
+ DecorationClobberINTEL = 5607,
+ DecorationSideEffectsINTEL = 5608,
+ DecorationVectorComputeVariableINTEL = 5624,
+ DecorationFuncParamIOKindINTEL = 5625,
+ DecorationVectorComputeFunctionINTEL = 5626,
+ DecorationStackCallINTEL = 5627,
+ DecorationGlobalVariableOffsetINTEL = 5628,
DecorationCounterBuffer = 5634,
DecorationHlslCounterBufferGOOGLE = 5634,
DecorationHlslSemanticGOOGLE = 5635,
DecorationUserSemantic = 5635,
DecorationUserTypeGOOGLE = 5636,
+ DecorationFunctionRoundingModeINTEL = 5822,
+ DecorationFunctionDenormModeINTEL = 5823,
DecorationRegisterINTEL = 5825,
DecorationMemoryINTEL = 5826,
DecorationNumbanksINTEL = 5827,
@@ -502,6 +524,17 @@
DecorationMergeINTEL = 5834,
DecorationBankBitsINTEL = 5835,
DecorationForcePow2DepthINTEL = 5836,
+ DecorationBurstCoalesceINTEL = 5899,
+ DecorationCacheSizeINTEL = 5900,
+ DecorationDontStaticallyCoalesceINTEL = 5901,
+ DecorationPrefetchINTEL = 5902,
+ DecorationStallEnableINTEL = 5905,
+ DecorationFuseLoopsInFunctionINTEL = 5907,
+ DecorationBufferLocationINTEL = 5921,
+ DecorationIOPipeStorageINTEL = 5944,
+ DecorationFunctionFloatingPointModeINTEL = 6080,
+ DecorationSingleElementVectorINTEL = 6085,
+ DecorationVectorComputeCallableFunctionINTEL = 6087,
DecorationMax = 0x7fffffff,
};
@@ -614,7 +647,6 @@
BuiltInObjectToWorldNV = 5330,
BuiltInWorldToObjectKHR = 5331,
BuiltInWorldToObjectNV = 5331,
- BuiltInHitTKHR = 5332,
BuiltInHitTNV = 5332,
BuiltInHitKindKHR = 5333,
BuiltInHitKindNV = 5333,
@@ -657,6 +689,7 @@
LoopControlLoopCoalesceINTELShift = 20,
LoopControlMaxInterleavingINTELShift = 21,
LoopControlSpeculatedIterationsINTELShift = 22,
+ LoopControlNoFusionINTELShift = 23,
LoopControlMax = 0x7fffffff,
};
@@ -678,6 +711,7 @@
LoopControlLoopCoalesceINTELMask = 0x00100000,
LoopControlMaxInterleavingINTELMask = 0x00200000,
LoopControlSpeculatedIterationsINTELMask = 0x00400000,
+ LoopControlNoFusionINTELMask = 0x00800000,
};
enum FunctionControlShift {
@@ -877,6 +911,9 @@
CapabilityFragmentShadingRateKHR = 4422,
CapabilitySubgroupBallotKHR = 4423,
CapabilityDrawParameters = 4427,
+ CapabilityWorkgroupMemoryExplicitLayoutKHR = 4428,
+ CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR = 4429,
+ CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR = 4430,
CapabilitySubgroupVoteKHR = 4431,
CapabilityStorageBuffer16BitAccess = 4433,
CapabilityStorageUniformBufferBlock16 = 4433,
@@ -899,7 +936,9 @@
CapabilityRoundingModeRTE = 4467,
CapabilityRoundingModeRTZ = 4468,
CapabilityRayQueryProvisionalKHR = 4471,
- CapabilityRayTraversalPrimitiveCullingProvisionalKHR = 4478,
+ CapabilityRayQueryKHR = 4472,
+ CapabilityRayTraversalPrimitiveCullingKHR = 4478,
+ CapabilityRayTracingKHR = 4479,
CapabilityFloat16ImageAMD = 5008,
CapabilityImageGatherBiasLodAMD = 5009,
CapabilityFragmentMaskAMD = 5010,
@@ -965,21 +1004,37 @@
CapabilitySubgroupBufferBlockIOINTEL = 5569,
CapabilitySubgroupImageBlockIOINTEL = 5570,
CapabilitySubgroupImageMediaBlockIOINTEL = 5579,
+ CapabilityRoundToInfinityINTEL = 5582,
+ CapabilityFloatingPointModeINTEL = 5583,
CapabilityIntegerFunctions2INTEL = 5584,
CapabilityFunctionPointersINTEL = 5603,
CapabilityIndirectReferencesINTEL = 5604,
+ CapabilityAsmINTEL = 5606,
+ CapabilityVectorComputeINTEL = 5617,
+ CapabilityVectorAnyINTEL = 5619,
CapabilitySubgroupAvcMotionEstimationINTEL = 5696,
CapabilitySubgroupAvcMotionEstimationIntraINTEL = 5697,
CapabilitySubgroupAvcMotionEstimationChromaINTEL = 5698,
+ CapabilityVariableLengthArrayINTEL = 5817,
+ CapabilityFunctionFloatControlINTEL = 5821,
CapabilityFPGAMemoryAttributesINTEL = 5824,
+ CapabilityFPFastMathModeINTEL = 5837,
+ CapabilityArbitraryPrecisionIntegersINTEL = 5844,
CapabilityUnstructuredLoopControlsINTEL = 5886,
CapabilityFPGALoopControlsINTEL = 5888,
CapabilityKernelAttributesINTEL = 5892,
CapabilityFPGAKernelAttributesINTEL = 5897,
+ CapabilityFPGAMemoryAccessesINTEL = 5898,
+ CapabilityFPGAClusterAttributesINTEL = 5904,
+ CapabilityLoopFuseINTEL = 5906,
+ CapabilityFPGABufferLocationINTEL = 5920,
+ CapabilityUSMStorageClassesINTEL = 5935,
+ CapabilityIOPipesINTEL = 5943,
CapabilityBlockingPipesINTEL = 5945,
CapabilityFPGARegINTEL = 5948,
CapabilityAtomicFloat32AddEXT = 6033,
CapabilityAtomicFloat64AddEXT = 6034,
+ CapabilityLongConstantCompositeINTEL = 6089,
CapabilityMax = 0x7fffffff,
};
@@ -1046,6 +1101,18 @@
FragmentShadingRateHorizontal4PixelsMask = 0x00000008,
};
+enum FPDenormMode {
+ FPDenormModePreserve = 0,
+ FPDenormModeFlushToZero = 1,
+ FPDenormModeMax = 0x7fffffff,
+};
+
+enum FPOperationMode {
+ FPOperationModeIEEE = 0,
+ FPOperationModeALT = 1,
+ FPOperationModeMax = 0x7fffffff,
+};
+
enum Op {
OpNop = 0,
OpUndef = 1,
@@ -1398,7 +1465,12 @@
OpSubgroupAnyKHR = 4429,
OpSubgroupAllEqualKHR = 4430,
OpSubgroupReadInvocationKHR = 4432,
- OpTypeRayQueryProvisionalKHR = 4472,
+ OpTraceRayKHR = 4445,
+ OpExecuteCallableKHR = 4446,
+ OpConvertUToAccelerationStructureKHR = 4447,
+ OpIgnoreIntersectionKHR = 4448,
+ OpTerminateRayKHR = 4449,
+ OpTypeRayQueryKHR = 4472,
OpRayQueryInitializeKHR = 4473,
OpRayQueryTerminateKHR = 4474,
OpRayQueryGenerateIntersectionKHR = 4475,
@@ -1421,15 +1493,11 @@
OpWritePackedPrimitiveIndices4x8NV = 5299,
OpReportIntersectionKHR = 5334,
OpReportIntersectionNV = 5334,
- OpIgnoreIntersectionKHR = 5335,
OpIgnoreIntersectionNV = 5335,
- OpTerminateRayKHR = 5336,
OpTerminateRayNV = 5336,
OpTraceNV = 5337,
- OpTraceRayKHR = 5337,
OpTypeAccelerationStructureKHR = 5341,
OpTypeAccelerationStructureNV = 5341,
- OpExecuteCallableKHR = 5344,
OpExecuteCallableNV = 5344,
OpTypeCooperativeMatrixNV = 5358,
OpCooperativeMatrixLoadNV = 5359,
@@ -1464,8 +1532,11 @@
OpUSubSatINTEL = 5596,
OpIMul32x16INTEL = 5597,
OpUMul32x16INTEL = 5598,
- OpFunctionPointerINTEL = 5600,
+ OpConstFunctionPointerINTEL = 5600,
OpFunctionPointerCallINTEL = 5601,
+ OpAsmTargetINTEL = 5609,
+ OpAsmINTEL = 5610,
+ OpAsmCallINTEL = 5611,
OpDecorateString = 5632,
OpDecorateStringGOOGLE = 5632,
OpMemberDecorateString = 5633,
@@ -1588,7 +1659,12 @@
OpSubgroupAvcSicGetPackedSkcLumaCountThresholdINTEL = 5814,
OpSubgroupAvcSicGetPackedSkcLumaSumThresholdINTEL = 5815,
OpSubgroupAvcSicGetInterRawSadsINTEL = 5816,
+ OpVariableLengthArrayINTEL = 5818,
+ OpSaveMemoryINTEL = 5819,
+ OpRestoreMemoryINTEL = 5820,
OpLoopControlINTEL = 5887,
+ OpPtrCastToCrossWorkgroupINTEL = 5934,
+ OpCrossWorkgroupCastToPtrINTEL = 5938,
OpReadPipeBlockingINTEL = 5946,
OpWritePipeBlockingINTEL = 5947,
OpFPGARegINTEL = 5949,
@@ -1610,6 +1686,10 @@
OpRayQueryGetIntersectionObjectToWorldKHR = 6031,
OpRayQueryGetIntersectionWorldToObjectKHR = 6032,
OpAtomicFAddEXT = 6035,
+ OpTypeBufferSurfaceINTEL = 6086,
+ OpTypeStructContinuedINTEL = 6090,
+ OpConstantCompositeContinuedINTEL = 6091,
+ OpSpecConstantCompositeContinuedINTEL = 6092,
OpMax = 0x7fffffff,
};
@@ -1849,7 +1929,6 @@
case OpBranchConditional: *hasResult = false; *hasResultType = false; break;
case OpSwitch: *hasResult = false; *hasResultType = false; break;
case OpKill: *hasResult = false; *hasResultType = false; break;
- case OpTerminateInvocation: *hasResult = false; *hasResultType = false; break;
case OpReturn: *hasResult = false; *hasResultType = false; break;
case OpReturnValue: *hasResult = false; *hasResultType = false; break;
case OpUnreachable: *hasResult = false; *hasResultType = false; break;
@@ -1970,7 +2049,12 @@
case OpSubgroupAnyKHR: *hasResult = true; *hasResultType = true; break;
case OpSubgroupAllEqualKHR: *hasResult = true; *hasResultType = true; break;
case OpSubgroupReadInvocationKHR: *hasResult = true; *hasResultType = true; break;
- case OpTypeRayQueryProvisionalKHR: *hasResult = true; *hasResultType = false; break;
+ case OpTraceRayKHR: *hasResult = false; *hasResultType = false; break;
+ case OpExecuteCallableKHR: *hasResult = false; *hasResultType = false; break;
+ case OpConvertUToAccelerationStructureKHR: *hasResult = true; *hasResultType = true; break;
+ case OpIgnoreIntersectionKHR: *hasResult = false; *hasResultType = false; break;
+ case OpTerminateRayKHR: *hasResult = false; *hasResultType = false; break;
+ case OpTypeRayQueryKHR: *hasResult = true; *hasResultType = false; break;
case OpRayQueryInitializeKHR: *hasResult = false; *hasResultType = false; break;
case OpRayQueryTerminateKHR: *hasResult = false; *hasResultType = false; break;
case OpRayQueryGenerateIntersectionKHR: *hasResult = false; *hasResultType = false; break;
@@ -2030,8 +2114,11 @@
case OpUSubSatINTEL: *hasResult = true; *hasResultType = true; break;
case OpIMul32x16INTEL: *hasResult = true; *hasResultType = true; break;
case OpUMul32x16INTEL: *hasResult = true; *hasResultType = true; break;
- case OpFunctionPointerINTEL: *hasResult = true; *hasResultType = true; break;
+ case OpConstFunctionPointerINTEL: *hasResult = true; *hasResultType = true; break;
case OpFunctionPointerCallINTEL: *hasResult = true; *hasResultType = true; break;
+ case OpAsmTargetINTEL: *hasResult = true; *hasResultType = true; break;
+ case OpAsmINTEL: *hasResult = true; *hasResultType = true; break;
+ case OpAsmCallINTEL: *hasResult = true; *hasResultType = true; break;
case OpDecorateString: *hasResult = false; *hasResultType = false; break;
case OpMemberDecorateString: *hasResult = false; *hasResultType = false; break;
case OpVmeImageINTEL: *hasResult = true; *hasResultType = true; break;
@@ -2152,7 +2239,12 @@
case OpSubgroupAvcSicGetPackedSkcLumaCountThresholdINTEL: *hasResult = true; *hasResultType = true; break;
case OpSubgroupAvcSicGetPackedSkcLumaSumThresholdINTEL: *hasResult = true; *hasResultType = true; break;
case OpSubgroupAvcSicGetInterRawSadsINTEL: *hasResult = true; *hasResultType = true; break;
+ case OpVariableLengthArrayINTEL: *hasResult = true; *hasResultType = true; break;
+ case OpSaveMemoryINTEL: *hasResult = true; *hasResultType = true; break;
+ case OpRestoreMemoryINTEL: *hasResult = false; *hasResultType = false; break;
case OpLoopControlINTEL: *hasResult = false; *hasResultType = false; break;
+ case OpPtrCastToCrossWorkgroupINTEL: *hasResult = true; *hasResultType = true; break;
+ case OpCrossWorkgroupCastToPtrINTEL: *hasResult = true; *hasResultType = true; break;
case OpReadPipeBlockingINTEL: *hasResult = true; *hasResultType = true; break;
case OpWritePipeBlockingINTEL: *hasResult = true; *hasResultType = true; break;
case OpFPGARegINTEL: *hasResult = true; *hasResultType = true; break;
@@ -2174,6 +2266,10 @@
case OpRayQueryGetIntersectionObjectToWorldKHR: *hasResult = true; *hasResultType = true; break;
case OpRayQueryGetIntersectionWorldToObjectKHR: *hasResult = true; *hasResultType = true; break;
case OpAtomicFAddEXT: *hasResult = true; *hasResultType = true; break;
+ case OpTypeBufferSurfaceINTEL: *hasResult = true; *hasResultType = false; break;
+ case OpTypeStructContinuedINTEL: *hasResult = false; *hasResultType = false; break;
+ case OpConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
+ case OpSpecConstantCompositeContinuedINTEL: *hasResult = false; *hasResultType = false; break;
}
}
#endif /* SPV_ENABLE_UTILITY_CODE */
diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 1f294b0..fdbf027 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -844,6 +844,10 @@
(Options & EOptionReadHlsl) == 0)
Error("uniform array flattening only valid when compiling HLSL source.");
+ if ((Options & EOptionReadHlsl) && (Client == glslang::EShClientOpenGL)) {
+ Error("Using HLSL input under OpenGL semantics is not currently supported.");
+ }
+
// rationalize client and target language
if (TargetLanguage == glslang::EShTargetNone) {
switch (ClientVersion) {
@@ -1561,7 +1565,8 @@
" 'ver', when present, is the version of the input semantics,\n"
" which will appear in #define GL_SPIRV ver;\n"
" '--client opengl100' is the same as -G100;\n"
- " a '--target-env' for OpenGL will also imply '-G'\n"
+ " a '--target-env' for OpenGL will also imply '-G';\n"
+ " currently only supports GLSL\n"
" -H print human readable form of SPIR-V; turns on -V\n"
" -I<dir> add dir to the include search path; includer's directory\n"
" is searched first, followed by left-to-right order of -I\n"
diff --git a/Test/baseResults/310.comp.out b/Test/baseResults/310.comp.out
index 538b750..85b0116 100644
--- a/Test/baseResults/310.comp.out
+++ b/Test/baseResults/310.comp.out
@@ -7,9 +7,9 @@
ERROR: 0:39: 'location qualifier on input' : not supported in this stage: compute
ERROR: 0:40: 'in' : global storage input qualifier cannot be used in a compute shader
ERROR: 0:41: 'out' : global storage output qualifier cannot be used in a compute shader
-ERROR: 0:44: 'shared' : cannot apply layout qualifiers to a shared variable
+ERROR: 0:44: 'shared block' : not supported for this version or the enabled extensions
ERROR: 0:44: 'location' : can only apply to uniform, buffer, in, or out storage qualifiers
-ERROR: 0:45: 'shared' : cannot initialize this type of qualifier
+ERROR: 0:45: 'shared' : initializer can only be a null initializer ('{}')
ERROR: 0:47: 'local_size' : can only apply to 'in'
ERROR: 0:47: 'local_size' : can only apply to 'in'
ERROR: 0:47: 'local_size' : can only apply to 'in'
@@ -115,6 +115,11 @@
0:36 Constant:
0:36 1 (const uint)
0:36 'gl_LocalInvocationIndex' ( in highp uint LocalInvocationIndex)
+0:45 Sequence
+0:45 move second child to first child ( temp highp float)
+0:45 'fs' ( shared highp float)
+0:45 Constant:
+0:45 4.200000
0:59 Function Definition: foo( ( global void)
0:59 Function Parameters:
0:61 Sequence
@@ -553,6 +558,11 @@
0:36 Constant:
0:36 1 (const uint)
0:36 'gl_LocalInvocationIndex' ( in highp uint LocalInvocationIndex)
+0:45 Sequence
+0:45 move second child to first child ( temp highp float)
+0:45 'fs' ( shared highp float)
+0:45 Constant:
+0:45 4.200000
0:? Linker Objects
0:? 'gl_WorkGroupSize' ( const highp 3-component vector of uint WorkGroupSize)
0:? 2 (const uint)
diff --git a/Test/baseResults/400.frag.out b/Test/baseResults/400.frag.out
index 90f73dc..b7e88df 100644
--- a/Test/baseResults/400.frag.out
+++ b/Test/baseResults/400.frag.out
@@ -34,7 +34,7 @@
ERROR: 0:184: 'textureQueryLod' : no matching overloaded function found
ERROR: 0:184: 'assign' : cannot convert from ' const float' to ' temp 2-component vector of float'
ERROR: 0:197: 'subroutine' : feature not yet implemented
-ERROR: 0:197: '' : default qualifier requires 'uniform', 'buffer', 'in', or 'out' storage qualification
+ERROR: 0:197: '' : default qualifier requires 'uniform', 'buffer', 'in', 'out' or 'shared' storage qualification
ERROR: 0:198: 'subroutine' : feature not yet implemented
ERROR: 0:199: 'subroutine' : feature not yet implemented
ERROR: 0:201: '' : syntax error, unexpected PRECISE, expecting IDENTIFIER
diff --git a/Test/baseResults/430.comp.out b/Test/baseResults/430.comp.out
index 55c8238..4d8495b 100644
--- a/Test/baseResults/430.comp.out
+++ b/Test/baseResults/430.comp.out
@@ -5,9 +5,9 @@
ERROR: 0:43: 'location qualifier on input' : not supported in this stage: compute
ERROR: 0:44: 'in' : global storage input qualifier cannot be used in a compute shader
ERROR: 0:45: 'out' : global storage output qualifier cannot be used in a compute shader
-ERROR: 0:48: 'shared' : cannot apply layout qualifiers to a shared variable
+ERROR: 0:48: 'shared block' : not supported for this version or the enabled extensions
ERROR: 0:48: 'location' : can only apply to uniform, buffer, in, or out storage qualifiers
-ERROR: 0:49: 'shared' : cannot initialize this type of qualifier
+ERROR: 0:49: 'shared' : initializer can only be a null initializer ('{}')
ERROR: 0:52: 'local_size' : cannot change previously set size
ERROR: 0:54: 'local_size' : can only apply to 'in'
ERROR: 0:54: 'local_size' : can only apply to 'in'
@@ -52,6 +52,11 @@
0:39 10 (const int)
0:39 true case
0:40 Barrier ( global void)
+0:49 Sequence
+0:49 move second child to first child ( temp float)
+0:49 'fs' ( shared float)
+0:49 Constant:
+0:49 4.200000
0:66 Function Definition: foo( ( global void)
0:66 Function Parameters:
0:68 Sequence
@@ -184,6 +189,11 @@
0:39 10 (const int)
0:39 true case
0:40 Barrier ( global void)
+0:49 Sequence
+0:49 move second child to first child ( temp float)
+0:49 'fs' ( shared float)
+0:49 Constant:
+0:49 4.200000
0:? Linker Objects
0:? 'gl_WorkGroupSize' ( const 3-component vector of uint WorkGroupSize)
0:? 2 (const uint)
diff --git a/Test/baseResults/glsl.460.subgroup.rcall.out b/Test/baseResults/glsl.460.subgroup.rcall.out
index 6bffdc9..2b2d89b 100644
--- a/Test/baseResults/glsl.460.subgroup.rcall.out
+++ b/Test/baseResults/glsl.460.subgroup.rcall.out
@@ -109,8 +109,8 @@
0:4 Function Parameters:
0:4 'f4' ( in 4-component vector of float)
0:? Sequence
-0:7 'gl_SubgroupSize' ( in uint SubgroupSize)
-0:8 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
+0:7 'gl_SubgroupSize' ( volatile in uint SubgroupSize)
+0:8 'gl_SubgroupInvocationID' ( volatile in uint SubgroupInvocationID)
0:9 subgroupBarrier ( global void)
0:10 subgroupMemoryBarrier ( global void)
0:11 subgroupMemoryBarrierBuffer ( global void)
@@ -128,11 +128,11 @@
0:19 false (const bool)
0:20 subgroupAllEqual ( global bool)
0:20 'f4' ( in 4-component vector of float)
-0:22 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
-0:23 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
-0:24 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
-0:25 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
-0:26 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
+0:22 'gl_SubgroupEqMask' ( volatile in 4-component vector of uint SubgroupEqMask)
+0:23 'gl_SubgroupGeMask' ( volatile in 4-component vector of uint SubgroupGeMask)
+0:24 'gl_SubgroupGtMask' ( volatile in 4-component vector of uint SubgroupGtMask)
+0:25 'gl_SubgroupLeMask' ( volatile in 4-component vector of uint SubgroupLeMask)
+0:26 'gl_SubgroupLtMask' ( volatile in 4-component vector of uint SubgroupLtMask)
0:27 subgroupBroadcast ( global 4-component vector of float)
0:27 'f4' ( in 4-component vector of float)
0:27 Constant:
@@ -359,8 +359,8 @@
0:119 Function Definition: basic_works( ( global void)
0:119 Function Parameters:
0:121 Sequence
-0:121 'gl_SubgroupSize' ( in uint SubgroupSize)
-0:122 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
+0:121 'gl_SubgroupSize' ( volatile in uint SubgroupSize)
+0:122 'gl_SubgroupInvocationID' ( volatile in uint SubgroupInvocationID)
0:123 subgroupBarrier ( global void)
0:124 subgroupMemoryBarrier ( global void)
0:125 subgroupMemoryBarrierBuffer ( global void)
@@ -370,11 +370,11 @@
0:131 Function Parameters:
0:131 'f4' ( in 4-component vector of float)
0:132 Sequence
-0:132 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
-0:133 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
-0:134 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
-0:135 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
-0:136 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
+0:132 'gl_SubgroupEqMask' ( volatile in 4-component vector of uint SubgroupEqMask)
+0:133 'gl_SubgroupGeMask' ( volatile in 4-component vector of uint SubgroupGeMask)
+0:134 'gl_SubgroupGtMask' ( volatile in 4-component vector of uint SubgroupGtMask)
+0:135 'gl_SubgroupLeMask' ( volatile in 4-component vector of uint SubgroupLeMask)
+0:136 'gl_SubgroupLtMask' ( volatile in 4-component vector of uint SubgroupLtMask)
0:137 subgroupBroadcast ( global 4-component vector of float)
0:137 'f4' ( in 4-component vector of float)
0:137 Constant:
@@ -624,15 +624,15 @@
0:247 Sequence
0:247 'gl_WarpsPerSMNV' ( in uint WarpsPerSMNV)
0:248 'gl_SMCountNV' ( in uint SMCountNV)
-0:249 'gl_WarpIDNV' ( in uint WarpIDNV)
-0:250 'gl_SMIDNV' ( in uint SMIDNV)
+0:249 'gl_WarpIDNV' ( volatile in uint WarpIDNV)
+0:250 'gl_SMIDNV' ( volatile in uint SMIDNV)
0:257 Function Definition: sm_builtins( ( global void)
0:257 Function Parameters:
0:259 Sequence
0:259 'gl_WarpsPerSMNV' ( in uint WarpsPerSMNV)
0:260 'gl_SMCountNV' ( in uint SMCountNV)
-0:261 'gl_WarpIDNV' ( in uint WarpIDNV)
-0:262 'gl_SMIDNV' ( in uint SMIDNV)
+0:261 'gl_WarpIDNV' ( volatile in uint WarpIDNV)
+0:262 'gl_SMIDNV' ( volatile in uint SMIDNV)
0:? Linker Objects
0:? 'data0' (layout( location=0) callableDataNV 4-component vector of float)
0:? 'anon@0' (layout( location=1) callableDataInNV block{ callableDataInNV uint data1})
diff --git a/Test/baseResults/glsl.460.subgroup.rchit.out b/Test/baseResults/glsl.460.subgroup.rchit.out
index 1ea9e69..f5083e0 100644
--- a/Test/baseResults/glsl.460.subgroup.rchit.out
+++ b/Test/baseResults/glsl.460.subgroup.rchit.out
@@ -109,8 +109,8 @@
0:4 Function Parameters:
0:4 'f4' ( in 4-component vector of float)
0:? Sequence
-0:7 'gl_SubgroupSize' ( in uint SubgroupSize)
-0:8 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
+0:7 'gl_SubgroupSize' ( volatile in uint SubgroupSize)
+0:8 'gl_SubgroupInvocationID' ( volatile in uint SubgroupInvocationID)
0:9 subgroupBarrier ( global void)
0:10 subgroupMemoryBarrier ( global void)
0:11 subgroupMemoryBarrierBuffer ( global void)
@@ -128,11 +128,11 @@
0:19 false (const bool)
0:20 subgroupAllEqual ( global bool)
0:20 'f4' ( in 4-component vector of float)
-0:22 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
-0:23 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
-0:24 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
-0:25 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
-0:26 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
+0:22 'gl_SubgroupEqMask' ( volatile in 4-component vector of uint SubgroupEqMask)
+0:23 'gl_SubgroupGeMask' ( volatile in 4-component vector of uint SubgroupGeMask)
+0:24 'gl_SubgroupGtMask' ( volatile in 4-component vector of uint SubgroupGtMask)
+0:25 'gl_SubgroupLeMask' ( volatile in 4-component vector of uint SubgroupLeMask)
+0:26 'gl_SubgroupLtMask' ( volatile in 4-component vector of uint SubgroupLtMask)
0:27 subgroupBroadcast ( global 4-component vector of float)
0:27 'f4' ( in 4-component vector of float)
0:27 Constant:
@@ -425,8 +425,8 @@
0:129 Function Definition: basic_works( ( global void)
0:129 Function Parameters:
0:131 Sequence
-0:131 'gl_SubgroupSize' ( in uint SubgroupSize)
-0:132 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
+0:131 'gl_SubgroupSize' ( volatile in uint SubgroupSize)
+0:132 'gl_SubgroupInvocationID' ( volatile in uint SubgroupInvocationID)
0:133 subgroupBarrier ( global void)
0:134 subgroupMemoryBarrier ( global void)
0:135 subgroupMemoryBarrierBuffer ( global void)
@@ -436,11 +436,11 @@
0:141 Function Parameters:
0:141 'f4' ( in 4-component vector of float)
0:142 Sequence
-0:142 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
-0:143 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
-0:144 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
-0:145 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
-0:146 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
+0:142 'gl_SubgroupEqMask' ( volatile in 4-component vector of uint SubgroupEqMask)
+0:143 'gl_SubgroupGeMask' ( volatile in 4-component vector of uint SubgroupGeMask)
+0:144 'gl_SubgroupGtMask' ( volatile in 4-component vector of uint SubgroupGtMask)
+0:145 'gl_SubgroupLeMask' ( volatile in 4-component vector of uint SubgroupLeMask)
+0:146 'gl_SubgroupLtMask' ( volatile in 4-component vector of uint SubgroupLtMask)
0:147 subgroupBroadcast ( global 4-component vector of float)
0:147 'f4' ( in 4-component vector of float)
0:147 Constant:
@@ -690,15 +690,15 @@
0:257 Sequence
0:257 'gl_WarpsPerSMNV' ( in uint WarpsPerSMNV)
0:258 'gl_SMCountNV' ( in uint SMCountNV)
-0:259 'gl_WarpIDNV' ( in uint WarpIDNV)
-0:260 'gl_SMIDNV' ( in uint SMIDNV)
+0:259 'gl_WarpIDNV' ( volatile in uint WarpIDNV)
+0:260 'gl_SMIDNV' ( volatile in uint SMIDNV)
0:267 Function Definition: sm_builtins( ( global void)
0:267 Function Parameters:
0:269 Sequence
0:269 'gl_WarpsPerSMNV' ( in uint WarpsPerSMNV)
0:270 'gl_SMCountNV' ( in uint SMCountNV)
-0:271 'gl_WarpIDNV' ( in uint WarpIDNV)
-0:272 'gl_SMIDNV' ( in uint SMIDNV)
+0:271 'gl_WarpIDNV' ( volatile in uint WarpIDNV)
+0:272 'gl_SMIDNV' ( volatile in uint SMIDNV)
0:? Linker Objects
0:? 'accNV' (layout( set=0 binding=0) uniform accelerationStructureNV)
0:? 'localPayload' (layout( location=0) rayPayloadNV 4-component vector of float)
diff --git a/Test/baseResults/glsl.460.subgroup.rgen.out b/Test/baseResults/glsl.460.subgroup.rgen.out
index dfe1e2b..56283bb 100644
--- a/Test/baseResults/glsl.460.subgroup.rgen.out
+++ b/Test/baseResults/glsl.460.subgroup.rgen.out
@@ -109,8 +109,8 @@
0:4 Function Parameters:
0:4 'f4' ( in 4-component vector of float)
0:? Sequence
-0:7 'gl_SubgroupSize' ( in uint SubgroupSize)
-0:8 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
+0:7 'gl_SubgroupSize' ( volatile in uint SubgroupSize)
+0:8 'gl_SubgroupInvocationID' ( volatile in uint SubgroupInvocationID)
0:9 subgroupBarrier ( global void)
0:10 subgroupMemoryBarrier ( global void)
0:11 subgroupMemoryBarrierBuffer ( global void)
@@ -128,11 +128,11 @@
0:19 false (const bool)
0:20 subgroupAllEqual ( global bool)
0:20 'f4' ( in 4-component vector of float)
-0:22 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
-0:23 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
-0:24 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
-0:25 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
-0:26 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
+0:22 'gl_SubgroupEqMask' ( volatile in 4-component vector of uint SubgroupEqMask)
+0:23 'gl_SubgroupGeMask' ( volatile in 4-component vector of uint SubgroupGeMask)
+0:24 'gl_SubgroupGtMask' ( volatile in 4-component vector of uint SubgroupGtMask)
+0:25 'gl_SubgroupLeMask' ( volatile in 4-component vector of uint SubgroupLeMask)
+0:26 'gl_SubgroupLtMask' ( volatile in 4-component vector of uint SubgroupLtMask)
0:27 subgroupBroadcast ( global 4-component vector of float)
0:27 'f4' ( in 4-component vector of float)
0:27 Constant:
@@ -389,8 +389,8 @@
0:123 Function Definition: basic_works( ( global void)
0:123 Function Parameters:
0:125 Sequence
-0:125 'gl_SubgroupSize' ( in uint SubgroupSize)
-0:126 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
+0:125 'gl_SubgroupSize' ( volatile in uint SubgroupSize)
+0:126 'gl_SubgroupInvocationID' ( volatile in uint SubgroupInvocationID)
0:127 subgroupBarrier ( global void)
0:128 subgroupMemoryBarrier ( global void)
0:129 subgroupMemoryBarrierBuffer ( global void)
@@ -400,11 +400,11 @@
0:135 Function Parameters:
0:135 'f4' ( in 4-component vector of float)
0:136 Sequence
-0:136 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
-0:137 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
-0:138 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
-0:139 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
-0:140 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
+0:136 'gl_SubgroupEqMask' ( volatile in 4-component vector of uint SubgroupEqMask)
+0:137 'gl_SubgroupGeMask' ( volatile in 4-component vector of uint SubgroupGeMask)
+0:138 'gl_SubgroupGtMask' ( volatile in 4-component vector of uint SubgroupGtMask)
+0:139 'gl_SubgroupLeMask' ( volatile in 4-component vector of uint SubgroupLeMask)
+0:140 'gl_SubgroupLtMask' ( volatile in 4-component vector of uint SubgroupLtMask)
0:141 subgroupBroadcast ( global 4-component vector of float)
0:141 'f4' ( in 4-component vector of float)
0:141 Constant:
@@ -654,15 +654,15 @@
0:251 Sequence
0:251 'gl_WarpsPerSMNV' ( in uint WarpsPerSMNV)
0:252 'gl_SMCountNV' ( in uint SMCountNV)
-0:253 'gl_WarpIDNV' ( in uint WarpIDNV)
-0:254 'gl_SMIDNV' ( in uint SMIDNV)
+0:253 'gl_WarpIDNV' ( volatile in uint WarpIDNV)
+0:254 'gl_SMIDNV' ( volatile in uint SMIDNV)
0:261 Function Definition: sm_builtins( ( global void)
0:261 Function Parameters:
0:263 Sequence
0:263 'gl_WarpsPerSMNV' ( in uint WarpsPerSMNV)
0:264 'gl_SMCountNV' ( in uint SMCountNV)
-0:265 'gl_WarpIDNV' ( in uint WarpIDNV)
-0:266 'gl_SMIDNV' ( in uint SMIDNV)
+0:265 'gl_WarpIDNV' ( volatile in uint WarpIDNV)
+0:266 'gl_SMIDNV' ( volatile in uint SMIDNV)
0:? Linker Objects
0:? 'accNV0' (layout( set=0 binding=0) uniform accelerationStructureNV)
0:? 'accNV1' (layout( set=0 binding=1) uniform accelerationStructureNV)
diff --git a/Test/baseResults/glsl.460.subgroup.rint.out b/Test/baseResults/glsl.460.subgroup.rint.out
index 9915ecf..a7de7d3 100644
--- a/Test/baseResults/glsl.460.subgroup.rint.out
+++ b/Test/baseResults/glsl.460.subgroup.rint.out
@@ -109,8 +109,8 @@
0:5 Function Parameters:
0:5 'f4' ( in 4-component vector of float)
0:? Sequence
-0:8 'gl_SubgroupSize' ( in uint SubgroupSize)
-0:9 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
+0:8 'gl_SubgroupSize' ( volatile in uint SubgroupSize)
+0:9 'gl_SubgroupInvocationID' ( volatile in uint SubgroupInvocationID)
0:10 subgroupBarrier ( global void)
0:11 subgroupMemoryBarrier ( global void)
0:12 subgroupMemoryBarrierBuffer ( global void)
@@ -128,11 +128,11 @@
0:20 false (const bool)
0:21 subgroupAllEqual ( global bool)
0:21 'f4' ( in 4-component vector of float)
-0:23 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
-0:24 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
-0:25 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
-0:26 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
-0:27 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
+0:23 'gl_SubgroupEqMask' ( volatile in 4-component vector of uint SubgroupEqMask)
+0:24 'gl_SubgroupGeMask' ( volatile in 4-component vector of uint SubgroupGeMask)
+0:25 'gl_SubgroupGtMask' ( volatile in 4-component vector of uint SubgroupGtMask)
+0:26 'gl_SubgroupLeMask' ( volatile in 4-component vector of uint SubgroupLeMask)
+0:27 'gl_SubgroupLtMask' ( volatile in 4-component vector of uint SubgroupLtMask)
0:28 subgroupBroadcast ( global 4-component vector of float)
0:28 'f4' ( in 4-component vector of float)
0:28 Constant:
@@ -403,8 +403,8 @@
0:129 Function Definition: basic_works( ( global void)
0:129 Function Parameters:
0:131 Sequence
-0:131 'gl_SubgroupSize' ( in uint SubgroupSize)
-0:132 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
+0:131 'gl_SubgroupSize' ( volatile in uint SubgroupSize)
+0:132 'gl_SubgroupInvocationID' ( volatile in uint SubgroupInvocationID)
0:133 subgroupBarrier ( global void)
0:134 subgroupMemoryBarrier ( global void)
0:135 subgroupMemoryBarrierBuffer ( global void)
@@ -414,11 +414,11 @@
0:141 Function Parameters:
0:141 'f4' ( in 4-component vector of float)
0:142 Sequence
-0:142 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
-0:143 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
-0:144 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
-0:145 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
-0:146 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
+0:142 'gl_SubgroupEqMask' ( volatile in 4-component vector of uint SubgroupEqMask)
+0:143 'gl_SubgroupGeMask' ( volatile in 4-component vector of uint SubgroupGeMask)
+0:144 'gl_SubgroupGtMask' ( volatile in 4-component vector of uint SubgroupGtMask)
+0:145 'gl_SubgroupLeMask' ( volatile in 4-component vector of uint SubgroupLeMask)
+0:146 'gl_SubgroupLtMask' ( volatile in 4-component vector of uint SubgroupLtMask)
0:147 subgroupBroadcast ( global 4-component vector of float)
0:147 'f4' ( in 4-component vector of float)
0:147 Constant:
@@ -668,15 +668,15 @@
0:257 Sequence
0:257 'gl_WarpsPerSMNV' ( in uint WarpsPerSMNV)
0:258 'gl_SMCountNV' ( in uint SMCountNV)
-0:259 'gl_WarpIDNV' ( in uint WarpIDNV)
-0:260 'gl_SMIDNV' ( in uint SMIDNV)
+0:259 'gl_WarpIDNV' ( volatile in uint WarpIDNV)
+0:260 'gl_SMIDNV' ( volatile in uint SMIDNV)
0:267 Function Definition: sm_builtins( ( global void)
0:267 Function Parameters:
0:269 Sequence
0:269 'gl_WarpsPerSMNV' ( in uint WarpsPerSMNV)
0:270 'gl_SMCountNV' ( in uint SMCountNV)
-0:271 'gl_WarpIDNV' ( in uint WarpIDNV)
-0:272 'gl_SMIDNV' ( in uint SMIDNV)
+0:271 'gl_WarpIDNV' ( volatile in uint WarpIDNV)
+0:272 'gl_SMIDNV' ( volatile in uint SMIDNV)
0:? Linker Objects
0:? 'iAttr' ( hitAttributeNV 4-component vector of float)
diff --git a/Test/baseResults/glsl.460.subgroup.rmiss.out b/Test/baseResults/glsl.460.subgroup.rmiss.out
index ddf7d1b..865d88c 100644
--- a/Test/baseResults/glsl.460.subgroup.rmiss.out
+++ b/Test/baseResults/glsl.460.subgroup.rmiss.out
@@ -109,8 +109,8 @@
0:5 Function Parameters:
0:5 'f4' ( in 4-component vector of float)
0:? Sequence
-0:8 'gl_SubgroupSize' ( in uint SubgroupSize)
-0:9 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
+0:8 'gl_SubgroupSize' ( volatile in uint SubgroupSize)
+0:9 'gl_SubgroupInvocationID' ( volatile in uint SubgroupInvocationID)
0:10 subgroupBarrier ( global void)
0:11 subgroupMemoryBarrier ( global void)
0:12 subgroupMemoryBarrierBuffer ( global void)
@@ -128,11 +128,11 @@
0:20 false (const bool)
0:21 subgroupAllEqual ( global bool)
0:21 'f4' ( in 4-component vector of float)
-0:23 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
-0:24 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
-0:25 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
-0:26 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
-0:27 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
+0:23 'gl_SubgroupEqMask' ( volatile in 4-component vector of uint SubgroupEqMask)
+0:24 'gl_SubgroupGeMask' ( volatile in 4-component vector of uint SubgroupGeMask)
+0:25 'gl_SubgroupGtMask' ( volatile in 4-component vector of uint SubgroupGtMask)
+0:26 'gl_SubgroupLeMask' ( volatile in 4-component vector of uint SubgroupLeMask)
+0:27 'gl_SubgroupLtMask' ( volatile in 4-component vector of uint SubgroupLtMask)
0:28 subgroupBroadcast ( global 4-component vector of float)
0:28 'f4' ( in 4-component vector of float)
0:28 Constant:
@@ -397,8 +397,8 @@
0:123 Function Definition: basic_works( ( global void)
0:123 Function Parameters:
0:125 Sequence
-0:125 'gl_SubgroupSize' ( in uint SubgroupSize)
-0:126 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
+0:125 'gl_SubgroupSize' ( volatile in uint SubgroupSize)
+0:126 'gl_SubgroupInvocationID' ( volatile in uint SubgroupInvocationID)
0:127 subgroupBarrier ( global void)
0:128 subgroupMemoryBarrier ( global void)
0:129 subgroupMemoryBarrierBuffer ( global void)
@@ -408,11 +408,11 @@
0:135 Function Parameters:
0:135 'f4' ( in 4-component vector of float)
0:136 Sequence
-0:136 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
-0:137 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
-0:138 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
-0:139 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
-0:140 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
+0:136 'gl_SubgroupEqMask' ( volatile in 4-component vector of uint SubgroupEqMask)
+0:137 'gl_SubgroupGeMask' ( volatile in 4-component vector of uint SubgroupGeMask)
+0:138 'gl_SubgroupGtMask' ( volatile in 4-component vector of uint SubgroupGtMask)
+0:139 'gl_SubgroupLeMask' ( volatile in 4-component vector of uint SubgroupLeMask)
+0:140 'gl_SubgroupLtMask' ( volatile in 4-component vector of uint SubgroupLtMask)
0:141 subgroupBroadcast ( global 4-component vector of float)
0:141 'f4' ( in 4-component vector of float)
0:141 Constant:
@@ -662,15 +662,15 @@
0:251 Sequence
0:251 'gl_WarpsPerSMNV' ( in uint WarpsPerSMNV)
0:252 'gl_SMCountNV' ( in uint SMCountNV)
-0:253 'gl_WarpIDNV' ( in uint WarpIDNV)
-0:254 'gl_SMIDNV' ( in uint SMIDNV)
+0:253 'gl_WarpIDNV' ( volatile in uint WarpIDNV)
+0:254 'gl_SMIDNV' ( volatile in uint SMIDNV)
0:261 Function Definition: sm_builtins( ( global void)
0:261 Function Parameters:
0:263 Sequence
0:263 'gl_WarpsPerSMNV' ( in uint WarpsPerSMNV)
0:264 'gl_SMCountNV' ( in uint SMCountNV)
-0:265 'gl_WarpIDNV' ( in uint WarpIDNV)
-0:266 'gl_SMIDNV' ( in uint SMIDNV)
+0:265 'gl_WarpIDNV' ( volatile in uint WarpIDNV)
+0:266 'gl_SMIDNV' ( volatile in uint SMIDNV)
0:? Linker Objects
0:? 'accNV' (layout( set=0 binding=0) uniform accelerationStructureNV)
0:? 'localPayload' (layout( location=0) rayPayloadNV 4-component vector of float)
diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out
index 9986074..02365b8 100644
--- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.2dms.dx10.frag.out
@@ -357,6 +357,7 @@
0:? '@entryPointOutput.Depth' ( out float FragDepth)
0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
+Validation failed
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 130
diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out
index d0fa5fd..135b4af 100644
--- a/Test/baseResults/hlsl.load.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out
@@ -561,6 +561,7 @@
0:? '@entryPointOutput.Depth' ( out float FragDepth)
0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
+Validation failed
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 201
diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
index a379068..24aa368 100644
--- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
@@ -435,6 +435,7 @@
0:? '@entryPointOutput.Depth' ( out float FragDepth)
0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
+Validation failed
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 174
diff --git a/Test/baseResults/hlsl.round.dx10.frag.out b/Test/baseResults/hlsl.round.dx10.frag.out
new file mode 100644
index 0000000..be72dc5
--- /dev/null
+++ b/Test/baseResults/hlsl.round.dx10.frag.out
@@ -0,0 +1,60 @@
+hlsl.round.dx10.frag
+Shader version: 500
+gl_FragCoord origin is upper left
+0:? Sequence
+0:2 Function Definition: PixelShaderFunction(vf4; ( temp 4-component vector of float)
+0:2 Function Parameters:
+0:2 'input' ( in 4-component vector of float)
+0:? Sequence
+0:3 Branch: Return with expression
+0:3 roundEven ( temp 4-component vector of float)
+0:3 'input' ( in 4-component vector of float)
+0:? Linker Objects
+
+
+Linked fragment stage:
+
+WARNING: Linking fragment stage: Entry point not found
+
+Shader version: 500
+gl_FragCoord origin is upper left
+0:? Sequence
+0:2 Function Definition: PixelShaderFunction(vf4; ( temp 4-component vector of float)
+0:2 Function Parameters:
+0:2 'input' ( in 4-component vector of float)
+0:? Sequence
+0:3 Branch: Return with expression
+0:3 roundEven ( temp 4-component vector of float)
+0:3 'input' ( in 4-component vector of float)
+0:? Linker Objects
+
+// Module Version 10000
+// Generated by (magic number): 8000a
+// Id's are bound by 17
+
+ Capability Shader
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint Fragment 4 "main"
+ ExecutionMode 4 OriginUpperLeft
+ Source HLSL 500
+ Name 4 "main"
+ Name 11 "PixelShaderFunction(vf4;"
+ Name 10 "input"
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeFloat 32
+ 7: TypeVector 6(float) 4
+ 8: TypePointer Function 7(fvec4)
+ 9: TypeFunction 7(fvec4) 8(ptr)
+ 4(main): 2 Function None 3
+ 5: Label
+ Return
+ FunctionEnd
+11(PixelShaderFunction(vf4;): 7(fvec4) Function None 9
+ 10(input): 8(ptr) FunctionParameter
+ 12: Label
+ 13: 7(fvec4) Load 10(input)
+ 14: 7(fvec4) ExtInst 1(GLSL.std.450) 2(RoundEven) 13
+ ReturnValue 14
+ FunctionEnd
diff --git a/Test/baseResults/hlsl.round.dx9.frag.out b/Test/baseResults/hlsl.round.dx9.frag.out
new file mode 100644
index 0000000..9333c7d
--- /dev/null
+++ b/Test/baseResults/hlsl.round.dx9.frag.out
@@ -0,0 +1,70 @@
+hlsl.round.dx9.frag
+Shader version: 500
+gl_FragCoord origin is upper left
+0:? Sequence
+0:2 Function Definition: PixelShaderFunction(vf4; ( temp 4-component vector of float)
+0:2 Function Parameters:
+0:2 'input' ( in 4-component vector of float)
+0:? Sequence
+0:3 Branch: Return with expression
+0:3 round ( temp 4-component vector of float)
+0:3 'input' ( in 4-component vector of float)
+0:? Linker Objects
+
+
+Linked fragment stage:
+
+WARNING: Linking fragment stage: Entry point not found
+
+Shader version: 500
+gl_FragCoord origin is upper left
+0:? Sequence
+0:2 Function Definition: PixelShaderFunction(vf4; ( temp 4-component vector of float)
+0:2 Function Parameters:
+0:2 'input' ( in 4-component vector of float)
+0:? Sequence
+0:3 Branch: Return with expression
+0:3 round ( temp 4-component vector of float)
+0:3 'input' ( in 4-component vector of float)
+0:? Linker Objects
+
+// Module Version 10000
+// Generated by (magic number): 8000a
+// Id's are bound by 18
+
+ Capability Shader
+ 2: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint Fragment 5 "main"
+ ExecutionMode 5 OriginUpperLeft
+ 1: String ""
+ Source HLSL 500 1 "// OpModuleProcessed auto-map-locations
+// OpModuleProcessed auto-map-bindings
+// OpModuleProcessed entry-point main
+// OpModuleProcessed client vulkan100
+// OpModuleProcessed target-env vulkan1.0
+// OpModuleProcessed keep-uncalled
+// OpModuleProcessed hlsl-offsets
+#line 1
+"
+ Name 5 "main"
+ Name 12 "PixelShaderFunction(vf4;"
+ Name 11 "input"
+ 3: TypeVoid
+ 4: TypeFunction 3
+ 7: TypeFloat 32
+ 8: TypeVector 7(float) 4
+ 9: TypePointer Function 8(fvec4)
+ 10: TypeFunction 8(fvec4) 9(ptr)
+ 5(main): 3 Function None 4
+ 6: Label
+ Return
+ FunctionEnd
+12(PixelShaderFunction(vf4;): 8(fvec4) Function None 10
+ 11(input): 9(ptr) FunctionParameter
+ 13: Label
+ Line 1 3 0
+ 14: 8(fvec4) Load 11(input)
+ 15: 8(fvec4) ExtInst 2(GLSL.std.450) 1(Round) 14
+ ReturnValue 15
+ FunctionEnd
diff --git a/Test/baseResults/hlsl.rw.register.frag.out b/Test/baseResults/hlsl.rw.register.frag.out
index 35b4758..7bcecc9 100644
--- a/Test/baseResults/hlsl.rw.register.frag.out
+++ b/Test/baseResults/hlsl.rw.register.frag.out
@@ -97,6 +97,7 @@
0:? 'g_tBuf1du1' (layout( binding=3 r32ui) uniform uimageBuffer)
0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
+Validation failed
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 42
diff --git a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out
index 2c67075..0614677 100644
--- a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out
+++ b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out
@@ -1689,6 +1689,7 @@
0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4, uniform float uf1, uniform int ui1, uniform uint uu1})
0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
+Validation failed
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 571
diff --git a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out
index 093665c..68e40de 100644
--- a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out
+++ b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out
@@ -1707,6 +1707,7 @@
0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4, uniform 2-component vector of float uf2, uniform 2-component vector of int ui2, uniform 2-component vector of uint uu2})
0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
+Validation failed
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 605
diff --git a/Test/baseResults/rayQuery-allOps.comp.out b/Test/baseResults/rayQuery-allOps.comp.out
index c0cc8aa..bf654f7 100644
--- a/Test/baseResults/rayQuery-allOps.comp.out
+++ b/Test/baseResults/rayQuery-allOps.comp.out
@@ -4,8 +4,8 @@
// Id's are bound by 258
Capability Shader
- Capability RayQueryProvisionalKHR
- Capability RayTraversalPrimitiveCullingProvisionalKHR
+ Capability RayQueryKHR
+ Capability RayTraversalPrimitiveCullingKHR
Extension "SPV_KHR_ray_query"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
@@ -86,8 +86,9 @@
35: TypePointer Function 8(float)
37: 18(int) Constant 3
38: 8(float) Constant 1176255488
- 45: TypeRayQueryProvisionalKHR
- 46: TypePointer Function 45
+ 45: TypeRayQueryKHR
+ 46: TypePointer Private 45
+ 47(rayQuery): 46(ptr) Variable Private
48: TypeAccelerationStructureKHR
49: TypePointer UniformConstant 48
50(rtas): 49(ptr) Variable UniformConstant
@@ -114,7 +115,6 @@
4(main): 2 Function None 3
5: Label
43(ray): 25(ptr) Variable Function
- 47(rayQuery): 46(ptr) Variable Function
69(candidateType): 68(ptr) Variable Function
78(_mat4x3): 77(ptr) Variable Function
83(_mat3x4): 82(ptr) Variable Function
@@ -223,7 +223,7 @@
129: 2 FunctionCall 6(doSomething()
Branch 128
128: Label
- 130: 18(int) RayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR 47(rayQuery) 23
+ 130: 14(int) RayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR 47(rayQuery) 23
131: 66(bool) UGreaterThan 130 20
SelectionMerge 133 None
BranchConditional 131 132 133
diff --git a/Test/baseResults/rayQuery-allOps.frag.out b/Test/baseResults/rayQuery-allOps.frag.out
index 8182da3..90ebc4a 100644
--- a/Test/baseResults/rayQuery-allOps.frag.out
+++ b/Test/baseResults/rayQuery-allOps.frag.out
@@ -4,7 +4,7 @@
// Id's are bound by 257
Capability Shader
- Capability RayQueryProvisionalKHR
+ Capability RayQueryKHR
Extension "SPV_KHR_ray_query"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
@@ -85,8 +85,9 @@
35: TypePointer Function 8(float)
37: 18(int) Constant 3
38: 8(float) Constant 1176255488
- 45: TypeRayQueryProvisionalKHR
- 46: TypePointer Function 45
+ 45: TypeRayQueryKHR
+ 46: TypePointer Private 45
+ 47(rayQuery): 46(ptr) Variable Private
48: TypeAccelerationStructureKHR
49: TypePointer UniformConstant 48
50(rtas): 49(ptr) Variable UniformConstant
@@ -112,7 +113,6 @@
4(main): 2 Function None 3
5: Label
43(ray): 25(ptr) Variable Function
- 47(rayQuery): 46(ptr) Variable Function
69(candidateType): 68(ptr) Variable Function
78(_mat4x3): 77(ptr) Variable Function
83(_mat3x4): 82(ptr) Variable Function
@@ -221,7 +221,7 @@
129: 2 FunctionCall 6(doSomething()
Branch 128
128: Label
- 130: 18(int) RayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR 47(rayQuery) 23
+ 130: 14(int) RayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR 47(rayQuery) 23
131: 66(bool) UGreaterThan 130 20
SelectionMerge 133 None
BranchConditional 131 132 133
diff --git a/Test/baseResults/rayQuery-allOps.rgen.out b/Test/baseResults/rayQuery-allOps.rgen.out
index 01b8f1d..b3a93b0 100644
--- a/Test/baseResults/rayQuery-allOps.rgen.out
+++ b/Test/baseResults/rayQuery-allOps.rgen.out
@@ -3,7 +3,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 257
- Capability RayQueryProvisionalKHR
+ Capability RayQueryKHR
Capability RayTracingNV
Extension "SPV_KHR_ray_query"
Extension "SPV_NV_ray_tracing"
@@ -85,8 +85,9 @@
35: TypePointer Function 8(float)
37: 18(int) Constant 3
38: 8(float) Constant 1176255488
- 45: TypeRayQueryProvisionalKHR
- 46: TypePointer Function 45
+ 45: TypeRayQueryKHR
+ 46: TypePointer Private 45
+ 47(rayQuery): 46(ptr) Variable Private
48: TypeAccelerationStructureKHR
49: TypePointer UniformConstant 48
50(rtas): 49(ptr) Variable UniformConstant
@@ -112,7 +113,6 @@
4(main): 2 Function None 3
5: Label
43(ray): 25(ptr) Variable Function
- 47(rayQuery): 46(ptr) Variable Function
69(candidateType): 68(ptr) Variable Function
78(_mat4x3): 77(ptr) Variable Function
83(_mat3x4): 82(ptr) Variable Function
@@ -221,7 +221,7 @@
129: 2 FunctionCall 6(doSomething()
Branch 128
128: Label
- 130: 18(int) RayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR 47(rayQuery) 23
+ 130: 14(int) RayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR 47(rayQuery) 23
131: 66(bool) UGreaterThan 130 20
SelectionMerge 133 None
BranchConditional 131 132 133
diff --git a/Test/baseResults/rayQuery-global.rgen.out b/Test/baseResults/rayQuery-global.rgen.out
new file mode 100644
index 0000000..7b05173
--- /dev/null
+++ b/Test/baseResults/rayQuery-global.rgen.out
@@ -0,0 +1,76 @@
+rayQuery-global.rgen
+// Module Version 10000
+// Generated by (magic number): 8000a
+// Id's are bound by 44
+
+ Capability RayQueryKHR
+ Capability RayTracingKHR
+ Extension "SPV_KHR_ray_query"
+ Extension "SPV_KHR_ray_tracing"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint RayGenerationKHR 4 "main"
+ Source GLSL 460
+ SourceExtension "GL_EXT_ray_flags_primitive_culling"
+ SourceExtension "GL_EXT_ray_query"
+ Name 4 "main"
+ Name 10 "otherWrapper(rq1;"
+ Name 9 "rq"
+ Name 13 "wrapper(rq1;"
+ Name 12 "rq"
+ Name 17 "rqGlobal"
+ Name 22 "rq2"
+ Name 27 "rtas"
+ Name 40 "rq2"
+ Decorate 27(rtas) DescriptorSet 0
+ Decorate 27(rtas) Binding 1
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeRayQueryKHR
+ 7: TypePointer Private 6
+ 8: TypeFunction 2 7(ptr)
+ 15: TypeBool
+ 17(rqGlobal): 7(ptr) Variable Private
+ 22(rq2): 7(ptr) Variable Private
+ 25: TypeAccelerationStructureKHR
+ 26: TypePointer UniformConstant 25
+ 27(rtas): 26(ptr) Variable UniformConstant
+ 29: TypeInt 32 0
+ 30: 29(int) Constant 0
+ 31: 29(int) Constant 255
+ 32: TypeFloat 32
+ 33: TypeVector 32(float) 3
+ 34: 32(float) Constant 0
+ 35: 33(fvec3) ConstantComposite 34 34 34
+ 36: 32(float) Constant 1065353216
+ 37: 33(fvec3) ConstantComposite 36 34 34
+ 40(rq2): 7(ptr) Variable Private
+ 4(main): 2 Function None 3
+ 5: Label
+ 28: 25 Load 27(rtas)
+ RayQueryInitializeKHR 17(rqGlobal) 28 30 31 35 34 37 36
+ 38: 2 FunctionCall 13(wrapper(rq1;) 17(rqGlobal)
+ 39: 2 FunctionCall 10(otherWrapper(rq1;) 17(rqGlobal)
+ 41: 25 Load 27(rtas)
+ RayQueryInitializeKHR 40(rq2) 41 30 31 35 34 37 36
+ 42: 2 FunctionCall 13(wrapper(rq1;) 40(rq2)
+ 43: 2 FunctionCall 10(otherWrapper(rq1;) 40(rq2)
+ Return
+ FunctionEnd
+10(otherWrapper(rq1;): 2 Function None 8
+ 9(rq): 7(ptr) FunctionParameter
+ 11: Label
+ 16: 15(bool) RayQueryProceedKHR 9(rq)
+ 18: 15(bool) RayQueryProceedKHR 17(rqGlobal)
+ Return
+ FunctionEnd
+13(wrapper(rq1;): 2 Function None 8
+ 12(rq): 7(ptr) FunctionParameter
+ 14: Label
+ 19: 15(bool) RayQueryProceedKHR 12(rq)
+ 20: 15(bool) RayQueryProceedKHR 17(rqGlobal)
+ 21: 2 FunctionCall 10(otherWrapper(rq1;) 12(rq)
+ 23: 2 FunctionCall 10(otherWrapper(rq1;) 22(rq2)
+ 24: 2 FunctionCall 10(otherWrapper(rq1;) 17(rqGlobal)
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/rayQuery-initialize.rgen.out b/Test/baseResults/rayQuery-initialize.rgen.out
index f97287f..f16facd 100644
--- a/Test/baseResults/rayQuery-initialize.rgen.out
+++ b/Test/baseResults/rayQuery-initialize.rgen.out
@@ -3,7 +3,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 103
- Capability RayQueryProvisionalKHR
+ Capability RayQueryKHR
Capability RayTracingNV
Extension "SPV_KHR_ray_query"
Extension "SPV_NV_ray_tracing"
@@ -55,8 +55,8 @@
3: TypeFunction 2
6: TypeInt 32 0
7: TypeFunction 6(int)
- 10: TypeRayQueryProvisionalKHR
- 11: TypePointer Function 10
+ 10: TypeRayQueryKHR
+ 11: TypePointer Private 10
12: TypeFloat 32
13: TypeVector 12(float) 3
14(Ray): TypeStruct 13(fvec3) 12(float) 13(fvec3) 12(float)
@@ -88,12 +88,12 @@
75: TypePointer Uniform 74(Rays)
76: 75(ptr) Variable Uniform
78: TypePointer Uniform 72(Ray)
+ 89(rayQuery): 11(ptr) Variable Private
94: 6(int) Constant 32
4(main): 2 Function None 3
5: Label
69(index): 68(ptr) Variable Function
71(ray): 15(ptr) Variable Function
- 89(rayQuery): 11(ptr) Variable Function
90(param): 15(ptr) Variable Function
70: 6(int) FunctionCall 8(launchIndex()
Store 69(index) 70
diff --git a/Test/baseResults/rayQuery-no-cse.rgen.out b/Test/baseResults/rayQuery-no-cse.rgen.out
index 23c8b51..a44c41f 100644
--- a/Test/baseResults/rayQuery-no-cse.rgen.out
+++ b/Test/baseResults/rayQuery-no-cse.rgen.out
@@ -3,7 +3,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 107
- Capability RayQueryProvisionalKHR
+ Capability RayQueryKHR
Capability RayTracingNV
Extension "SPV_KHR_ray_query"
Extension "SPV_NV_ray_tracing"
@@ -57,8 +57,8 @@
3: TypeFunction 2
6: TypeInt 32 0
7: TypeFunction 6(int)
- 10: TypeRayQueryProvisionalKHR
- 11: TypePointer Function 10
+ 10: TypeRayQueryKHR
+ 11: TypePointer Private 10
12: TypeFloat 32
13: TypeVector 12(float) 3
14(Ray): TypeStruct 13(fvec3) 12(float) 13(fvec3) 12(float)
@@ -90,14 +90,14 @@
75: TypePointer Uniform 74(Rays)
76: 75(ptr) Variable Uniform
78: TypePointer Uniform 72(Ray)
+ 89(rayQuery1): 11(ptr) Variable Private
94: 6(int) Constant 32
+ 103(rayQuery2): 11(ptr) Variable Private
4(main): 2 Function None 3
5: Label
69(index): 68(ptr) Variable Function
71(ray): 15(ptr) Variable Function
- 89(rayQuery1): 11(ptr) Variable Function
90(param): 15(ptr) Variable Function
- 103(rayQuery2): 11(ptr) Variable Function
104(param): 15(ptr) Variable Function
70: 6(int) FunctionCall 8(launchIndex()
Store 69(index) 70
diff --git a/Test/baseResults/rayQuery-types.comp.out b/Test/baseResults/rayQuery-types.comp.out
new file mode 100644
index 0000000..87a1d68
--- /dev/null
+++ b/Test/baseResults/rayQuery-types.comp.out
@@ -0,0 +1,152 @@
+rayQuery-types.comp
+// Module Version 10000
+// Generated by (magic number): 8000a
+// Id's are bound by 86
+
+ Capability Shader
+ Capability RayQueryKHR
+ Extension "SPV_KHR_ray_query"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint GLCompute 4 "main"
+ ExecutionMode 4 LocalSize 16 8 1
+ Source GLSL 460
+ SourceExtension "GL_EXT_ray_query"
+ Name 4 "main"
+ Name 8 "rayQuery"
+ Name 11 "tlas"
+ Name 25 "rq_proceed"
+ Name 35 "intersectionType"
+ Name 41 "rayTMin"
+ Name 43 "rayFlags"
+ Name 46 "worldRayOrigin"
+ Name 48 "worldDirection"
+ Name 50 "intersectionT"
+ Name 53 "customIndex"
+ Name 55 "instanceId"
+ Name 57 "sbtOffset"
+ Name 59 "geometryIndex"
+ Name 61 "primitiveIndex"
+ Name 65 "barys"
+ Name 67 "frontface"
+ Name 69 "aabbOpaque"
+ Name 71 "objRayDirection"
+ Name 73 "objRayOrigin"
+ Name 77 "objToWorld"
+ Name 79 "worldToObj"
+ Decorate 11(tlas) DescriptorSet 0
+ Decorate 11(tlas) Binding 0
+ Decorate 85 BuiltIn WorkgroupSize
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeRayQueryKHR
+ 7: TypePointer Private 6
+ 8(rayQuery): 7(ptr) Variable Private
+ 9: TypeAccelerationStructureKHR
+ 10: TypePointer UniformConstant 9
+ 11(tlas): 10(ptr) Variable UniformConstant
+ 13: TypeInt 32 0
+ 14: 13(int) Constant 0
+ 15: 13(int) Constant 255
+ 16: TypeFloat 32
+ 17: TypeVector 16(float) 3
+ 18: 16(float) Constant 0
+ 19: 17(fvec3) ConstantComposite 18 18 18
+ 20: 16(float) Constant 1065353216
+ 21: 17(fvec3) ConstantComposite 20 18 18
+ 22: 16(float) Constant 1176256512
+ 23: TypeBool
+ 24: TypePointer Function 23(bool)
+ 34: TypePointer Function 13(int)
+ 36: 23(bool) ConstantTrue
+ 37: TypeInt 32 1
+ 38: 37(int) Constant 1
+ 40: TypePointer Function 16(float)
+ 45: TypePointer Function 17(fvec3)
+ 52: TypePointer Function 37(int)
+ 63: TypeVector 16(float) 2
+ 64: TypePointer Function 63(fvec2)
+ 75: TypeMatrix 17(fvec3) 4
+ 76: TypePointer Function 75
+ 81: TypeVector 13(int) 3
+ 82: 13(int) Constant 16
+ 83: 13(int) Constant 8
+ 84: 13(int) Constant 1
+ 85: 81(ivec3) ConstantComposite 82 83 84
+ 4(main): 2 Function None 3
+ 5: Label
+ 25(rq_proceed): 24(ptr) Variable Function
+35(intersectionType): 34(ptr) Variable Function
+ 41(rayTMin): 40(ptr) Variable Function
+ 43(rayFlags): 34(ptr) Variable Function
+46(worldRayOrigin): 45(ptr) Variable Function
+48(worldDirection): 45(ptr) Variable Function
+50(intersectionT): 40(ptr) Variable Function
+ 53(customIndex): 52(ptr) Variable Function
+ 55(instanceId): 52(ptr) Variable Function
+ 57(sbtOffset): 34(ptr) Variable Function
+59(geometryIndex): 52(ptr) Variable Function
+61(primitiveIndex): 52(ptr) Variable Function
+ 65(barys): 64(ptr) Variable Function
+ 67(frontface): 24(ptr) Variable Function
+ 69(aabbOpaque): 24(ptr) Variable Function
+71(objRayDirection): 45(ptr) Variable Function
+73(objRayOrigin): 45(ptr) Variable Function
+ 77(objToWorld): 76(ptr) Variable Function
+ 79(worldToObj): 76(ptr) Variable Function
+ 12: 9 Load 11(tlas)
+ RayQueryInitializeKHR 8(rayQuery) 12 14 15 19 18 21 22
+ 26: 23(bool) RayQueryProceedKHR 8(rayQuery)
+ Store 25(rq_proceed) 26
+ Branch 27
+ 27: Label
+ LoopMerge 29 30 None
+ Branch 31
+ 31: Label
+ 32: 23(bool) Load 25(rq_proceed)
+ BranchConditional 32 28 29
+ 28: Label
+ 33: 23(bool) RayQueryProceedKHR 8(rayQuery)
+ Store 25(rq_proceed) 33
+ Branch 30
+ 30: Label
+ Branch 27
+ 29: Label
+ 39: 13(int) RayQueryGetIntersectionTypeKHR 8(rayQuery) 38
+ Store 35(intersectionType) 39
+ 42: 16(float) RayQueryGetRayTMinKHR 8(rayQuery)
+ Store 41(rayTMin) 42
+ 44: 13(int) RayQueryGetRayFlagsKHR 8(rayQuery)
+ Store 43(rayFlags) 44
+ 47: 17(fvec3) RayQueryGetWorldRayOriginKHR 8(rayQuery)
+ Store 46(worldRayOrigin) 47
+ 49: 17(fvec3) RayQueryGetWorldRayDirectionKHR 8(rayQuery)
+ Store 48(worldDirection) 49
+ 51: 16(float) RayQueryGetIntersectionTKHR 8(rayQuery) 38
+ Store 50(intersectionT) 51
+ 54: 37(int) RayQueryGetIntersectionInstanceCustomIndexKHR 8(rayQuery) 38
+ Store 53(customIndex) 54
+ 56: 37(int) RayQueryGetIntersectionInstanceIdKHR 8(rayQuery) 38
+ Store 55(instanceId) 56
+ 58: 13(int) RayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetKHR 8(rayQuery) 38
+ Store 57(sbtOffset) 58
+ 60: 37(int) RayQueryGetIntersectionGeometryIndexKHR 8(rayQuery) 38
+ Store 59(geometryIndex) 60
+ 62: 37(int) RayQueryGetIntersectionPrimitiveIndexKHR 8(rayQuery) 38
+ Store 61(primitiveIndex) 62
+ 66: 63(fvec2) RayQueryGetIntersectionBarycentricsKHR 8(rayQuery) 38
+ Store 65(barys) 66
+ 68: 23(bool) RayQueryGetIntersectionFrontFaceKHR 8(rayQuery) 38
+ Store 67(frontface) 68
+ 70: 23(bool) RayQueryGetIntersectionCandidateAABBOpaqueKHR 8(rayQuery)
+ Store 69(aabbOpaque) 70
+ 72: 17(fvec3) RayQueryGetIntersectionObjectRayDirectionKHR 8(rayQuery) 38
+ Store 71(objRayDirection) 72
+ 74: 17(fvec3) RayQueryGetIntersectionObjectRayOriginKHR 8(rayQuery) 38
+ Store 73(objRayOrigin) 74
+ 78: 75 RayQueryGetIntersectionObjectToWorldKHR 8(rayQuery) 38
+ Store 77(objToWorld) 78
+ 80: 75 RayQueryGetIntersectionWorldToObjectKHR 8(rayQuery) 38
+ Store 79(worldToObj) 80
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/rayQuery.rgen.out b/Test/baseResults/rayQuery.rgen.out
index bf142a3..80e9916 100644
--- a/Test/baseResults/rayQuery.rgen.out
+++ b/Test/baseResults/rayQuery.rgen.out
@@ -3,7 +3,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 44
- Capability RayQueryProvisionalKHR
+ Capability RayQueryKHR
Capability RayTracingNV
Extension "SPV_KHR_ray_query"
Extension "SPV_NV_ray_tracing"
@@ -39,8 +39,9 @@
11: TypePointer Function 10(float)
13: 10(float) Constant 0
15: 10(float) Constant 1148846080
- 16: TypeRayQueryProvisionalKHR
- 17: TypePointer Function 16
+ 16: TypeRayQueryKHR
+ 17: TypePointer Private 16
+18(localRayQuery): 17(ptr) Variable Private
19: TypeAccelerationStructureKHR
20: TypePointer UniformConstant 19
21(acc0): 20(ptr) Variable UniformConstant
@@ -59,7 +60,6 @@
8(rayFlags): 7(ptr) Variable Function
12(tMin): 11(ptr) Variable Function
14(tMax): 11(ptr) Variable Function
-18(localRayQuery): 17(ptr) Variable Function
Store 8(rayFlags) 9
Store 12(tMin) 13
Store 14(tMax) 15
diff --git a/Test/baseResults/spv.AnyHitShader.rahit.out b/Test/baseResults/spv.AnyHitShader.rahit.out
index 755d60e..c893f88 100644
--- a/Test/baseResults/spv.AnyHitShader.rahit.out
+++ b/Test/baseResults/spv.AnyHitShader.rahit.out
@@ -53,7 +53,7 @@
Decorate 42(gl_ObjectRayDirectionNV) BuiltIn ObjectRayDirectionKHR
Decorate 47(gl_RayTminNV) BuiltIn RayTminKHR
Decorate 50(gl_RayTmaxNV) BuiltIn RayTmaxKHR
- Decorate 53(gl_HitTNV) BuiltIn HitTKHR
+ Decorate 53(gl_HitTNV) BuiltIn HitTNV
Decorate 58(gl_HitKindNV) BuiltIn HitKindKHR
Decorate 64(gl_ObjectToWorldNV) BuiltIn ObjectToWorldKHR
Decorate 67(gl_WorldToObjectNV) BuiltIn WorldToObjectKHR
@@ -153,10 +153,10 @@
SelectionMerge 79 None
BranchConditional 77 78 80
78: Label
- IgnoreIntersectionKHR
+ IgnoreIntersectionNV
Branch 79
80: Label
- TerminateRayKHR
+ TerminateRayNV
Branch 79
79: Label
Return
diff --git a/Test/baseResults/spv.ClosestHitShader.rchit.out b/Test/baseResults/spv.ClosestHitShader.rchit.out
index 63039dd..b76629c 100644
--- a/Test/baseResults/spv.ClosestHitShader.rchit.out
+++ b/Test/baseResults/spv.ClosestHitShader.rchit.out
@@ -55,7 +55,7 @@
Decorate 42(gl_ObjectRayDirectionNV) BuiltIn ObjectRayDirectionKHR
Decorate 47(gl_RayTminNV) BuiltIn RayTminKHR
Decorate 50(gl_RayTmaxNV) BuiltIn RayTmaxKHR
- Decorate 53(gl_HitTNV) BuiltIn HitTKHR
+ Decorate 53(gl_HitTNV) BuiltIn HitTNV
Decorate 58(gl_HitKindNV) BuiltIn HitKindKHR
Decorate 64(gl_ObjectToWorldNV) BuiltIn ObjectToWorldKHR
Decorate 67(gl_WorldToObjectNV) BuiltIn WorldToObjectKHR
@@ -164,6 +164,6 @@
68: 60 Load 67(gl_WorldToObjectNV)
Store 66(v14) 68
72: 69 Load 71(accNV)
- TraceRayKHR 72 73 74 75 76 73 78 77 80 81 82
+ TraceNV 72 73 74 75 76 73 78 77 80 81 82
Return
FunctionEnd
diff --git a/Test/baseResults/spv.MissShader.rmiss.out b/Test/baseResults/spv.MissShader.rmiss.out
index d0eeb01..e573bba 100644
--- a/Test/baseResults/spv.MissShader.rmiss.out
+++ b/Test/baseResults/spv.MissShader.rmiss.out
@@ -1,13 +1,13 @@
spv.MissShader.rmiss
// Module Version 10000
// Generated by (magic number): 8000a
-// Id's are bound by 60
+// Id's are bound by 59
Capability RayTracingNV
Extension "SPV_NV_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint MissKHR 4 "main" 11 14 21 24 27 30 35 38
+ EntryPoint MissKHR 4 "main" 11 14 21 24 29 34 37
Source GLSL 460
SourceExtension "GL_NV_ray_tracing"
Name 4 "main"
@@ -19,29 +19,26 @@
Name 21 "gl_WorldRayOriginNV"
Name 23 "v3"
Name 24 "gl_WorldRayDirectionNV"
- Name 26 "v4"
- Name 27 "gl_ObjectRayOriginNV"
- Name 29 "v5"
- Name 30 "gl_ObjectRayDirectionNV"
- Name 33 "v6"
- Name 35 "gl_RayTminNV"
- Name 37 "v7"
- Name 38 "gl_RayTmaxNV"
- Name 42 "accNV"
- Name 57 "localPayload"
- Name 59 "incomingPayload"
+ Name 27 "v4"
+ Name 29 "gl_IncomingRayFlagsNV"
+ Name 32 "v6"
+ Name 34 "gl_RayTminNV"
+ Name 36 "v7"
+ Name 37 "gl_RayTmaxNV"
+ Name 41 "accNV"
+ Name 56 "localPayload"
+ Name 58 "incomingPayload"
Decorate 11(gl_LaunchIDNV) BuiltIn LaunchIdKHR
Decorate 14(gl_LaunchSizeNV) BuiltIn LaunchSizeKHR
Decorate 21(gl_WorldRayOriginNV) BuiltIn WorldRayOriginKHR
Decorate 24(gl_WorldRayDirectionNV) BuiltIn WorldRayDirectionKHR
- Decorate 27(gl_ObjectRayOriginNV) BuiltIn ObjectRayOriginKHR
- Decorate 30(gl_ObjectRayDirectionNV) BuiltIn ObjectRayDirectionKHR
- Decorate 35(gl_RayTminNV) BuiltIn RayTminKHR
- Decorate 38(gl_RayTmaxNV) BuiltIn RayTmaxKHR
- Decorate 42(accNV) DescriptorSet 0
- Decorate 42(accNV) Binding 0
- Decorate 57(localPayload) Location 0
- Decorate 59(incomingPayload) Location 1
+ Decorate 29(gl_IncomingRayFlagsNV) BuiltIn IncomingRayFlagsKHR
+ Decorate 34(gl_RayTminNV) BuiltIn RayTminKHR
+ Decorate 37(gl_RayTmaxNV) BuiltIn RayTmaxKHR
+ Decorate 41(accNV) DescriptorSet 0
+ Decorate 41(accNV) Binding 0
+ Decorate 56(localPayload) Location 0
+ Decorate 58(incomingPayload) Location 1
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@@ -56,41 +53,41 @@
20: TypePointer Input 17(fvec3)
21(gl_WorldRayOriginNV): 20(ptr) Variable Input
24(gl_WorldRayDirectionNV): 20(ptr) Variable Input
-27(gl_ObjectRayOriginNV): 20(ptr) Variable Input
-30(gl_ObjectRayDirectionNV): 20(ptr) Variable Input
- 32: TypePointer Function 16(float)
- 34: TypePointer Input 16(float)
-35(gl_RayTminNV): 34(ptr) Variable Input
-38(gl_RayTmaxNV): 34(ptr) Variable Input
- 40: TypeAccelerationStructureKHR
- 41: TypePointer UniformConstant 40
- 42(accNV): 41(ptr) Variable UniformConstant
- 44: 6(int) Constant 0
- 45: 6(int) Constant 1
- 46: 6(int) Constant 2
- 47: 6(int) Constant 3
- 48: 16(float) Constant 1056964608
- 49: 17(fvec3) ConstantComposite 48 48 48
- 50: 16(float) Constant 1065353216
- 51: 17(fvec3) ConstantComposite 50 50 50
- 52: 16(float) Constant 1061158912
- 53: TypeInt 32 1
- 54: 53(int) Constant 1
- 55: TypeVector 16(float) 4
- 56: TypePointer RayPayloadKHR 55(fvec4)
-57(localPayload): 56(ptr) Variable RayPayloadKHR
- 58: TypePointer IncomingRayPayloadKHR 55(fvec4)
-59(incomingPayload): 58(ptr) Variable IncomingRayPayloadKHR
+ 26: TypePointer Function 6(int)
+ 28: TypePointer Input 6(int)
+29(gl_IncomingRayFlagsNV): 28(ptr) Variable Input
+ 31: TypePointer Function 16(float)
+ 33: TypePointer Input 16(float)
+34(gl_RayTminNV): 33(ptr) Variable Input
+37(gl_RayTmaxNV): 33(ptr) Variable Input
+ 39: TypeAccelerationStructureKHR
+ 40: TypePointer UniformConstant 39
+ 41(accNV): 40(ptr) Variable UniformConstant
+ 43: 6(int) Constant 0
+ 44: 6(int) Constant 1
+ 45: 6(int) Constant 2
+ 46: 6(int) Constant 3
+ 47: 16(float) Constant 1056964608
+ 48: 17(fvec3) ConstantComposite 47 47 47
+ 49: 16(float) Constant 1065353216
+ 50: 17(fvec3) ConstantComposite 49 49 49
+ 51: 16(float) Constant 1061158912
+ 52: TypeInt 32 1
+ 53: 52(int) Constant 1
+ 54: TypeVector 16(float) 4
+ 55: TypePointer RayPayloadKHR 54(fvec4)
+56(localPayload): 55(ptr) Variable RayPayloadKHR
+ 57: TypePointer IncomingRayPayloadKHR 54(fvec4)
+58(incomingPayload): 57(ptr) Variable IncomingRayPayloadKHR
4(main): 2 Function None 3
5: Label
9(v0): 8(ptr) Variable Function
13(v1): 8(ptr) Variable Function
19(v2): 18(ptr) Variable Function
23(v3): 18(ptr) Variable Function
- 26(v4): 18(ptr) Variable Function
- 29(v5): 18(ptr) Variable Function
- 33(v6): 32(ptr) Variable Function
- 37(v7): 32(ptr) Variable Function
+ 27(v4): 26(ptr) Variable Function
+ 32(v6): 31(ptr) Variable Function
+ 36(v7): 31(ptr) Variable Function
12: 7(ivec3) Load 11(gl_LaunchIDNV)
Store 9(v0) 12
15: 7(ivec3) Load 14(gl_LaunchSizeNV)
@@ -99,15 +96,13 @@
Store 19(v2) 22
25: 17(fvec3) Load 24(gl_WorldRayDirectionNV)
Store 23(v3) 25
- 28: 17(fvec3) Load 27(gl_ObjectRayOriginNV)
- Store 26(v4) 28
- 31: 17(fvec3) Load 30(gl_ObjectRayDirectionNV)
- Store 29(v5) 31
- 36: 16(float) Load 35(gl_RayTminNV)
- Store 33(v6) 36
- 39: 16(float) Load 38(gl_RayTmaxNV)
- Store 37(v7) 39
- 43: 40 Load 42(accNV)
- TraceRayKHR 43 44 45 46 47 44 49 48 51 52 54
+ 30: 6(int) Load 29(gl_IncomingRayFlagsNV)
+ Store 27(v4) 30
+ 35: 16(float) Load 34(gl_RayTminNV)
+ Store 32(v6) 35
+ 38: 16(float) Load 37(gl_RayTmaxNV)
+ Store 36(v7) 38
+ 42: 39 Load 41(accNV)
+ TraceNV 42 43 44 45 46 43 48 47 50 51 53
Return
FunctionEnd
diff --git a/Test/baseResults/spv.RayCallable.rcall.out b/Test/baseResults/spv.RayCallable.rcall.out
index f59d36f..75698fc 100644
--- a/Test/baseResults/spv.RayCallable.rcall.out
+++ b/Test/baseResults/spv.RayCallable.rcall.out
@@ -55,6 +55,6 @@
Store 13(size) 15
23: 22(ptr) AccessChain 18 20
Store 23 21
- ExecuteCallableKHR 24 25
+ ExecuteCallableNV 24 25
Return
FunctionEnd
diff --git a/Test/baseResults/spv.RayConstants.rgen.out b/Test/baseResults/spv.RayConstants.rgen.out
index c4085fe..962aeb7 100644
--- a/Test/baseResults/spv.RayConstants.rgen.out
+++ b/Test/baseResults/spv.RayConstants.rgen.out
@@ -41,6 +41,6 @@
4(main): 2 Function None 3
5: Label
9: 6 Load 8(accNV)
- TraceRayKHR 9 11 12 13 13 12 17 18 20 21 23
+ TraceNV 9 11 12 13 13 12 17 18 20 21 23
Return
FunctionEnd
diff --git a/Test/baseResults/spv.RayGenShader.rgen.out b/Test/baseResults/spv.RayGenShader.rgen.out
index 363b3dd..f8f3fd6 100644
--- a/Test/baseResults/spv.RayGenShader.rgen.out
+++ b/Test/baseResults/spv.RayGenShader.rgen.out
@@ -92,6 +92,6 @@
44: 36(fvec3) Load 43
47: 42(ptr) AccessChain 39 46
48: 36(fvec3) Load 47
- TraceRayKHR 30 31 32 33 34 12 44 45 48 49 41
+ TraceNV 30 31 32 33 34 12 44 45 48 49 41
Return
FunctionEnd
diff --git a/Test/baseResults/spv.RayGenShader11.rgen.out b/Test/baseResults/spv.RayGenShader11.rgen.out
index 195071f..f6b79c5 100644
--- a/Test/baseResults/spv.RayGenShader11.rgen.out
+++ b/Test/baseResults/spv.RayGenShader11.rgen.out
@@ -88,6 +88,6 @@
44: 36(fvec3) Load 43
47: 42(ptr) AccessChain 39 46
48: 36(fvec3) Load 47
- TraceRayKHR 30 31 32 33 34 12 44 45 48 49 41
+ TraceNV 30 31 32 33 34 12 44 45 48 49 41
Return
FunctionEnd
diff --git a/Test/baseResults/spv.RayGenShaderArray.rgen.out b/Test/baseResults/spv.RayGenShaderArray.rgen.out
index fef54aa..63a04b3 100644
--- a/Test/baseResults/spv.RayGenShaderArray.rgen.out
+++ b/Test/baseResults/spv.RayGenShaderArray.rgen.out
@@ -111,7 +111,7 @@
51: 32(fvec3) Load 50
54: 49(ptr) AccessChain 36 53
55: 32(fvec3) Load 54
- TraceRayKHR 43 44 45 46 47 12 51 52 55 56 48
+ TraceNV 43 44 45 46 47 12 51 52 55 56 48
61: 38(ptr) AccessChain 36 37
62: 33(int) Load 61
63: 41(ptr) AccessChain 60(accNV1) 62
@@ -124,7 +124,7 @@
70: 32(fvec3) Load 69
71: 49(ptr) AccessChain 36 53
72: 32(fvec3) Load 71
- TraceRayKHR 64 65 66 67 68 12 70 52 72 56 48
+ TraceNV 64 65 66 67 68 12 70 52 72 56 48
73: 38(ptr) AccessChain 36 37
74: 33(int) Load 73
75: 33(int) CopyObject 74
@@ -138,6 +138,6 @@
83: 32(fvec3) Load 82
84: 49(ptr) AccessChain 36 53
85: 32(fvec3) Load 84
- TraceRayKHR 77 78 79 80 81 12 83 52 85 56 48
+ TraceNV 77 78 79 80 81 12 83 52 85 56 48
Return
FunctionEnd
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp.out
new file mode 100644
index 0000000..31dd2dd
--- /dev/null
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp.out
@@ -0,0 +1,54 @@
+spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 25
+
+ Capability Shader
+ Capability Float16
+ Capability Int16
+ Capability CapabilityWorkgroupMemoryExplicitLayoutKHR
+ Capability CapabilityWorkgroupMemoryExplicitLayout16BitAccessKHR
+ Extension "SPV_KHR_workgroup_memory_explicit_layout"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint GLCompute 4 "main" 10
+ ExecutionMode 4 LocalSize 2 1 1
+ Source GLSL 430
+ SourceExtension "GL_EXT_shader_explicit_arithmetic_types"
+ SourceExtension "GL_EXT_shared_memory_block"
+ Name 4 "main"
+ Name 8 "first"
+ MemberName 8(first) 0 "a"
+ MemberName 8(first) 1 "f"
+ Name 10 ""
+ MemberDecorate 8(first) 0 Offset 0
+ MemberDecorate 8(first) 1 Offset 2
+ Decorate 8(first) Block
+ Decorate 24 BuiltIn WorkgroupSize
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 16 1
+ 7: TypeFloat 16
+ 8(first): TypeStruct 6(int16_t) 7(float16_t)
+ 9: TypePointer Workgroup 8(first)
+ 10: 9(ptr) Variable Workgroup
+ 11: TypeInt 32 1
+ 12: 11(int) Constant 0
+ 13: 6(int16_t) Constant 3
+ 14: TypePointer Workgroup 6(int16_t)
+ 16: 11(int) Constant 1
+ 17:7(float16_t) Constant 18982
+ 18: TypePointer Workgroup 7(float16_t)
+ 20: TypeInt 32 0
+ 21: TypeVector 20(int) 3
+ 22: 20(int) Constant 2
+ 23: 20(int) Constant 1
+ 24: 21(ivec3) ConstantComposite 22 23 23
+ 4(main): 2 Function None 3
+ 5: Label
+ 15: 14(ptr) AccessChain 10 12
+ Store 15 13
+ 19: 18(ptr) AccessChain 10 16
+ Store 19 17
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp.out
new file mode 100644
index 0000000..3447791
--- /dev/null
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp.out
@@ -0,0 +1,45 @@
+spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 20
+
+ Capability Shader
+ Capability Int8
+ Capability CapabilityWorkgroupMemoryExplicitLayoutKHR
+ Capability CapabilityWorkgroupMemoryExplicitLayout8BitAccessKHR
+ Extension "SPV_KHR_workgroup_memory_explicit_layout"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint GLCompute 4 "main" 9
+ ExecutionMode 4 LocalSize 2 1 1
+ Source GLSL 430
+ SourceExtension "GL_EXT_shader_explicit_arithmetic_types"
+ SourceExtension "GL_EXT_shared_memory_block"
+ Name 4 "main"
+ Name 7 "first"
+ MemberName 7(first) 0 "a"
+ Name 9 ""
+ MemberDecorate 7(first) 0 Offset 0
+ Decorate 7(first) Block
+ Decorate 19 BuiltIn WorkgroupSize
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 8 1
+ 7(first): TypeStruct 6(int8_t)
+ 8: TypePointer Workgroup 7(first)
+ 9: 8(ptr) Variable Workgroup
+ 10: TypeInt 32 1
+ 11: 10(int) Constant 0
+ 12: 6(int8_t) Constant 2
+ 13: TypePointer Workgroup 6(int8_t)
+ 15: TypeInt 32 0
+ 16: TypeVector 15(int) 3
+ 17: 15(int) Constant 2
+ 18: 15(int) Constant 1
+ 19: 16(ivec3) ConstantComposite 17 18 18
+ 4(main): 2 Function None 3
+ 5: Label
+ 14: 13(ptr) AccessChain 9 11
+ Store 14 12
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.MixBlockNonBlock_Errors.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.MixBlockNonBlock_Errors.comp.out
new file mode 100644
index 0000000..82495d1
--- /dev/null
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.MixBlockNonBlock_Errors.comp.out
@@ -0,0 +1,4 @@
+spv.WorkgroupMemoryExplicitLayout.MixBlockNonBlock_Errors.comp
+ERROR: Linking compute stage: cannot mix use of shared variables inside and outside blocks
+
+SPIR-V is not generated for failed compile or link
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp.out
new file mode 100644
index 0000000..b578bd3
--- /dev/null
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp.out
@@ -0,0 +1,54 @@
+spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 24
+
+ Capability Shader
+ Capability CapabilityWorkgroupMemoryExplicitLayoutKHR
+ Extension "SPV_KHR_workgroup_memory_explicit_layout"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint GLCompute 4 "main" 9 16
+ ExecutionMode 4 LocalSize 8 1 1
+ Source GLSL 430
+ SourceExtension "GL_EXT_shared_memory_block"
+ Name 4 "main"
+ Name 7 "first"
+ MemberName 7(first) 0 "a"
+ Name 9 ""
+ Name 14 "second"
+ MemberName 14(second) 0 "b"
+ Name 16 ""
+ MemberDecorate 7(first) 0 Offset 0
+ Decorate 7(first) Block
+ MemberDecorate 14(second) 0 Offset 0
+ Decorate 14(second) Block
+ Decorate 23 BuiltIn WorkgroupSize
+ Decorate 9 Aliased
+ Decorate 16 Aliased
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 1
+ 7(first): TypeStruct 6(int)
+ 8: TypePointer Workgroup 7(first)
+ 9: 8(ptr) Variable Workgroup
+ 10: 6(int) Constant 0
+ 11: 6(int) Constant 2
+ 12: TypePointer Workgroup 6(int)
+ 14(second): TypeStruct 6(int)
+ 15: TypePointer Workgroup 14(second)
+ 16: 15(ptr) Variable Workgroup
+ 17: 6(int) Constant 3
+ 19: TypeInt 32 0
+ 20: TypeVector 19(int) 3
+ 21: 19(int) Constant 8
+ 22: 19(int) Constant 1
+ 23: 20(ivec3) ConstantComposite 21 22 22
+ 4(main): 2 Function None 3
+ 5: Label
+ 13: 12(ptr) AccessChain 9 10
+ Store 13 11
+ 18: 12(ptr) AccessChain 16 10
+ Store 18 17
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.NonBlock.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.NonBlock.comp.out
new file mode 100644
index 0000000..19bcff6
--- /dev/null
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.NonBlock.comp.out
@@ -0,0 +1,35 @@
+spv.WorkgroupMemoryExplicitLayout.NonBlock.comp
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 17
+
+ Capability Shader
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint GLCompute 4 "main" 8 10
+ ExecutionMode 4 LocalSize 8 1 1
+ Source GLSL 430
+ SourceExtension "GL_EXT_shared_memory_block"
+ Name 4 "main"
+ Name 8 "a"
+ Name 10 "b"
+ Decorate 16 BuiltIn WorkgroupSize
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 1
+ 7: TypePointer Workgroup 6(int)
+ 8(a): 7(ptr) Variable Workgroup
+ 9: 6(int) Constant 2
+ 10(b): 7(ptr) Variable Workgroup
+ 11: 6(int) Constant 3
+ 12: TypeInt 32 0
+ 13: TypeVector 12(int) 3
+ 14: 12(int) Constant 8
+ 15: 12(int) Constant 1
+ 16: 13(ivec3) ConstantComposite 14 15 15
+ 4(main): 2 Function None 3
+ 5: Label
+ Store 8(a) 9
+ Store 10(b) 11
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp.out
new file mode 100644
index 0000000..413fd2e
--- /dev/null
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp.out
@@ -0,0 +1,41 @@
+spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 19
+
+ Capability Shader
+ Capability CapabilityWorkgroupMemoryExplicitLayoutKHR
+ Extension "SPV_KHR_workgroup_memory_explicit_layout"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint GLCompute 4 "main" 9
+ ExecutionMode 4 LocalSize 8 1 1
+ Source GLSL 430
+ SourceExtension "GL_EXT_shared_memory_block"
+ Name 4 "main"
+ Name 7 "first"
+ MemberName 7(first) 0 "a"
+ Name 9 ""
+ MemberDecorate 7(first) 0 Offset 0
+ Decorate 7(first) Block
+ Decorate 18 BuiltIn WorkgroupSize
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 1
+ 7(first): TypeStruct 6(int)
+ 8: TypePointer Workgroup 7(first)
+ 9: 8(ptr) Variable Workgroup
+ 10: 6(int) Constant 0
+ 11: 6(int) Constant 2
+ 12: TypePointer Workgroup 6(int)
+ 14: TypeInt 32 0
+ 15: TypeVector 14(int) 3
+ 16: 14(int) Constant 8
+ 17: 14(int) Constant 1
+ 18: 15(ivec3) ConstantComposite 16 17 17
+ 4(main): 2 Function None 3
+ 5: Label
+ 13: 12(ptr) AccessChain 9 10
+ Store 13 11
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.scalar.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.scalar.comp.out
new file mode 100644
index 0000000..6a43e23
--- /dev/null
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.scalar.comp.out
@@ -0,0 +1,84 @@
+spv.WorkgroupMemoryExplicitLayout.scalar.comp
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 29
+
+ Capability Shader
+ Capability CapabilityWorkgroupMemoryExplicitLayoutKHR
+ Extension "SPV_KHR_workgroup_memory_explicit_layout"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint GLCompute 4 "main" 28
+ ExecutionMode 4 LocalSize 8 1 1
+ Source GLSL 430
+ SourceExtension "GL_EXT_scalar_block_layout"
+ SourceExtension "GL_EXT_shared_memory_block"
+ Name 4 "main"
+ Name 17 "T"
+ MemberName 17(T) 0 "t"
+ Name 24 "S"
+ MemberName 24(S) 0 "f"
+ MemberName 24(S) 1 "v2"
+ MemberName 24(S) 2 "v3"
+ MemberName 24(S) 3 "v4"
+ MemberName 24(S) 4 "t"
+ MemberName 24(S) 5 "f_array"
+ MemberName 24(S) 6 "v2_array"
+ MemberName 24(S) 7 "v3_array"
+ MemberName 24(S) 8 "v4_array"
+ MemberName 24(S) 9 "t_array"
+ Name 26 "Block"
+ MemberName 26(Block) 0 "s"
+ MemberName 26(Block) 1 "s_array"
+ Name 28 ""
+ Decorate 10 BuiltIn WorkgroupSize
+ Decorate 16 ArrayStride 4
+ MemberDecorate 17(T) 0 Offset 0
+ Decorate 19 ArrayStride 4
+ Decorate 20 ArrayStride 8
+ Decorate 21 ArrayStride 12
+ Decorate 22 ArrayStride 16
+ Decorate 23 ArrayStride 12
+ MemberDecorate 24(S) 0 Offset 0
+ MemberDecorate 24(S) 1 Offset 4
+ MemberDecorate 24(S) 2 Offset 12
+ MemberDecorate 24(S) 3 Offset 24
+ MemberDecorate 24(S) 4 Offset 40
+ MemberDecorate 24(S) 5 Offset 52
+ MemberDecorate 24(S) 6 Offset 76
+ MemberDecorate 24(S) 7 Offset 124
+ MemberDecorate 24(S) 8 Offset 196
+ MemberDecorate 24(S) 9 Offset 292
+ Decorate 25 ArrayStride 364
+ MemberDecorate 26(Block) 0 Offset 0
+ MemberDecorate 26(Block) 1 Offset 364
+ Decorate 26(Block) Block
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 0
+ 7: TypeVector 6(int) 3
+ 8: 6(int) Constant 8
+ 9: 6(int) Constant 1
+ 10: 7(ivec3) ConstantComposite 8 9 9
+ 11: TypeFloat 32
+ 12: TypeVector 11(float) 2
+ 13: TypeVector 11(float) 3
+ 14: TypeVector 11(float) 4
+ 15: 6(int) Constant 3
+ 16: TypeArray 11(float) 15
+ 17(T): TypeStruct 16
+ 18: 6(int) Constant 6
+ 19: TypeArray 11(float) 18
+ 20: TypeArray 12(fvec2) 18
+ 21: TypeArray 13(fvec3) 18
+ 22: TypeArray 14(fvec4) 18
+ 23: TypeArray 17(T) 18
+ 24(S): TypeStruct 11(float) 12(fvec2) 13(fvec3) 14(fvec4) 17(T) 19 20 21 22 23
+ 25: TypeArray 24(S) 18
+ 26(Block): TypeStruct 24(S) 25
+ 27: TypePointer Workgroup 26(Block)
+ 28: 27(ptr) Variable Workgroup
+ 4(main): 2 Function None 3
+ 5: Label
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std140.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std140.comp.out
new file mode 100644
index 0000000..df4b8ae
--- /dev/null
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std140.comp.out
@@ -0,0 +1,83 @@
+spv.WorkgroupMemoryExplicitLayout.std140.comp
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 29
+
+ Capability Shader
+ Capability CapabilityWorkgroupMemoryExplicitLayoutKHR
+ Extension "SPV_KHR_workgroup_memory_explicit_layout"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint GLCompute 4 "main" 28
+ ExecutionMode 4 LocalSize 8 1 1
+ Source GLSL 430
+ SourceExtension "GL_EXT_shared_memory_block"
+ Name 4 "main"
+ Name 17 "T"
+ MemberName 17(T) 0 "t"
+ Name 24 "S"
+ MemberName 24(S) 0 "f"
+ MemberName 24(S) 1 "v2"
+ MemberName 24(S) 2 "v3"
+ MemberName 24(S) 3 "v4"
+ MemberName 24(S) 4 "t"
+ MemberName 24(S) 5 "f_array"
+ MemberName 24(S) 6 "v2_array"
+ MemberName 24(S) 7 "v3_array"
+ MemberName 24(S) 8 "v4_array"
+ MemberName 24(S) 9 "t_array"
+ Name 26 "Block"
+ MemberName 26(Block) 0 "s"
+ MemberName 26(Block) 1 "s_array"
+ Name 28 ""
+ Decorate 10 BuiltIn WorkgroupSize
+ Decorate 16 ArrayStride 16
+ MemberDecorate 17(T) 0 Offset 0
+ Decorate 19 ArrayStride 16
+ Decorate 20 ArrayStride 16
+ Decorate 21 ArrayStride 16
+ Decorate 22 ArrayStride 16
+ Decorate 23 ArrayStride 48
+ MemberDecorate 24(S) 0 Offset 0
+ MemberDecorate 24(S) 1 Offset 8
+ MemberDecorate 24(S) 2 Offset 16
+ MemberDecorate 24(S) 3 Offset 32
+ MemberDecorate 24(S) 4 Offset 48
+ MemberDecorate 24(S) 5 Offset 96
+ MemberDecorate 24(S) 6 Offset 192
+ MemberDecorate 24(S) 7 Offset 288
+ MemberDecorate 24(S) 8 Offset 384
+ MemberDecorate 24(S) 9 Offset 480
+ Decorate 25 ArrayStride 768
+ MemberDecorate 26(Block) 0 Offset 0
+ MemberDecorate 26(Block) 1 Offset 768
+ Decorate 26(Block) Block
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 0
+ 7: TypeVector 6(int) 3
+ 8: 6(int) Constant 8
+ 9: 6(int) Constant 1
+ 10: 7(ivec3) ConstantComposite 8 9 9
+ 11: TypeFloat 32
+ 12: TypeVector 11(float) 2
+ 13: TypeVector 11(float) 3
+ 14: TypeVector 11(float) 4
+ 15: 6(int) Constant 3
+ 16: TypeArray 11(float) 15
+ 17(T): TypeStruct 16
+ 18: 6(int) Constant 6
+ 19: TypeArray 11(float) 18
+ 20: TypeArray 12(fvec2) 18
+ 21: TypeArray 13(fvec3) 18
+ 22: TypeArray 14(fvec4) 18
+ 23: TypeArray 17(T) 18
+ 24(S): TypeStruct 11(float) 12(fvec2) 13(fvec3) 14(fvec4) 17(T) 19 20 21 22 23
+ 25: TypeArray 24(S) 18
+ 26(Block): TypeStruct 24(S) 25
+ 27: TypePointer Workgroup 26(Block)
+ 28: 27(ptr) Variable Workgroup
+ 4(main): 2 Function None 3
+ 5: Label
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std430.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std430.comp.out
new file mode 100644
index 0000000..e782784
--- /dev/null
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std430.comp.out
@@ -0,0 +1,83 @@
+spv.WorkgroupMemoryExplicitLayout.std430.comp
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 29
+
+ Capability Shader
+ Capability CapabilityWorkgroupMemoryExplicitLayoutKHR
+ Extension "SPV_KHR_workgroup_memory_explicit_layout"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint GLCompute 4 "main" 28
+ ExecutionMode 4 LocalSize 8 1 1
+ Source GLSL 430
+ SourceExtension "GL_EXT_shared_memory_block"
+ Name 4 "main"
+ Name 17 "T"
+ MemberName 17(T) 0 "t"
+ Name 24 "S"
+ MemberName 24(S) 0 "f"
+ MemberName 24(S) 1 "v2"
+ MemberName 24(S) 2 "v3"
+ MemberName 24(S) 3 "v4"
+ MemberName 24(S) 4 "t"
+ MemberName 24(S) 5 "f_array"
+ MemberName 24(S) 6 "v2_array"
+ MemberName 24(S) 7 "v3_array"
+ MemberName 24(S) 8 "v4_array"
+ MemberName 24(S) 9 "t_array"
+ Name 26 "Block"
+ MemberName 26(Block) 0 "s"
+ MemberName 26(Block) 1 "s_array"
+ Name 28 ""
+ Decorate 10 BuiltIn WorkgroupSize
+ Decorate 16 ArrayStride 4
+ MemberDecorate 17(T) 0 Offset 0
+ Decorate 19 ArrayStride 4
+ Decorate 20 ArrayStride 8
+ Decorate 21 ArrayStride 16
+ Decorate 22 ArrayStride 16
+ Decorate 23 ArrayStride 12
+ MemberDecorate 24(S) 0 Offset 0
+ MemberDecorate 24(S) 1 Offset 8
+ MemberDecorate 24(S) 2 Offset 16
+ MemberDecorate 24(S) 3 Offset 32
+ MemberDecorate 24(S) 4 Offset 48
+ MemberDecorate 24(S) 5 Offset 60
+ MemberDecorate 24(S) 6 Offset 88
+ MemberDecorate 24(S) 7 Offset 144
+ MemberDecorate 24(S) 8 Offset 240
+ MemberDecorate 24(S) 9 Offset 336
+ Decorate 25 ArrayStride 416
+ MemberDecorate 26(Block) 0 Offset 0
+ MemberDecorate 26(Block) 1 Offset 416
+ Decorate 26(Block) Block
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 0
+ 7: TypeVector 6(int) 3
+ 8: 6(int) Constant 8
+ 9: 6(int) Constant 1
+ 10: 7(ivec3) ConstantComposite 8 9 9
+ 11: TypeFloat 32
+ 12: TypeVector 11(float) 2
+ 13: TypeVector 11(float) 3
+ 14: TypeVector 11(float) 4
+ 15: 6(int) Constant 3
+ 16: TypeArray 11(float) 15
+ 17(T): TypeStruct 16
+ 18: 6(int) Constant 6
+ 19: TypeArray 11(float) 18
+ 20: TypeArray 12(fvec2) 18
+ 21: TypeArray 13(fvec3) 18
+ 22: TypeArray 14(fvec4) 18
+ 23: TypeArray 17(T) 18
+ 24(S): TypeStruct 11(float) 12(fvec2) 13(fvec3) 14(fvec4) 17(T) 19 20 21 22 23
+ 25: TypeArray 24(S) 18
+ 26(Block): TypeStruct 24(S) 25
+ 27: TypePointer Workgroup 26(Block)
+ 28: 27(ptr) Variable Workgroup
+ 4(main): 2 Function None 3
+ 5: Label
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.debugInfo.1.1.frag.out b/Test/baseResults/spv.debugInfo.1.1.frag.out
index 384c76b..78044ff 100644
--- a/Test/baseResults/spv.debugInfo.1.1.frag.out
+++ b/Test/baseResults/spv.debugInfo.1.1.frag.out
@@ -1,6 +1,4 @@
spv.debugInfo.frag
-error: SPIRV-Tools Validation Errors
-error: Invalid SPIR-V binary version 1.3 for target environment SPIR-V 1.0 (under OpenGL 4.5 semantics).
// Module Version 10300
// Generated by (magic number): 8000a
// Id's are bound by 124
@@ -9,7 +7,7 @@
2: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 5 "main" 24 52
- ExecutionMode 5 OriginLowerLeft
+ ExecutionMode 5 OriginUpperLeft
1: String "spv.debugInfo.frag"
Source GLSL 450 1 "#version 450
@@ -83,9 +81,9 @@
ModuleProcessed "resource-set-binding 3"
ModuleProcessed "auto-map-bindings"
ModuleProcessed "auto-map-locations"
- ModuleProcessed "client opengl100"
+ ModuleProcessed "client vulkan100"
ModuleProcessed "target-env spirv1.3"
- ModuleProcessed "target-env opengl"
+ ModuleProcessed "target-env vulkan1.1"
ModuleProcessed "relaxed-errors"
ModuleProcessed "suppress-warnings"
ModuleProcessed "hlsl-offsets"
@@ -97,7 +95,6 @@
Decorate 54(ubuf) Block
Decorate 56 DescriptorSet 3
Decorate 56 Binding 0
- Decorate 67(s2d) Location 0
Decorate 67(s2d) DescriptorSet 3
Decorate 67(s2d) Binding 1
3: TypeVoid
diff --git a/Test/baseResults/spv.ext.AccelDecl.frag.out b/Test/baseResults/spv.ext.AccelDecl.frag.out
new file mode 100644
index 0000000..11d4560
--- /dev/null
+++ b/Test/baseResults/spv.ext.AccelDecl.frag.out
@@ -0,0 +1,41 @@
+spv.ext.AccelDecl.frag
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 15
+
+ Capability Shader
+ Capability RayQueryKHR
+ Extension "SPV_KHR_ray_query"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint Fragment 4 "main" 9 14
+ ExecutionMode 4 OriginUpperLeft
+ Source GLSL 460
+ SourceExtension "GL_ARB_separate_shader_objects"
+ SourceExtension "GL_EXT_nonuniform_qualifier"
+ SourceExtension "GL_EXT_ray_query"
+ SourceExtension "GL_EXT_scalar_block_layout"
+ SourceExtension "GL_GOOGLE_cpp_style_line_directive"
+ SourceExtension "GL_GOOGLE_include_directive"
+ Name 4 "main"
+ Name 9 "outColor"
+ Name 14 "topLevelAS"
+ Decorate 9(outColor) Location 0
+ Decorate 14(topLevelAS) DescriptorSet 0
+ Decorate 14(topLevelAS) Binding 1
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeFloat 32
+ 7: TypeVector 6(float) 4
+ 8: TypePointer Output 7(fvec4)
+ 9(outColor): 8(ptr) Variable Output
+ 10: 6(float) Constant 0
+ 11: 7(fvec4) ConstantComposite 10 10 10 10
+ 12: TypeAccelerationStructureKHR
+ 13: TypePointer UniformConstant 12
+ 14(topLevelAS): 13(ptr) Variable UniformConstant
+ 4(main): 2 Function None 3
+ 5: Label
+ Store 9(outColor) 11
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.ext.AnyHitShader.rahit.out b/Test/baseResults/spv.ext.AnyHitShader.rahit.out
index 39e43a7..7bcf812 100644
--- a/Test/baseResults/spv.ext.AnyHitShader.rahit.out
+++ b/Test/baseResults/spv.ext.AnyHitShader.rahit.out
@@ -1,15 +1,17 @@
spv.ext.AnyHitShader.rahit
// Module Version 10400
// Generated by (magic number): 8000a
-// Id's are bound by 94
+// Id's are bound by 107
- Capability RayTracingProvisionalKHR
+ Capability GroupNonUniform
+ Capability RayTracingKHR
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint AnyHitKHR 4 "main" 11 14 20 23 26 33 36 39 42 47 50 53 58 64 67 70 76 80 84
+ EntryPoint AnyHitKHR 4 "main" 11 14 20 23 26 33 36 39 42 47 50 53 58 64 67 70 76 80 84 98
Source GLSL 460
SourceExtension "GL_EXT_ray_tracing"
+ SourceExtension "GL_KHR_shader_subgroup_basic"
Name 4 "main"
Name 9 "v0"
Name 11 "gl_LaunchIDEXT"
@@ -48,6 +50,7 @@
Name 79 "v17"
Name 80 "gl_WorldToObject3x4EXT"
Name 84 "incomingPayload"
+ Name 98 "gl_SubgroupSize"
Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
Decorate 14(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
Decorate 20(gl_PrimitiveID) BuiltIn PrimitiveId
@@ -59,7 +62,7 @@
Decorate 42(gl_ObjectRayDirectionEXT) BuiltIn ObjectRayDirectionKHR
Decorate 47(gl_RayTminEXT) BuiltIn RayTminKHR
Decorate 50(gl_RayTmaxEXT) BuiltIn RayTmaxKHR
- Decorate 53(gl_HitTEXT) BuiltIn HitTKHR
+ Decorate 53(gl_HitTEXT) BuiltIn RayTmaxKHR
Decorate 58(gl_HitKindEXT) BuiltIn HitKindKHR
Decorate 64(gl_ObjectToWorldEXT) BuiltIn ObjectToWorldKHR
Decorate 67(gl_WorldToObjectEXT) BuiltIn WorldToObjectKHR
@@ -67,6 +70,9 @@
Decorate 76(gl_ObjectToWorld3x4EXT) BuiltIn ObjectToWorldKHR
Decorate 80(gl_WorldToObject3x4EXT) BuiltIn WorldToObjectKHR
Decorate 84(incomingPayload) Location 1
+ Decorate 98(gl_SubgroupSize) RelaxedPrecision
+ Decorate 98(gl_SubgroupSize) BuiltIn SubgroupSize
+ Decorate 99 RelaxedPrecision
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@@ -114,6 +120,9 @@
86: 72(fvec4) ConstantComposite 85 85 85 85
88: 16(int) Constant 1
89: TypeBool
+ 94: 6(int) Constant 0
+98(gl_SubgroupSize): 57(ptr) Variable Input
+ 101: TypePointer IncomingRayPayloadKHR 28(float)
4(main): 2 Function None 3
5: Label
9(v0): 8(ptr) Variable Function
@@ -176,13 +185,16 @@
87: 16(int) Load 18(v2)
90: 89(bool) IEqual 87 88
SelectionMerge 92 None
- BranchConditional 90 91 93
+ BranchConditional 90 91 92
91: Label
IgnoreIntersectionKHR
- Branch 92
- 93: Label
- TerminateRayKHR
- Branch 92
92: Label
- Return
+ 99: 6(int) Load 98(gl_SubgroupSize)
+ 100: 28(float) ConvertUToF 99
+ 102: 101(ptr) AccessChain 84(incomingPayload) 94
+ 103: 28(float) Load 102
+ 104: 28(float) FAdd 103 100
+ 105: 101(ptr) AccessChain 84(incomingPayload) 94
+ Store 105 104
+ TerminateRayKHR
FunctionEnd
diff --git a/Test/baseResults/spv.ext.ClosestHitShader.rchit.out b/Test/baseResults/spv.ext.ClosestHitShader.rchit.out
index 7077ea4..40903e6 100644
--- a/Test/baseResults/spv.ext.ClosestHitShader.rchit.out
+++ b/Test/baseResults/spv.ext.ClosestHitShader.rchit.out
@@ -3,7 +3,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 101
- Capability RayTracingProvisionalKHR
+ Capability RayTracingKHR
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
@@ -48,8 +48,8 @@
Name 79 "v17"
Name 80 "gl_WorldToObject3x4EXT"
Name 85 "accEXT"
- Name 98 "localPayload"
- Name 100 "incomingPayload"
+ Name 98 "incomingPayload"
+ Name 100 "localPayload"
Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
Decorate 14(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
Decorate 20(gl_PrimitiveID) BuiltIn PrimitiveId
@@ -61,7 +61,7 @@
Decorate 42(gl_ObjectRayDirectionEXT) BuiltIn ObjectRayDirectionKHR
Decorate 47(gl_RayTminEXT) BuiltIn RayTminKHR
Decorate 50(gl_RayTmaxEXT) BuiltIn RayTmaxKHR
- Decorate 53(gl_HitTEXT) BuiltIn HitTKHR
+ Decorate 53(gl_HitTEXT) BuiltIn RayTmaxKHR
Decorate 58(gl_HitKindEXT) BuiltIn HitKindKHR
Decorate 64(gl_ObjectToWorldEXT) BuiltIn ObjectToWorldKHR
Decorate 67(gl_WorldToObjectEXT) BuiltIn WorldToObjectKHR
@@ -70,8 +70,8 @@
Decorate 80(gl_WorldToObject3x4EXT) BuiltIn WorldToObjectKHR
Decorate 85(accEXT) DescriptorSet 0
Decorate 85(accEXT) Binding 0
- Decorate 98(localPayload) Location 0
- Decorate 100(incomingPayload) Location 1
+ Decorate 98(incomingPayload) Location 1
+ Decorate 100(localPayload) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@@ -126,10 +126,10 @@
94: 29(fvec3) ConstantComposite 93 93 93
95: 28(float) Constant 1061158912
96: 16(int) Constant 1
- 97: TypePointer RayPayloadKHR 72(fvec4)
-98(localPayload): 97(ptr) Variable RayPayloadKHR
- 99: TypePointer IncomingRayPayloadKHR 72(fvec4)
-100(incomingPayload): 99(ptr) Variable IncomingRayPayloadKHR
+ 97: TypePointer IncomingRayPayloadKHR 72(fvec4)
+98(incomingPayload): 97(ptr) Variable IncomingRayPayloadKHR
+ 99: TypePointer RayPayloadKHR 72(fvec4)
+100(localPayload): 99(ptr) Variable RayPayloadKHR
4(main): 2 Function None 3
5: Label
9(v0): 8(ptr) Variable Function
@@ -189,6 +189,6 @@
82: 73 Transpose 81
Store 79(v17) 82
86: 83 Load 85(accEXT)
- TraceRayKHR 86 87 88 89 90 87 92 91 94 95 96
+ TraceRayKHR 86 87 88 89 90 87 92 91 94 95 98(incomingPayload)
Return
FunctionEnd
diff --git a/Test/baseResults/spv.ext.ClosestHitShader_Errors.rchit.out b/Test/baseResults/spv.ext.ClosestHitShader_Errors.rchit.out
index 6c87d1c..9f945a2 100644
--- a/Test/baseResults/spv.ext.ClosestHitShader_Errors.rchit.out
+++ b/Test/baseResults/spv.ext.ClosestHitShader_Errors.rchit.out
@@ -1,10 +1,12 @@
spv.ext.ClosestHitShader_Errors.rchit
-ERROR: 0:8: 'assign' : l-value required "payload" (cannot modify hitAttributeNV in this stage)
-ERROR: 0:9: 'reportIntersectionEXT' : no matching overloaded function found
-ERROR: 0:10: 'terminateRayEXT' : no matching overloaded function found
-ERROR: 0:11: 'ignoreIntersectionEXT' : no matching overloaded function found
-ERROR: 0:12: 'gl_RayFlagsSkipAABBEXT' : required extension not requested: GL_EXT_ray_flags_primitive_culling
-ERROR: 5 compilation errors. No code generated.
+ERROR: 0:6: 'location' : overlapping use of location 2
+ERROR: 0:9: 'assign' : l-value required "payload" (cannot modify hitAttributeNV in this stage)
+ERROR: 0:10: 'reportIntersectionEXT' : no matching overloaded function found
+ERROR: 0:11: 'terminateRayEXT' : not supported in this stage: closest-hit
+ERROR: 0:12: 'ignoreIntersectionEXT' : not supported in this stage: closest-hit
+ERROR: 0:13: 'gl_RayFlagsSkipAABBEXT' : required extension not requested: GL_EXT_ray_flags_primitive_culling
+ERROR: 0:14: 'no rayPayloadEXT/rayPayloadInEXT declared' : with layout(location = 0)
+ERROR: 7 compilation errors. No code generated.
SPIR-V is not generated for failed compile or link
diff --git a/Test/baseResults/spv.ext.ClosestHitShader_Subgroup.rchit.out b/Test/baseResults/spv.ext.ClosestHitShader_Subgroup.rchit.out
new file mode 100644
index 0000000..14ec09b
--- /dev/null
+++ b/Test/baseResults/spv.ext.ClosestHitShader_Subgroup.rchit.out
@@ -0,0 +1,114 @@
+spv.ext.ClosestHitShader_Subgroup.rchit
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 67
+
+ Capability Int64
+ Capability GroupNonUniform
+ Capability GroupNonUniformBallot
+ Capability SubgroupBallotKHR
+ Capability RayTracingKHR
+ Capability VulkanMemoryModelKHR
+ Capability ShaderSMBuiltinsNV
+ Extension "SPV_KHR_ray_tracing"
+ Extension "SPV_KHR_shader_ballot"
+ Extension "SPV_KHR_vulkan_memory_model"
+ Extension "SPV_NV_shader_sm_builtins"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical VulkanKHR
+ EntryPoint ClosestHitKHR 4 "main" 8 26 28 34 43 48 53 61
+ Source GLSL 460
+ SourceExtension "GL_ARB_shader_ballot"
+ SourceExtension "GL_EXT_ray_tracing"
+ SourceExtension "GL_KHR_shader_subgroup_ballot"
+ SourceExtension "GL_KHR_shader_subgroup_basic"
+ SourceExtension "GL_NV_shader_sm_builtins"
+ Name 4 "main"
+ Name 8 "accEXT"
+ Name 26 "incomingPayload"
+ Name 28 "gl_SubgroupInvocationID"
+ Name 34 "gl_SubGroupGeMaskARB"
+ Name 43 "gl_SubgroupGtMask"
+ Name 48 "gl_SubgroupLeMask"
+ Name 53 "gl_SubGroupLtMaskARB"
+ Name 61 "gl_SMIDNV"
+ Decorate 8(accEXT) DescriptorSet 0
+ Decorate 8(accEXT) Binding 0
+ Decorate 26(incomingPayload) Location 1
+ Decorate 28(gl_SubgroupInvocationID) RelaxedPrecision
+ Decorate 28(gl_SubgroupInvocationID) BuiltIn SubgroupLocalInvocationId
+ Decorate 29 RelaxedPrecision
+ Decorate 34(gl_SubGroupGeMaskARB) BuiltIn SubgroupGeMaskKHR
+ Decorate 43(gl_SubgroupGtMask) BuiltIn SubgroupGtMaskKHR
+ Decorate 48(gl_SubgroupLeMask) BuiltIn SubgroupLeMaskKHR
+ Decorate 53(gl_SubGroupLtMaskARB) BuiltIn SubgroupLtMaskKHR
+ Decorate 61(gl_SMIDNV) BuiltIn SMIDNV
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeAccelerationStructureKHR
+ 7: TypePointer UniformConstant 6
+ 8(accEXT): 7(ptr) Variable UniformConstant
+ 10: TypeInt 32 0
+ 11: 10(int) Constant 0
+ 12: 10(int) Constant 1
+ 13: 10(int) Constant 2
+ 14: 10(int) Constant 3
+ 15: TypeFloat 32
+ 16: TypeVector 15(float) 3
+ 17: 15(float) Constant 1056964608
+ 18: 16(fvec3) ConstantComposite 17 17 17
+ 19: 15(float) Constant 1065353216
+ 20: 16(fvec3) ConstantComposite 19 19 19
+ 21: 15(float) Constant 1061158912
+ 22: TypeInt 32 1
+ 23: 22(int) Constant 1
+ 24: TypeVector 15(float) 4
+ 25: TypePointer IncomingRayPayloadKHR 24(fvec4)
+26(incomingPayload): 25(ptr) Variable IncomingRayPayloadKHR
+ 27: TypePointer Input 10(int)
+28(gl_SubgroupInvocationID): 27(ptr) Variable Input
+ 31: TypeVector 10(int) 4
+ 32: TypeInt 64 0
+ 33: TypePointer Input 31(ivec4)
+34(gl_SubGroupGeMaskARB): 33(ptr) Variable Input
+ 38: TypeVector 10(int) 2
+43(gl_SubgroupGtMask): 33(ptr) Variable Input
+48(gl_SubgroupLeMask): 33(ptr) Variable Input
+53(gl_SubGroupLtMaskARB): 33(ptr) Variable Input
+ 61(gl_SMIDNV): 27(ptr) Variable Input
+ 65: TypePointer IncomingRayPayloadKHR 15(float)
+ 4(main): 2 Function None 3
+ 5: Label
+ 9: 6 Load 8(accEXT)
+ TraceRayKHR 9 11 12 13 14 11 18 17 20 21 26(incomingPayload)
+ 29: 10(int) Load 28(gl_SubgroupInvocationID) Volatile
+ 30: 15(float) ConvertUToF 29
+ 35: 31(ivec4) Load 34(gl_SubGroupGeMaskARB)
+ 36: 10(int) CompositeExtract 35 0
+ 37: 10(int) CompositeExtract 35 1
+ 39: 38(ivec2) CompositeConstruct 36 37
+ 40: 32(int64_t) Bitcast 39
+ 41: 15(float) ConvertUToF 40
+ 42: 15(float) FAdd 30 41
+ 44: 31(ivec4) Load 43(gl_SubgroupGtMask) Volatile
+ 45: 24(fvec4) ConvertUToF 44
+ 46: 15(float) CompositeExtract 45 0
+ 47: 15(float) FAdd 42 46
+ 49: 31(ivec4) Load 48(gl_SubgroupLeMask) Volatile
+ 50: 24(fvec4) ConvertUToF 49
+ 51: 15(float) CompositeExtract 50 0
+ 52: 15(float) FAdd 47 51
+ 54: 31(ivec4) Load 53(gl_SubGroupLtMaskARB)
+ 55: 10(int) CompositeExtract 54 0
+ 56: 10(int) CompositeExtract 54 1
+ 57: 38(ivec2) CompositeConstruct 55 56
+ 58: 32(int64_t) Bitcast 57
+ 59: 15(float) ConvertUToF 58
+ 60: 15(float) FAdd 52 59
+ 62: 10(int) Load 61(gl_SMIDNV) Volatile
+ 63: 15(float) ConvertUToF 62
+ 64: 15(float) FAdd 60 63
+ 66: 65(ptr) AccessChain 26(incomingPayload) 11
+ Store 66 64
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.ext.IntersectShader.rint.out b/Test/baseResults/spv.ext.IntersectShader.rint.out
index 4a4a34a..2d389a0 100644
--- a/Test/baseResults/spv.ext.IntersectShader.rint.out
+++ b/Test/baseResults/spv.ext.IntersectShader.rint.out
@@ -3,7 +3,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 81
- Capability RayTracingProvisionalKHR
+ Capability RayTracingKHR
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
@@ -53,6 +53,8 @@
Decorate 42(gl_ObjectRayDirectionEXT) BuiltIn ObjectRayDirectionKHR
Decorate 47(gl_RayTminEXT) BuiltIn RayTminKHR
Decorate 50(gl_RayTmaxEXT) BuiltIn RayTmaxKHR
+ Decorate 50(gl_RayTmaxEXT) Volatile
+ Decorate 50(gl_RayTmaxEXT) Coherent
Decorate 56(gl_ObjectToWorldEXT) BuiltIn ObjectToWorldKHR
Decorate 59(gl_WorldToObjectEXT) BuiltIn WorldToObjectKHR
Decorate 65(gl_ObjectToWorld3x4EXT) BuiltIn ObjectToWorldKHR
diff --git a/Test/baseResults/spv.ext.MissShader.rmiss.out b/Test/baseResults/spv.ext.MissShader.rmiss.out
index 544901b..bc29ccc 100644
--- a/Test/baseResults/spv.ext.MissShader.rmiss.out
+++ b/Test/baseResults/spv.ext.MissShader.rmiss.out
@@ -1,15 +1,25 @@
spv.ext.MissShader.rmiss
// Module Version 10400
// Generated by (magic number): 8000a
-// Id's are bound by 54
+// Id's are bound by 71
- Capability RayTracingProvisionalKHR
+ Capability GroupNonUniform
+ Capability GroupNonUniformBallot
+ Capability SubgroupBallotKHR
+ Capability RayTracingKHR
+ Capability ShaderSMBuiltinsNV
Extension "SPV_KHR_ray_tracing"
+ Extension "SPV_KHR_shader_ballot"
+ Extension "SPV_NV_shader_sm_builtins"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint MissKHR 4 "main" 11 14 21 24 29 32 36 51 53
+ EntryPoint MissKHR 4 "main" 11 14 21 24 29 32 36 51 53 58 63 70
Source GLSL 460
+ SourceExtension "GL_ARB_shader_ballot"
SourceExtension "GL_EXT_ray_tracing"
+ SourceExtension "GL_KHR_shader_subgroup_ballot"
+ SourceExtension "GL_KHR_shader_subgroup_basic"
+ SourceExtension "GL_NV_shader_sm_builtins"
Name 4 "main"
Name 9 "v0"
Name 11 "gl_LaunchIDEXT"
@@ -24,8 +34,11 @@
Name 31 "v5"
Name 32 "gl_RayTmaxEXT"
Name 36 "accEXT"
- Name 51 "localPayload"
- Name 53 "incomingPayload"
+ Name 51 "incomingPayload"
+ Name 53 "gl_SubGroupSizeARB"
+ Name 58 "gl_SubgroupEqMask"
+ Name 63 "gl_WarpIDNV"
+ Name 70 "localPayload"
Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
Decorate 14(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
Decorate 21(gl_WorldRayOriginEXT) BuiltIn WorldRayOriginKHR
@@ -34,8 +47,17 @@
Decorate 32(gl_RayTmaxEXT) BuiltIn RayTmaxKHR
Decorate 36(accEXT) DescriptorSet 0
Decorate 36(accEXT) Binding 0
- Decorate 51(localPayload) Location 0
- Decorate 53(incomingPayload) Location 1
+ Decorate 51(incomingPayload) Location 1
+ Decorate 53(gl_SubGroupSizeARB) BuiltIn SubgroupSize
+ Decorate 53(gl_SubGroupSizeARB) Volatile
+ Decorate 53(gl_SubGroupSizeARB) Coherent
+ Decorate 58(gl_SubgroupEqMask) BuiltIn SubgroupEqMaskKHR
+ Decorate 58(gl_SubgroupEqMask) Volatile
+ Decorate 58(gl_SubgroupEqMask) Coherent
+ Decorate 63(gl_WarpIDNV) BuiltIn WarpIDNV
+ Decorate 63(gl_WarpIDNV) Volatile
+ Decorate 63(gl_WarpIDNV) Coherent
+ Decorate 70(localPayload) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@@ -69,10 +91,17 @@
47: TypeInt 32 1
48: 47(int) Constant 1
49: TypeVector 16(float) 4
- 50: TypePointer RayPayloadKHR 49(fvec4)
-51(localPayload): 50(ptr) Variable RayPayloadKHR
- 52: TypePointer IncomingRayPayloadKHR 49(fvec4)
-53(incomingPayload): 52(ptr) Variable IncomingRayPayloadKHR
+ 50: TypePointer IncomingRayPayloadKHR 49(fvec4)
+51(incomingPayload): 50(ptr) Variable IncomingRayPayloadKHR
+ 52: TypePointer Input 6(int)
+53(gl_SubGroupSizeARB): 52(ptr) Variable Input
+ 56: TypeVector 6(int) 4
+ 57: TypePointer Input 56(ivec4)
+58(gl_SubgroupEqMask): 57(ptr) Variable Input
+ 63(gl_WarpIDNV): 52(ptr) Variable Input
+ 67: TypePointer IncomingRayPayloadKHR 16(float)
+ 69: TypePointer RayPayloadKHR 49(fvec4)
+70(localPayload): 69(ptr) Variable RayPayloadKHR
4(main): 2 Function None 3
5: Label
9(v0): 8(ptr) Variable Function
@@ -94,6 +123,17 @@
33: 16(float) Load 32(gl_RayTmaxEXT)
Store 31(v5) 33
37: 34 Load 36(accEXT)
- TraceRayKHR 37 38 39 40 41 38 43 42 45 46 48
+ TraceRayKHR 37 38 39 40 41 38 43 42 45 46 51(incomingPayload)
+ 54: 6(int) Load 53(gl_SubGroupSizeARB)
+ 55: 16(float) ConvertUToF 54
+ 59: 56(ivec4) Load 58(gl_SubgroupEqMask)
+ 60: 49(fvec4) ConvertUToF 59
+ 61: 16(float) CompositeExtract 60 0
+ 62: 16(float) FAdd 55 61
+ 64: 6(int) Load 63(gl_WarpIDNV)
+ 65: 16(float) ConvertUToF 64
+ 66: 16(float) FAdd 62 65
+ 68: 67(ptr) AccessChain 51(incomingPayload) 38
+ Store 68 66
Return
FunctionEnd
diff --git a/Test/baseResults/spv.ext.MissShader_Errors.rmiss.out b/Test/baseResults/spv.ext.MissShader_Errors.rmiss.out
index 929a2a7..50d3c83 100644
--- a/Test/baseResults/spv.ext.MissShader_Errors.rmiss.out
+++ b/Test/baseResults/spv.ext.MissShader_Errors.rmiss.out
@@ -13,8 +13,8 @@
ERROR: 0:11: 'gl_HitTEXT' : undeclared identifier
ERROR: 0:12: 'gl_HitKindEXT' : undeclared identifier
ERROR: 0:13: 'reportIntersectionEXT' : no matching overloaded function found
-ERROR: 0:14: 'ignoreIntersectionEXT' : no matching overloaded function found
-ERROR: 0:15: 'terminateRayEXT' : no matching overloaded function found
+ERROR: 0:14: 'ignoreIntersectionEXT' : not supported in this stage: miss
+ERROR: 0:15: 'terminateRayEXT' : not supported in this stage: miss
ERROR: 16 compilation errors. No code generated.
diff --git a/Test/baseResults/spv.ext.RayCallable.rcall.out b/Test/baseResults/spv.ext.RayCallable.rcall.out
index e87b5fa..d429116 100644
--- a/Test/baseResults/spv.ext.RayCallable.rcall.out
+++ b/Test/baseResults/spv.ext.RayCallable.rcall.out
@@ -3,7 +3,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 30
- Capability RayTracingProvisionalKHR
+ Capability RayTracingKHR
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
@@ -55,6 +55,6 @@
Store 13(size) 15
23: 22(ptr) AccessChain 18 20
Store 23 21
- ExecuteCallableKHR 24 25
+ ExecuteCallableKHR 24 18
Return
FunctionEnd
diff --git a/Test/baseResults/spv.ext.RayCallable_Errors.rcall.out b/Test/baseResults/spv.ext.RayCallable_Errors.rcall.out
index 4699342..e623874 100644
--- a/Test/baseResults/spv.ext.RayCallable_Errors.rcall.out
+++ b/Test/baseResults/spv.ext.RayCallable_Errors.rcall.out
@@ -2,34 +2,36 @@
ERROR: 0:3: 'hitAttributeEXT' : not supported in this stage: callable
ERROR: 0:4: 'rayPayloadEXT' : not supported in this stage: callable
ERROR: 0:5: 'rayPayloadInEXT' : not supported in this stage: callable
-ERROR: 0:9: 'gl_PrimitiveID' : undeclared identifier
-ERROR: 0:9: '=' : cannot convert from ' temp float' to ' temp highp int'
-ERROR: 0:10: 'gl_InstanceID' : undeclared identifier (Did you mean gl_InstanceIndex?)
+ERROR: 0:7: 'location' : overlapping use of location 0
+ERROR: 0:10: 'gl_PrimitiveID' : undeclared identifier
ERROR: 0:10: '=' : cannot convert from ' temp float' to ' temp highp int'
-ERROR: 0:11: 'gl_InstanceCustomIndexEXT' : undeclared identifier
+ERROR: 0:11: 'gl_InstanceID' : undeclared identifier (Did you mean gl_InstanceIndex?)
ERROR: 0:11: '=' : cannot convert from ' temp float' to ' temp highp int'
-ERROR: 0:12: 'gl_WorldRayOriginEXT' : undeclared identifier
-ERROR: 0:12: '=' : cannot convert from ' temp float' to ' temp highp 3-component vector of float'
-ERROR: 0:13: 'gl_WorldRayDirectionEXT' : undeclared identifier
+ERROR: 0:12: 'gl_InstanceCustomIndexEXT' : undeclared identifier
+ERROR: 0:12: '=' : cannot convert from ' temp float' to ' temp highp int'
+ERROR: 0:13: 'gl_WorldRayOriginEXT' : undeclared identifier
ERROR: 0:13: '=' : cannot convert from ' temp float' to ' temp highp 3-component vector of float'
-ERROR: 0:14: 'gl_ObjectRayOriginEXT' : undeclared identifier
+ERROR: 0:14: 'gl_WorldRayDirectionEXT' : undeclared identifier
ERROR: 0:14: '=' : cannot convert from ' temp float' to ' temp highp 3-component vector of float'
-ERROR: 0:15: 'gl_ObjectRayDirectionEXT' : undeclared identifier
+ERROR: 0:15: 'gl_ObjectRayOriginEXT' : undeclared identifier
ERROR: 0:15: '=' : cannot convert from ' temp float' to ' temp highp 3-component vector of float'
-ERROR: 0:16: 'gl_RayTminEXT' : undeclared identifier
-ERROR: 0:17: 'gl_RayTmaxEXT' : undeclared identifier
-ERROR: 0:18: 'gl_ObjectToWorldEXT' : undeclared identifier
-ERROR: 0:18: '=' : cannot convert from ' temp float' to ' temp highp 4X3 matrix of float'
-ERROR: 0:19: 'gl_WorldToObjectEXT' : undeclared identifier
+ERROR: 0:16: 'gl_ObjectRayDirectionEXT' : undeclared identifier
+ERROR: 0:16: '=' : cannot convert from ' temp float' to ' temp highp 3-component vector of float'
+ERROR: 0:17: 'gl_RayTminEXT' : undeclared identifier
+ERROR: 0:18: 'gl_RayTmaxEXT' : undeclared identifier
+ERROR: 0:19: 'gl_ObjectToWorldEXT' : undeclared identifier
ERROR: 0:19: '=' : cannot convert from ' temp float' to ' temp highp 4X3 matrix of float'
-ERROR: 0:20: 'gl_HitTEXT' : undeclared identifier
-ERROR: 0:21: 'gl_HitKindEXT' : undeclared identifier
-ERROR: 0:22: 'gl_IncomingRayFlagsEXT' : undeclared identifier
-ERROR: 0:22: '=' : cannot convert from ' temp float' to ' temp highp uint'
-ERROR: 0:23: 'reportIntersectionEXT' : no matching overloaded function found
-ERROR: 0:24: 'ignoreIntersectionEXT' : no matching overloaded function found
-ERROR: 0:25: 'terminateRayEXT' : no matching overloaded function found
-ERROR: 30 compilation errors. No code generated.
+ERROR: 0:20: 'gl_WorldToObjectEXT' : undeclared identifier
+ERROR: 0:20: '=' : cannot convert from ' temp float' to ' temp highp 4X3 matrix of float'
+ERROR: 0:21: 'gl_HitTEXT' : undeclared identifier
+ERROR: 0:22: 'gl_HitKindEXT' : undeclared identifier
+ERROR: 0:23: 'gl_IncomingRayFlagsEXT' : undeclared identifier
+ERROR: 0:23: '=' : cannot convert from ' temp float' to ' temp highp uint'
+ERROR: 0:24: 'reportIntersectionEXT' : no matching overloaded function found
+ERROR: 0:25: 'ignoreIntersectionEXT' : not supported in this stage: callable
+ERROR: 0:26: 'terminateRayEXT' : not supported in this stage: callable
+ERROR: 0:27: 'no callableDataEXT/callableDataInEXT declared' : with layout(location = 1)
+ERROR: 32 compilation errors. No code generated.
SPIR-V is not generated for failed compile or link
diff --git a/Test/baseResults/spv.ext.RayConstants.rgen.out b/Test/baseResults/spv.ext.RayConstants.rgen.out
index 5d7079a..afd5083 100644
--- a/Test/baseResults/spv.ext.RayConstants.rgen.out
+++ b/Test/baseResults/spv.ext.RayConstants.rgen.out
@@ -3,7 +3,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 27
- Capability RayTracingProvisionalKHR
+ Capability RayTracingKHR
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
@@ -15,7 +15,7 @@
Name 26 "payload"
Decorate 8(accEXT) DescriptorSet 0
Decorate 8(accEXT) Binding 0
- Decorate 26(payload) Location 0
+ Decorate 26(payload) Location 1
2: TypeVoid
3: TypeFunction 2
6: TypeAccelerationStructureKHR
@@ -41,6 +41,6 @@
4(main): 2 Function None 3
5: Label
9: 6 Load 8(accEXT)
- TraceRayKHR 9 11 12 13 13 12 17 18 20 21 23
+ TraceRayKHR 9 11 12 13 13 12 17 18 20 21 26(payload)
Return
FunctionEnd
diff --git a/Test/baseResults/spv.ext.RayGenSBTlayout.rgen.out b/Test/baseResults/spv.ext.RayGenSBTlayout.rgen.out
new file mode 100644
index 0000000..60b5e93
--- /dev/null
+++ b/Test/baseResults/spv.ext.RayGenSBTlayout.rgen.out
@@ -0,0 +1,134 @@
+spv.ext.RayGenSBTlayout.rgen
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 74
+
+ Capability Int64
+ Capability RayTracingKHR
+ Extension "SPV_KHR_ray_tracing"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint RayGenerationKHR 4 "main" 11 21 38 60
+ Source GLSL 460
+ SourceExtension "GL_ARB_gpu_shader_int64"
+ SourceExtension "GL_EXT_ray_tracing"
+ Name 4 "main"
+ Name 8 "lx"
+ Name 11 "gl_LaunchIDEXT"
+ Name 16 "ly"
+ Name 20 "sx"
+ Name 21 "gl_LaunchSizeEXT"
+ Name 24 "sy"
+ Name 36 "block"
+ MemberName 36(block) 0 "dir"
+ MemberName 36(block) 1 "origin"
+ MemberName 36(block) 2 "i"
+ MemberName 36(block) 3 "aHandle32"
+ MemberName 36(block) 4 "aHandle64"
+ MemberName 36(block) 5 "arr2"
+ MemberName 36(block) 6 "a"
+ MemberName 36(block) 7 "arr3"
+ MemberName 36(block) 8 "packme"
+ MemberName 36(block) 9 "b"
+ MemberName 36(block) 10 "c"
+ Name 38 ""
+ Name 60 "payload"
+ Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
+ Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
+ Decorate 34 ArrayStride 8
+ Decorate 35 ArrayStride 16
+ MemberDecorate 36(block) 0 Offset 0
+ MemberDecorate 36(block) 1 Offset 16
+ MemberDecorate 36(block) 2 Offset 28
+ MemberDecorate 36(block) 3 Offset 32
+ MemberDecorate 36(block) 4 Offset 40
+ MemberDecorate 36(block) 5 Offset 48
+ MemberDecorate 36(block) 6 Offset 64
+ MemberDecorate 36(block) 7 Offset 80
+ MemberDecorate 36(block) 8 Offset 112
+ MemberDecorate 36(block) 9 Offset 120
+ MemberDecorate 36(block) 10 Offset 128
+ Decorate 36(block) Block
+ Decorate 38 DescriptorSet 0
+ Decorate 38 Binding 0
+ Decorate 60(payload) Location 1
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 0
+ 7: TypePointer Function 6(int)
+ 9: TypeVector 6(int) 3
+ 10: TypePointer Input 9(ivec3)
+11(gl_LaunchIDEXT): 10(ptr) Variable Input
+ 12: 6(int) Constant 0
+ 13: TypePointer Input 6(int)
+ 17: 6(int) Constant 1
+21(gl_LaunchSizeEXT): 10(ptr) Variable Input
+ 27: TypeFloat 32
+ 28: TypeVector 27(float) 3
+ 29: TypeInt 32 1
+ 30: TypeVector 6(int) 2
+ 31: TypeInt 64 0
+ 32: TypeVector 27(float) 2
+ 33: 6(int) Constant 2
+ 34: TypeArray 32(fvec2) 33
+ 35: TypeArray 28(fvec3) 33
+ 36(block): TypeStruct 28(fvec3) 28(fvec3) 29(int) 30(ivec2) 31(int64_t) 34 27(float) 35 27(float) 32(fvec2) 27(float)
+ 37: TypePointer ShaderRecordBufferKHR 36(block)
+ 38: 37(ptr) Variable ShaderRecordBufferKHR
+ 39: 29(int) Constant 3
+ 40: TypePointer ShaderRecordBufferKHR 30(ivec2)
+ 43: TypeAccelerationStructureKHR
+ 49: 29(int) Constant 1
+ 50: TypePointer ShaderRecordBufferKHR 28(fvec3)
+ 53: 27(float) Constant 1056964608
+ 54: 29(int) Constant 0
+ 57: 27(float) Constant 1061158912
+ 58: TypeVector 27(float) 4
+ 59: TypePointer RayPayloadKHR 58(fvec4)
+ 60(payload): 59(ptr) Variable RayPayloadKHR
+ 61: 29(int) Constant 4
+ 62: TypePointer ShaderRecordBufferKHR 31(int64_t)
+ 4(main): 2 Function None 3
+ 5: Label
+ 8(lx): 7(ptr) Variable Function
+ 16(ly): 7(ptr) Variable Function
+ 20(sx): 7(ptr) Variable Function
+ 24(sy): 7(ptr) Variable Function
+ 14: 13(ptr) AccessChain 11(gl_LaunchIDEXT) 12
+ 15: 6(int) Load 14
+ Store 8(lx) 15
+ 18: 13(ptr) AccessChain 11(gl_LaunchIDEXT) 17
+ 19: 6(int) Load 18
+ Store 16(ly) 19
+ 22: 13(ptr) AccessChain 21(gl_LaunchSizeEXT) 12
+ 23: 6(int) Load 22
+ Store 20(sx) 23
+ 25: 13(ptr) AccessChain 21(gl_LaunchSizeEXT) 17
+ 26: 6(int) Load 25
+ Store 24(sy) 26
+ 41: 40(ptr) AccessChain 38 39
+ 42: 30(ivec2) Load 41
+ 44: 43 ConvertUToAccelerationStructureKHR 42
+ 45: 6(int) Load 8(lx)
+ 46: 6(int) Load 16(ly)
+ 47: 6(int) Load 20(sx)
+ 48: 6(int) Load 24(sy)
+ 51: 50(ptr) AccessChain 38 49
+ 52: 28(fvec3) Load 51
+ 55: 50(ptr) AccessChain 38 54
+ 56: 28(fvec3) Load 55
+ TraceRayKHR 44 45 46 47 48 12 52 53 56 57 60(payload)
+ 63: 62(ptr) AccessChain 38 61
+ 64: 31(int64_t) Load 63
+ 65: 43 ConvertUToAccelerationStructureKHR 64
+ 66: 6(int) Load 8(lx)
+ 67: 6(int) Load 16(ly)
+ 68: 6(int) Load 20(sx)
+ 69: 6(int) Load 24(sy)
+ 70: 50(ptr) AccessChain 38 49
+ 71: 28(fvec3) Load 70
+ 72: 50(ptr) AccessChain 38 54
+ 73: 28(fvec3) Load 72
+ TraceRayKHR 65 66 67 68 69 12 71 53 73 57 60(payload)
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.ext.RayGenSBTlayout140.rgen.out b/Test/baseResults/spv.ext.RayGenSBTlayout140.rgen.out
new file mode 100644
index 0000000..cc175f7
--- /dev/null
+++ b/Test/baseResults/spv.ext.RayGenSBTlayout140.rgen.out
@@ -0,0 +1,134 @@
+spv.ext.RayGenSBTlayout140.rgen
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 74
+
+ Capability Int64
+ Capability RayTracingKHR
+ Extension "SPV_KHR_ray_tracing"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint RayGenerationKHR 4 "main" 11 21 38 60
+ Source GLSL 460
+ SourceExtension "GL_ARB_gpu_shader_int64"
+ SourceExtension "GL_EXT_ray_tracing"
+ Name 4 "main"
+ Name 8 "lx"
+ Name 11 "gl_LaunchIDEXT"
+ Name 16 "ly"
+ Name 20 "sx"
+ Name 21 "gl_LaunchSizeEXT"
+ Name 24 "sy"
+ Name 36 "block"
+ MemberName 36(block) 0 "dir"
+ MemberName 36(block) 1 "origin"
+ MemberName 36(block) 2 "i"
+ MemberName 36(block) 3 "aHandle32"
+ MemberName 36(block) 4 "aHandle64"
+ MemberName 36(block) 5 "arr"
+ MemberName 36(block) 6 "a"
+ MemberName 36(block) 7 "arr3"
+ MemberName 36(block) 8 "packme"
+ MemberName 36(block) 9 "b"
+ MemberName 36(block) 10 "c"
+ Name 38 ""
+ Name 60 "payload"
+ Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
+ Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
+ Decorate 34 ArrayStride 16
+ Decorate 35 ArrayStride 16
+ MemberDecorate 36(block) 0 Offset 0
+ MemberDecorate 36(block) 1 Offset 16
+ MemberDecorate 36(block) 2 Offset 28
+ MemberDecorate 36(block) 3 Offset 32
+ MemberDecorate 36(block) 4 Offset 40
+ MemberDecorate 36(block) 5 Offset 48
+ MemberDecorate 36(block) 6 Offset 80
+ MemberDecorate 36(block) 7 Offset 96
+ MemberDecorate 36(block) 8 Offset 128
+ MemberDecorate 36(block) 9 Offset 136
+ MemberDecorate 36(block) 10 Offset 144
+ Decorate 36(block) Block
+ Decorate 38 DescriptorSet 0
+ Decorate 38 Binding 0
+ Decorate 60(payload) Location 1
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 0
+ 7: TypePointer Function 6(int)
+ 9: TypeVector 6(int) 3
+ 10: TypePointer Input 9(ivec3)
+11(gl_LaunchIDEXT): 10(ptr) Variable Input
+ 12: 6(int) Constant 0
+ 13: TypePointer Input 6(int)
+ 17: 6(int) Constant 1
+21(gl_LaunchSizeEXT): 10(ptr) Variable Input
+ 27: TypeFloat 32
+ 28: TypeVector 27(float) 3
+ 29: TypeInt 32 1
+ 30: TypeVector 6(int) 2
+ 31: TypeInt 64 0
+ 32: TypeVector 27(float) 2
+ 33: 6(int) Constant 2
+ 34: TypeArray 32(fvec2) 33
+ 35: TypeArray 28(fvec3) 33
+ 36(block): TypeStruct 28(fvec3) 28(fvec3) 29(int) 30(ivec2) 31(int64_t) 34 27(float) 35 27(float) 32(fvec2) 27(float)
+ 37: TypePointer ShaderRecordBufferKHR 36(block)
+ 38: 37(ptr) Variable ShaderRecordBufferKHR
+ 39: 29(int) Constant 3
+ 40: TypePointer ShaderRecordBufferKHR 30(ivec2)
+ 43: TypeAccelerationStructureKHR
+ 49: 29(int) Constant 1
+ 50: TypePointer ShaderRecordBufferKHR 28(fvec3)
+ 53: 27(float) Constant 1056964608
+ 54: 29(int) Constant 0
+ 57: 27(float) Constant 1061158912
+ 58: TypeVector 27(float) 4
+ 59: TypePointer RayPayloadKHR 58(fvec4)
+ 60(payload): 59(ptr) Variable RayPayloadKHR
+ 61: 29(int) Constant 4
+ 62: TypePointer ShaderRecordBufferKHR 31(int64_t)
+ 4(main): 2 Function None 3
+ 5: Label
+ 8(lx): 7(ptr) Variable Function
+ 16(ly): 7(ptr) Variable Function
+ 20(sx): 7(ptr) Variable Function
+ 24(sy): 7(ptr) Variable Function
+ 14: 13(ptr) AccessChain 11(gl_LaunchIDEXT) 12
+ 15: 6(int) Load 14
+ Store 8(lx) 15
+ 18: 13(ptr) AccessChain 11(gl_LaunchIDEXT) 17
+ 19: 6(int) Load 18
+ Store 16(ly) 19
+ 22: 13(ptr) AccessChain 21(gl_LaunchSizeEXT) 12
+ 23: 6(int) Load 22
+ Store 20(sx) 23
+ 25: 13(ptr) AccessChain 21(gl_LaunchSizeEXT) 17
+ 26: 6(int) Load 25
+ Store 24(sy) 26
+ 41: 40(ptr) AccessChain 38 39
+ 42: 30(ivec2) Load 41
+ 44: 43 ConvertUToAccelerationStructureKHR 42
+ 45: 6(int) Load 8(lx)
+ 46: 6(int) Load 16(ly)
+ 47: 6(int) Load 20(sx)
+ 48: 6(int) Load 24(sy)
+ 51: 50(ptr) AccessChain 38 49
+ 52: 28(fvec3) Load 51
+ 55: 50(ptr) AccessChain 38 54
+ 56: 28(fvec3) Load 55
+ TraceRayKHR 44 45 46 47 48 12 52 53 56 57 60(payload)
+ 63: 62(ptr) AccessChain 38 61
+ 64: 31(int64_t) Load 63
+ 65: 43 ConvertUToAccelerationStructureKHR 64
+ 66: 6(int) Load 8(lx)
+ 67: 6(int) Load 16(ly)
+ 68: 6(int) Load 20(sx)
+ 69: 6(int) Load 24(sy)
+ 70: 50(ptr) AccessChain 38 49
+ 71: 28(fvec3) Load 70
+ 72: 50(ptr) AccessChain 38 54
+ 73: 28(fvec3) Load 72
+ TraceRayKHR 65 66 67 68 69 12 71 53 73 57 60(payload)
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.ext.RayGenSBTlayout430.rgen.out b/Test/baseResults/spv.ext.RayGenSBTlayout430.rgen.out
new file mode 100644
index 0000000..afcfa9c
--- /dev/null
+++ b/Test/baseResults/spv.ext.RayGenSBTlayout430.rgen.out
@@ -0,0 +1,134 @@
+spv.ext.RayGenSBTlayout430.rgen
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 74
+
+ Capability Int64
+ Capability RayTracingKHR
+ Extension "SPV_KHR_ray_tracing"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint RayGenerationKHR 4 "main" 11 21 38 60
+ Source GLSL 460
+ SourceExtension "GL_ARB_gpu_shader_int64"
+ SourceExtension "GL_EXT_ray_tracing"
+ Name 4 "main"
+ Name 8 "lx"
+ Name 11 "gl_LaunchIDEXT"
+ Name 16 "ly"
+ Name 20 "sx"
+ Name 21 "gl_LaunchSizeEXT"
+ Name 24 "sy"
+ Name 36 "block"
+ MemberName 36(block) 0 "dir"
+ MemberName 36(block) 1 "origin"
+ MemberName 36(block) 2 "i"
+ MemberName 36(block) 3 "aHandle32"
+ MemberName 36(block) 4 "aHandle64"
+ MemberName 36(block) 5 "arr"
+ MemberName 36(block) 6 "a"
+ MemberName 36(block) 7 "arr3"
+ MemberName 36(block) 8 "packme"
+ MemberName 36(block) 9 "b"
+ MemberName 36(block) 10 "c"
+ Name 38 ""
+ Name 60 "payload"
+ Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
+ Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
+ Decorate 34 ArrayStride 8
+ Decorate 35 ArrayStride 16
+ MemberDecorate 36(block) 0 Offset 0
+ MemberDecorate 36(block) 1 Offset 16
+ MemberDecorate 36(block) 2 Offset 28
+ MemberDecorate 36(block) 3 Offset 32
+ MemberDecorate 36(block) 4 Offset 40
+ MemberDecorate 36(block) 5 Offset 48
+ MemberDecorate 36(block) 6 Offset 64
+ MemberDecorate 36(block) 7 Offset 80
+ MemberDecorate 36(block) 8 Offset 112
+ MemberDecorate 36(block) 9 Offset 120
+ MemberDecorate 36(block) 10 Offset 128
+ Decorate 36(block) Block
+ Decorate 38 DescriptorSet 0
+ Decorate 38 Binding 0
+ Decorate 60(payload) Location 1
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 0
+ 7: TypePointer Function 6(int)
+ 9: TypeVector 6(int) 3
+ 10: TypePointer Input 9(ivec3)
+11(gl_LaunchIDEXT): 10(ptr) Variable Input
+ 12: 6(int) Constant 0
+ 13: TypePointer Input 6(int)
+ 17: 6(int) Constant 1
+21(gl_LaunchSizeEXT): 10(ptr) Variable Input
+ 27: TypeFloat 32
+ 28: TypeVector 27(float) 3
+ 29: TypeInt 32 1
+ 30: TypeVector 6(int) 2
+ 31: TypeInt 64 0
+ 32: TypeVector 27(float) 2
+ 33: 6(int) Constant 2
+ 34: TypeArray 32(fvec2) 33
+ 35: TypeArray 28(fvec3) 33
+ 36(block): TypeStruct 28(fvec3) 28(fvec3) 29(int) 30(ivec2) 31(int64_t) 34 27(float) 35 27(float) 32(fvec2) 27(float)
+ 37: TypePointer ShaderRecordBufferKHR 36(block)
+ 38: 37(ptr) Variable ShaderRecordBufferKHR
+ 39: 29(int) Constant 3
+ 40: TypePointer ShaderRecordBufferKHR 30(ivec2)
+ 43: TypeAccelerationStructureKHR
+ 49: 29(int) Constant 1
+ 50: TypePointer ShaderRecordBufferKHR 28(fvec3)
+ 53: 27(float) Constant 1056964608
+ 54: 29(int) Constant 0
+ 57: 27(float) Constant 1061158912
+ 58: TypeVector 27(float) 4
+ 59: TypePointer RayPayloadKHR 58(fvec4)
+ 60(payload): 59(ptr) Variable RayPayloadKHR
+ 61: 29(int) Constant 4
+ 62: TypePointer ShaderRecordBufferKHR 31(int64_t)
+ 4(main): 2 Function None 3
+ 5: Label
+ 8(lx): 7(ptr) Variable Function
+ 16(ly): 7(ptr) Variable Function
+ 20(sx): 7(ptr) Variable Function
+ 24(sy): 7(ptr) Variable Function
+ 14: 13(ptr) AccessChain 11(gl_LaunchIDEXT) 12
+ 15: 6(int) Load 14
+ Store 8(lx) 15
+ 18: 13(ptr) AccessChain 11(gl_LaunchIDEXT) 17
+ 19: 6(int) Load 18
+ Store 16(ly) 19
+ 22: 13(ptr) AccessChain 21(gl_LaunchSizeEXT) 12
+ 23: 6(int) Load 22
+ Store 20(sx) 23
+ 25: 13(ptr) AccessChain 21(gl_LaunchSizeEXT) 17
+ 26: 6(int) Load 25
+ Store 24(sy) 26
+ 41: 40(ptr) AccessChain 38 39
+ 42: 30(ivec2) Load 41
+ 44: 43 ConvertUToAccelerationStructureKHR 42
+ 45: 6(int) Load 8(lx)
+ 46: 6(int) Load 16(ly)
+ 47: 6(int) Load 20(sx)
+ 48: 6(int) Load 24(sy)
+ 51: 50(ptr) AccessChain 38 49
+ 52: 28(fvec3) Load 51
+ 55: 50(ptr) AccessChain 38 54
+ 56: 28(fvec3) Load 55
+ TraceRayKHR 44 45 46 47 48 12 52 53 56 57 60(payload)
+ 63: 62(ptr) AccessChain 38 61
+ 64: 31(int64_t) Load 63
+ 65: 43 ConvertUToAccelerationStructureKHR 64
+ 66: 6(int) Load 8(lx)
+ 67: 6(int) Load 16(ly)
+ 68: 6(int) Load 20(sx)
+ 69: 6(int) Load 24(sy)
+ 70: 50(ptr) AccessChain 38 49
+ 71: 28(fvec3) Load 70
+ 72: 50(ptr) AccessChain 38 54
+ 73: 28(fvec3) Load 72
+ TraceRayKHR 65 66 67 68 69 12 71 53 73 57 60(payload)
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.ext.RayGenSBTlayoutscalar.rgen.out b/Test/baseResults/spv.ext.RayGenSBTlayoutscalar.rgen.out
new file mode 100644
index 0000000..eac481a
--- /dev/null
+++ b/Test/baseResults/spv.ext.RayGenSBTlayoutscalar.rgen.out
@@ -0,0 +1,135 @@
+spv.ext.RayGenSBTlayoutscalar.rgen
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 74
+
+ Capability Int64
+ Capability RayTracingKHR
+ Extension "SPV_KHR_ray_tracing"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint RayGenerationKHR 4 "main" 11 21 38 60
+ Source GLSL 460
+ SourceExtension "GL_ARB_gpu_shader_int64"
+ SourceExtension "GL_EXT_ray_tracing"
+ SourceExtension "GL_EXT_scalar_block_layout"
+ Name 4 "main"
+ Name 8 "lx"
+ Name 11 "gl_LaunchIDEXT"
+ Name 16 "ly"
+ Name 20 "sx"
+ Name 21 "gl_LaunchSizeEXT"
+ Name 24 "sy"
+ Name 36 "block"
+ MemberName 36(block) 0 "dir"
+ MemberName 36(block) 1 "origin"
+ MemberName 36(block) 2 "i"
+ MemberName 36(block) 3 "aHandle32"
+ MemberName 36(block) 4 "aHandle64"
+ MemberName 36(block) 5 "arr"
+ MemberName 36(block) 6 "a"
+ MemberName 36(block) 7 "arr3"
+ MemberName 36(block) 8 "packme"
+ MemberName 36(block) 9 "b"
+ MemberName 36(block) 10 "c"
+ Name 38 ""
+ Name 60 "payload"
+ Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
+ Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
+ Decorate 34 ArrayStride 8
+ Decorate 35 ArrayStride 12
+ MemberDecorate 36(block) 0 Offset 0
+ MemberDecorate 36(block) 1 Offset 12
+ MemberDecorate 36(block) 2 Offset 24
+ MemberDecorate 36(block) 3 Offset 28
+ MemberDecorate 36(block) 4 Offset 40
+ MemberDecorate 36(block) 5 Offset 48
+ MemberDecorate 36(block) 6 Offset 64
+ MemberDecorate 36(block) 7 Offset 68
+ MemberDecorate 36(block) 8 Offset 92
+ MemberDecorate 36(block) 9 Offset 96
+ MemberDecorate 36(block) 10 Offset 104
+ Decorate 36(block) Block
+ Decorate 38 DescriptorSet 0
+ Decorate 38 Binding 0
+ Decorate 60(payload) Location 1
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 0
+ 7: TypePointer Function 6(int)
+ 9: TypeVector 6(int) 3
+ 10: TypePointer Input 9(ivec3)
+11(gl_LaunchIDEXT): 10(ptr) Variable Input
+ 12: 6(int) Constant 0
+ 13: TypePointer Input 6(int)
+ 17: 6(int) Constant 1
+21(gl_LaunchSizeEXT): 10(ptr) Variable Input
+ 27: TypeFloat 32
+ 28: TypeVector 27(float) 3
+ 29: TypeInt 32 1
+ 30: TypeVector 6(int) 2
+ 31: TypeInt 64 0
+ 32: TypeVector 27(float) 2
+ 33: 6(int) Constant 2
+ 34: TypeArray 32(fvec2) 33
+ 35: TypeArray 28(fvec3) 33
+ 36(block): TypeStruct 28(fvec3) 28(fvec3) 29(int) 30(ivec2) 31(int64_t) 34 27(float) 35 27(float) 32(fvec2) 27(float)
+ 37: TypePointer ShaderRecordBufferKHR 36(block)
+ 38: 37(ptr) Variable ShaderRecordBufferKHR
+ 39: 29(int) Constant 3
+ 40: TypePointer ShaderRecordBufferKHR 30(ivec2)
+ 43: TypeAccelerationStructureKHR
+ 49: 29(int) Constant 1
+ 50: TypePointer ShaderRecordBufferKHR 28(fvec3)
+ 53: 27(float) Constant 1056964608
+ 54: 29(int) Constant 0
+ 57: 27(float) Constant 1061158912
+ 58: TypeVector 27(float) 4
+ 59: TypePointer RayPayloadKHR 58(fvec4)
+ 60(payload): 59(ptr) Variable RayPayloadKHR
+ 61: 29(int) Constant 4
+ 62: TypePointer ShaderRecordBufferKHR 31(int64_t)
+ 4(main): 2 Function None 3
+ 5: Label
+ 8(lx): 7(ptr) Variable Function
+ 16(ly): 7(ptr) Variable Function
+ 20(sx): 7(ptr) Variable Function
+ 24(sy): 7(ptr) Variable Function
+ 14: 13(ptr) AccessChain 11(gl_LaunchIDEXT) 12
+ 15: 6(int) Load 14
+ Store 8(lx) 15
+ 18: 13(ptr) AccessChain 11(gl_LaunchIDEXT) 17
+ 19: 6(int) Load 18
+ Store 16(ly) 19
+ 22: 13(ptr) AccessChain 21(gl_LaunchSizeEXT) 12
+ 23: 6(int) Load 22
+ Store 20(sx) 23
+ 25: 13(ptr) AccessChain 21(gl_LaunchSizeEXT) 17
+ 26: 6(int) Load 25
+ Store 24(sy) 26
+ 41: 40(ptr) AccessChain 38 39
+ 42: 30(ivec2) Load 41
+ 44: 43 ConvertUToAccelerationStructureKHR 42
+ 45: 6(int) Load 8(lx)
+ 46: 6(int) Load 16(ly)
+ 47: 6(int) Load 20(sx)
+ 48: 6(int) Load 24(sy)
+ 51: 50(ptr) AccessChain 38 49
+ 52: 28(fvec3) Load 51
+ 55: 50(ptr) AccessChain 38 54
+ 56: 28(fvec3) Load 55
+ TraceRayKHR 44 45 46 47 48 12 52 53 56 57 60(payload)
+ 63: 62(ptr) AccessChain 38 61
+ 64: 31(int64_t) Load 63
+ 65: 43 ConvertUToAccelerationStructureKHR 64
+ 66: 6(int) Load 8(lx)
+ 67: 6(int) Load 16(ly)
+ 68: 6(int) Load 20(sx)
+ 69: 6(int) Load 24(sy)
+ 70: 50(ptr) AccessChain 38 49
+ 71: 28(fvec3) Load 70
+ 72: 50(ptr) AccessChain 38 54
+ 73: 28(fvec3) Load 72
+ TraceRayKHR 65 66 67 68 69 12 71 53 73 57 60(payload)
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.ext.RayGenShader.rgen.out b/Test/baseResults/spv.ext.RayGenShader.rgen.out
index b1904ac..da516f3 100644
--- a/Test/baseResults/spv.ext.RayGenShader.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenShader.rgen.out
@@ -3,12 +3,12 @@
// Generated by (magic number): 8000a
// Id's are bound by 58
- Capability RayTraversalPrimitiveCullingProvisionalKHR
- Capability RayTracingProvisionalKHR
+ Capability RayTraversalPrimitiveCullingKHR
+ Capability RayTracingKHR
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint RayGenerationKHR 4 "main" 11 21 29 40 51 54 57
+ EntryPoint RayGenerationKHR 4 "main" 11 21 29 40 53 54 57
Source GLSL 460
SourceExtension "GL_EXT_ray_flags_primitive_culling"
SourceExtension "GL_EXT_ray_tracing"
@@ -24,9 +24,9 @@
MemberName 38(block) 0 "dir"
MemberName 38(block) 1 "origin"
Name 40 ""
- Name 51 "accEXT1"
- Name 54 "imageu"
- Name 57 "payload"
+ Name 53 "payload"
+ Name 54 "accEXT1"
+ Name 57 "imageu"
Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
Decorate 29(accEXT0) DescriptorSet 0
@@ -36,11 +36,11 @@
Decorate 38(block) Block
Decorate 40 DescriptorSet 0
Decorate 40 Binding 3
- Decorate 51(accEXT1) DescriptorSet 0
- Decorate 51(accEXT1) Binding 1
- Decorate 54(imageu) DescriptorSet 0
- Decorate 54(imageu) Binding 2
- Decorate 57(payload) Location 0
+ Decorate 53(payload) Location 1
+ Decorate 54(accEXT1) DescriptorSet 0
+ Decorate 54(accEXT1) Binding 1
+ Decorate 57(imageu) DescriptorSet 0
+ Decorate 57(imageu) Binding 2
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@@ -67,13 +67,13 @@
46: 36(float) Constant 1056964608
47: 41(int) Constant 0
50: 36(float) Constant 1061158912
- 51(accEXT1): 28(ptr) Variable UniformConstant
- 52: TypeImage 6(int) 2D nonsampled format:R32ui
- 53: TypePointer UniformConstant 52
- 54(imageu): 53(ptr) Variable UniformConstant
- 55: TypeVector 36(float) 4
- 56: TypePointer RayPayloadKHR 55(fvec4)
- 57(payload): 56(ptr) Variable RayPayloadKHR
+ 51: TypeVector 36(float) 4
+ 52: TypePointer RayPayloadKHR 51(fvec4)
+ 53(payload): 52(ptr) Variable RayPayloadKHR
+ 54(accEXT1): 28(ptr) Variable UniformConstant
+ 55: TypeImage 6(int) 2D nonsampled format:R32ui
+ 56: TypePointer UniformConstant 55
+ 57(imageu): 56(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
8(lx): 7(ptr) Variable Function
@@ -101,6 +101,6 @@
45: 37(fvec3) Load 44
48: 43(ptr) AccessChain 40 47
49: 37(fvec3) Load 48
- TraceRayKHR 30 31 32 33 34 35 45 46 49 50 42
+ TraceRayKHR 30 31 32 33 34 35 45 46 49 50 53(payload)
Return
FunctionEnd
diff --git a/Test/baseResults/spv.ext.RayGenShader11.rgen.out b/Test/baseResults/spv.ext.RayGenShader11.rgen.out
index cfaf529..00262ac 100644
--- a/Test/baseResults/spv.ext.RayGenShader11.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenShader11.rgen.out
@@ -3,7 +3,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 53
- Capability RayTracingProvisionalKHR
+ Capability RayTracingKHR
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
@@ -32,7 +32,7 @@
Decorate 37(block) Block
Decorate 39 DescriptorSet 0
Decorate 39 Binding 1
- Decorate 52(payload) Location 0
+ Decorate 52(payload) Location 1
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@@ -88,6 +88,6 @@
44: 36(fvec3) Load 43
47: 42(ptr) AccessChain 39 46
48: 36(fvec3) Load 47
- TraceRayKHR 30 31 32 33 34 12 44 45 48 49 41
+ TraceRayKHR 30 31 32 33 34 12 44 45 48 49 52(payload)
Return
FunctionEnd
diff --git a/Test/baseResults/spv.ext.RayGenShaderArray.rgen.out b/Test/baseResults/spv.ext.RayGenShaderArray.rgen.out
index 25d46a6..473937d 100644
--- a/Test/baseResults/spv.ext.RayGenShaderArray.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenShaderArray.rgen.out
@@ -1,17 +1,19 @@
spv.ext.RayGenShaderArray.rgen
// Module Version 10400
// Generated by (magic number): 8000a
-// Id's are bound by 89
+// Id's are bound by 117
+ Capability Int64
+ Capability RayTracingKHR
Capability ShaderNonUniformEXT
Capability RuntimeDescriptorArrayEXT
- Capability RayTracingProvisionalKHR
Extension "SPV_EXT_descriptor_indexing"
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint RayGenerationKHR 4 "main" 11 21 30 36 60 88
+ EntryPoint RayGenerationKHR 4 "main" 11 21 30 38 61 65
Source GLSL 460
+ SourceExtension "GL_ARB_gpu_shader_int64"
SourceExtension "GL_EXT_nonuniform_qualifier"
SourceExtension "GL_EXT_ray_tracing"
Name 4 "main"
@@ -22,29 +24,33 @@
Name 21 "gl_LaunchSizeEXT"
Name 24 "sy"
Name 30 "accEXT0"
- Name 34 "block"
- MemberName 34(block) 0 "dir"
- MemberName 34(block) 1 "origin"
- MemberName 34(block) 2 "i"
- Name 36 ""
- Name 60 "accEXT1"
- Name 88 "payload"
+ Name 36 "block"
+ MemberName 36(block) 0 "dir"
+ MemberName 36(block) 1 "origin"
+ MemberName 36(block) 2 "i"
+ MemberName 36(block) 3 "aHandle32"
+ MemberName 36(block) 4 "aHandle64"
+ Name 38 ""
+ Name 61 "payload"
+ Name 65 "accEXT1"
Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
Decorate 30(accEXT0) DescriptorSet 0
Decorate 30(accEXT0) Binding 0
- MemberDecorate 34(block) 0 Offset 0
- MemberDecorate 34(block) 1 Offset 16
- MemberDecorate 34(block) 2 Offset 28
- Decorate 34(block) Block
- Decorate 36 DescriptorSet 0
- Decorate 36 Binding 2
- Decorate 60(accEXT1) DescriptorSet 0
- Decorate 60(accEXT1) Binding 1
- Decorate 75 DecorationNonUniformEXT
- Decorate 76 DecorationNonUniformEXT
- Decorate 77 DecorationNonUniformEXT
- Decorate 88(payload) Location 0
+ MemberDecorate 36(block) 0 Offset 0
+ MemberDecorate 36(block) 1 Offset 16
+ MemberDecorate 36(block) 2 Offset 28
+ MemberDecorate 36(block) 3 Offset 32
+ MemberDecorate 36(block) 4 Offset 40
+ Decorate 36(block) Block
+ Decorate 38 DescriptorSet 0
+ Decorate 38 Binding 2
+ Decorate 61(payload) Location 1
+ Decorate 65(accEXT1) DescriptorSet 0
+ Decorate 65(accEXT1) Binding 1
+ Decorate 80 DecorationNonUniformEXT
+ Decorate 81 DecorationNonUniformEXT
+ Decorate 82 DecorationNonUniformEXT
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@@ -63,24 +69,30 @@
31: TypeFloat 32
32: TypeVector 31(float) 3
33: TypeInt 32 1
- 34(block): TypeStruct 32(fvec3) 32(fvec3) 33(int)
- 35: TypePointer ShaderRecordBufferKHR 34(block)
- 36: 35(ptr) Variable ShaderRecordBufferKHR
- 37: 33(int) Constant 2
- 38: TypePointer ShaderRecordBufferKHR 33(int)
- 41: TypePointer UniformConstant 27
- 48: 33(int) Constant 1
- 49: TypePointer ShaderRecordBufferKHR 32(fvec3)
- 52: 31(float) Constant 1056964608
- 53: 33(int) Constant 0
- 56: 31(float) Constant 1061158912
- 57: 6(int) Constant 2
- 58: TypeArray 27 57
- 59: TypePointer UniformConstant 58
- 60(accEXT1): 59(ptr) Variable UniformConstant
- 86: TypeVector 31(float) 4
- 87: TypePointer RayPayloadKHR 86(fvec4)
- 88(payload): 87(ptr) Variable RayPayloadKHR
+ 34: TypeVector 6(int) 2
+ 35: TypeInt 64 0
+ 36(block): TypeStruct 32(fvec3) 32(fvec3) 33(int) 34(ivec2) 35(int64_t)
+ 37: TypePointer ShaderRecordBufferKHR 36(block)
+ 38: 37(ptr) Variable ShaderRecordBufferKHR
+ 39: 33(int) Constant 2
+ 40: TypePointer ShaderRecordBufferKHR 33(int)
+ 43: TypePointer UniformConstant 27
+ 50: 33(int) Constant 1
+ 51: TypePointer ShaderRecordBufferKHR 32(fvec3)
+ 54: 31(float) Constant 1056964608
+ 55: 33(int) Constant 0
+ 58: 31(float) Constant 1061158912
+ 59: TypeVector 31(float) 4
+ 60: TypePointer RayPayloadKHR 59(fvec4)
+ 61(payload): 60(ptr) Variable RayPayloadKHR
+ 62: 6(int) Constant 2
+ 63: TypeArray 27 62
+ 64: TypePointer UniformConstant 63
+ 65(accEXT1): 64(ptr) Variable UniformConstant
+ 91: 33(int) Constant 3
+ 92: TypePointer ShaderRecordBufferKHR 34(ivec2)
+ 104: 33(int) Constant 4
+ 105: TypePointer ShaderRecordBufferKHR 35(int64_t)
4(main): 2 Function None 3
5: Label
8(lx): 7(ptr) Variable Function
@@ -99,45 +111,69 @@
25: 13(ptr) AccessChain 21(gl_LaunchSizeEXT) 17
26: 6(int) Load 25
Store 24(sy) 26
- 39: 38(ptr) AccessChain 36 37
- 40: 33(int) Load 39
- 42: 41(ptr) AccessChain 30(accEXT0) 40
- 43: 27 Load 42
- 44: 6(int) Load 8(lx)
- 45: 6(int) Load 16(ly)
- 46: 6(int) Load 20(sx)
- 47: 6(int) Load 24(sy)
- 50: 49(ptr) AccessChain 36 48
- 51: 32(fvec3) Load 50
- 54: 49(ptr) AccessChain 36 53
- 55: 32(fvec3) Load 54
- TraceRayKHR 43 44 45 46 47 12 51 52 55 56 48
- 61: 38(ptr) AccessChain 36 37
- 62: 33(int) Load 61
- 63: 41(ptr) AccessChain 60(accEXT1) 62
- 64: 27 Load 63
- 65: 6(int) Load 8(lx)
- 66: 6(int) Load 16(ly)
- 67: 6(int) Load 20(sx)
- 68: 6(int) Load 24(sy)
- 69: 49(ptr) AccessChain 36 48
- 70: 32(fvec3) Load 69
- 71: 49(ptr) AccessChain 36 53
- 72: 32(fvec3) Load 71
- TraceRayKHR 64 65 66 67 68 12 70 52 72 56 48
- 73: 38(ptr) AccessChain 36 37
- 74: 33(int) Load 73
- 75: 33(int) CopyObject 74
- 76: 41(ptr) AccessChain 30(accEXT0) 75
- 77: 27 Load 76
- 78: 6(int) Load 8(lx)
- 79: 6(int) Load 16(ly)
- 80: 6(int) Load 20(sx)
- 81: 6(int) Load 24(sy)
- 82: 49(ptr) AccessChain 36 48
- 83: 32(fvec3) Load 82
- 84: 49(ptr) AccessChain 36 53
- 85: 32(fvec3) Load 84
- TraceRayKHR 77 78 79 80 81 12 83 52 85 56 48
+ 41: 40(ptr) AccessChain 38 39
+ 42: 33(int) Load 41
+ 44: 43(ptr) AccessChain 30(accEXT0) 42
+ 45: 27 Load 44
+ 46: 6(int) Load 8(lx)
+ 47: 6(int) Load 16(ly)
+ 48: 6(int) Load 20(sx)
+ 49: 6(int) Load 24(sy)
+ 52: 51(ptr) AccessChain 38 50
+ 53: 32(fvec3) Load 52
+ 56: 51(ptr) AccessChain 38 55
+ 57: 32(fvec3) Load 56
+ TraceRayKHR 45 46 47 48 49 12 53 54 57 58 61(payload)
+ 66: 40(ptr) AccessChain 38 39
+ 67: 33(int) Load 66
+ 68: 43(ptr) AccessChain 65(accEXT1) 67
+ 69: 27 Load 68
+ 70: 6(int) Load 8(lx)
+ 71: 6(int) Load 16(ly)
+ 72: 6(int) Load 20(sx)
+ 73: 6(int) Load 24(sy)
+ 74: 51(ptr) AccessChain 38 50
+ 75: 32(fvec3) Load 74
+ 76: 51(ptr) AccessChain 38 55
+ 77: 32(fvec3) Load 76
+ TraceRayKHR 69 70 71 72 73 12 75 54 77 58 61(payload)
+ 78: 40(ptr) AccessChain 38 39
+ 79: 33(int) Load 78
+ 80: 33(int) CopyObject 79
+ 81: 43(ptr) AccessChain 30(accEXT0) 80
+ 82: 27 Load 81
+ 83: 6(int) Load 8(lx)
+ 84: 6(int) Load 16(ly)
+ 85: 6(int) Load 20(sx)
+ 86: 6(int) Load 24(sy)
+ 87: 51(ptr) AccessChain 38 50
+ 88: 32(fvec3) Load 87
+ 89: 51(ptr) AccessChain 38 55
+ 90: 32(fvec3) Load 89
+ TraceRayKHR 82 83 84 85 86 12 88 54 90 58 61(payload)
+ 93: 92(ptr) AccessChain 38 91
+ 94: 34(ivec2) Load 93
+ 95: 27 ConvertUToAccelerationStructureKHR 94
+ 96: 6(int) Load 8(lx)
+ 97: 6(int) Load 16(ly)
+ 98: 6(int) Load 20(sx)
+ 99: 6(int) Load 24(sy)
+ 100: 51(ptr) AccessChain 38 50
+ 101: 32(fvec3) Load 100
+ 102: 51(ptr) AccessChain 38 55
+ 103: 32(fvec3) Load 102
+ TraceRayKHR 95 96 97 98 99 12 101 54 103 58 61(payload)
+ 106: 105(ptr) AccessChain 38 104
+ 107: 35(int64_t) Load 106
+ 108: 27 ConvertUToAccelerationStructureKHR 107
+ 109: 6(int) Load 8(lx)
+ 110: 6(int) Load 16(ly)
+ 111: 6(int) Load 20(sx)
+ 112: 6(int) Load 24(sy)
+ 113: 51(ptr) AccessChain 38 50
+ 114: 32(fvec3) Load 113
+ 115: 51(ptr) AccessChain 38 55
+ 116: 32(fvec3) Load 115
+ TraceRayKHR 108 109 110 111 112 12 114 54 116 58 61(payload)
Return
FunctionEnd
diff --git a/Test/baseResults/spv.ext.RayGenShader_Errors.rgen.out b/Test/baseResults/spv.ext.RayGenShader_Errors.rgen.out
index 6dc7480..3f336bb 100644
--- a/Test/baseResults/spv.ext.RayGenShader_Errors.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenShader_Errors.rgen.out
@@ -4,8 +4,9 @@
ERROR: 0:5: 'shaderRecordNV' : can only be used with a buffer
ERROR: 0:9: 'binding' : cannot be used with shaderRecordNV
ERROR: 0:12: 'set' : cannot be used with shaderRecordNV
+ERROR: 0:23: ' temp accelerationStructureNV' : cannot construct with these arguments
ERROR: 0:23: 'accelerationStructureNV' : accelerationStructureNV can only be used in uniform variables or function parameters: a
-ERROR: 0:23: '=' : cannot convert from ' const int' to ' temp accelerationStructureNV'
+ERROR: 0:23: '=' : cannot convert from ' const float' to ' temp accelerationStructureNV'
ERROR: 0:24: 'gl_PrimitiveID' : undeclared identifier
ERROR: 0:24: '=' : cannot convert from ' temp float' to ' temp highp int'
ERROR: 0:25: 'gl_InstanceID' : undeclared identifier (Did you mean gl_InstanceIndex?)
@@ -28,11 +29,13 @@
ERROR: 0:34: '=' : cannot convert from ' temp float' to ' temp highp 4X3 matrix of float'
ERROR: 0:35: 'gl_HitTEXT' : undeclared identifier
ERROR: 0:36: 'gl_HitKindEXT' : undeclared identifier
-ERROR: 0:37: 'reportIntersectionEXT' : no matching overloaded function found
-ERROR: 0:38: 'ignoreIntersectionEXT' : no matching overloaded function found
-ERROR: 0:39: 'terminateRayEXT' : no matching overloaded function found
-ERROR: 0:40: 'assign' : l-value required "anon@3" (can't modify a shaderrecordnv qualified buffer)
-ERROR: 33 compilation errors. No code generated.
+ERROR: 0:37: 'gl_RayFlagsSkipAABBEXT' : required extension not requested: GL_EXT_ray_flags_primitive_culling
+ERROR: 0:37: '=' : cannot convert from ' const uint' to ' temp highp int'
+ERROR: 0:38: 'reportIntersectionEXT' : no matching overloaded function found
+ERROR: 0:39: 'ignoreIntersectionEXT' : not supported in this stage: ray-generation
+ERROR: 0:40: 'terminateRayEXT' : not supported in this stage: ray-generation
+ERROR: 0:41: 'assign' : l-value required "anon@3" (can't modify a shaderrecordnv qualified buffer)
+ERROR: 36 compilation errors. No code generated.
ERROR: Linking ray-generation stage: Only one shaderRecordNV buffer block is allowed per stage
diff --git a/Test/baseResults/spv.ext.RayQueryDecl.frag.out b/Test/baseResults/spv.ext.RayQueryDecl.frag.out
new file mode 100644
index 0000000..97681e9
--- /dev/null
+++ b/Test/baseResults/spv.ext.RayQueryDecl.frag.out
@@ -0,0 +1,39 @@
+spv.ext.RayQueryDecl.frag
+// Module Version 10400
+// Generated by (magic number): 8000a
+// Id's are bound by 15
+
+ Capability Shader
+ Capability RayQueryKHR
+ Extension "SPV_KHR_ray_query"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint Fragment 4 "main" 9 14
+ ExecutionMode 4 OriginUpperLeft
+ Source GLSL 460
+ SourceExtension "GL_ARB_separate_shader_objects"
+ SourceExtension "GL_EXT_nonuniform_qualifier"
+ SourceExtension "GL_EXT_ray_query"
+ SourceExtension "GL_EXT_scalar_block_layout"
+ SourceExtension "GL_GOOGLE_cpp_style_line_directive"
+ SourceExtension "GL_GOOGLE_include_directive"
+ Name 4 "main"
+ Name 9 "outColor"
+ Name 14 "rq"
+ Decorate 9(outColor) Location 0
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeFloat 32
+ 7: TypeVector 6(float) 4
+ 8: TypePointer Output 7(fvec4)
+ 9(outColor): 8(ptr) Variable Output
+ 10: 6(float) Constant 0
+ 11: 7(fvec4) ConstantComposite 10 10 10 10
+ 12: TypeRayQueryKHR
+ 13: TypePointer Private 12
+ 14(rq): 13(ptr) Variable Private
+ 4(main): 2 Function None 3
+ 5: Label
+ Store 9(outColor) 11
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.ext.World3x4.rahit.out b/Test/baseResults/spv.ext.World3x4.rahit.out
index ad877bd..40d73d1 100644
--- a/Test/baseResults/spv.ext.World3x4.rahit.out
+++ b/Test/baseResults/spv.ext.World3x4.rahit.out
@@ -3,7 +3,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 90
- Capability RayTracingProvisionalKHR
+ Capability RayTracingKHR
Extension "SPV_KHR_ray_tracing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
diff --git a/Test/baseResults/spv.layer.tese.out b/Test/baseResults/spv.layer.tese.out
new file mode 100644
index 0000000..906340f
--- /dev/null
+++ b/Test/baseResults/spv.layer.tese.out
@@ -0,0 +1,30 @@
+spv.layer.tese
+// Module Version 10000
+// Generated by (magic number): 8000a
+// Id's are bound by 10
+
+ Capability Tessellation
+ Capability ShaderViewportIndexLayerNV
+ Extension "SPV_EXT_shader_viewport_index_layer"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint TessellationEvaluation 4 "main" 8
+ ExecutionMode 4 Triangles
+ ExecutionMode 4 SpacingEqual
+ ExecutionMode 4 VertexOrderCcw
+ Source GLSL 450
+ SourceExtension "GL_ARB_shader_viewport_layer_array"
+ Name 4 "main"
+ Name 8 "gl_Layer"
+ Decorate 8(gl_Layer) BuiltIn Layer
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 1
+ 7: TypePointer Output 6(int)
+ 8(gl_Layer): 7(ptr) Variable Output
+ 9: 6(int) Constant 1
+ 4(main): 2 Function None 3
+ 5: Label
+ Store 8(gl_Layer) 9
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.meshShaderBuiltins.mesh.out b/Test/baseResults/spv.meshShaderBuiltins.mesh.out
index f0c252a..b26122e 100644
--- a/Test/baseResults/spv.meshShaderBuiltins.mesh.out
+++ b/Test/baseResults/spv.meshShaderBuiltins.mesh.out
@@ -5,7 +5,6 @@
Capability ClipDistance
Capability CullDistance
- Capability MultiViewport
Capability DrawParameters
Capability ShaderViewportMaskNV
Capability MeshShadingNV
diff --git a/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out b/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out
index 907ae28..86a4fd2 100644
--- a/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out
+++ b/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out
@@ -3,7 +3,6 @@
// Generated by (magic number): 8000a
// Id's are bound by 126
- Capability MultiViewport
Capability PerViewAttributesNV
Capability MeshShadingNV
Extension "SPV_NVX_multiview_per_view_attributes"
diff --git a/Test/baseResults/spv.meshShaderRedeclBuiltins.mesh.out b/Test/baseResults/spv.meshShaderRedeclBuiltins.mesh.out
index 66c3a0d..bfd2d85 100644
--- a/Test/baseResults/spv.meshShaderRedeclBuiltins.mesh.out
+++ b/Test/baseResults/spv.meshShaderRedeclBuiltins.mesh.out
@@ -5,7 +5,6 @@
Capability ClipDistance
Capability CullDistance
- Capability MultiViewport
Capability ShaderViewportMaskNV
Capability MeshShadingNV
Extension "SPV_NV_mesh_shader"
diff --git a/Test/baseResults/spv.nonuniform.frag.out b/Test/baseResults/spv.nonuniform.frag.out
index 66f53d5..f6febc9 100644
--- a/Test/baseResults/spv.nonuniform.frag.out
+++ b/Test/baseResults/spv.nonuniform.frag.out
@@ -1,7 +1,7 @@
spv.nonuniform.frag
// Module Version 10000
// Generated by (magic number): 8000a
-// Id's are bound by 235
+// Id's are bound by 289
Capability Shader
Capability InputAttachment
@@ -22,7 +22,7 @@
Extension "SPV_EXT_descriptor_indexing"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
- EntryPoint Fragment 4 "main" 35 92 182
+ EntryPoint Fragment 4 "main" 41 98 188
ExecutionMode 4 OriginUpperLeft
Source GLSL 450
SourceExtension "GL_EXT_nonuniform_qualifier"
@@ -34,246 +34,268 @@
Name 17 "nu_li"
Name 18 "param"
Name 20 "param"
- Name 32 "b"
- Name 35 "nu_inv4"
- Name 41 "nu_gf"
- Name 47 "inputAttachmentDyn"
- Name 48 "dyn_i"
- Name 64 "uniformTexelBufferDyn"
- Name 78 "storageTexelBufferDyn"
- Name 87 "uname"
- MemberName 87(uname) 0 "a"
- Name 90 "uniformBuffer"
- Name 92 "nu_ii"
- Name 99 "bname"
- MemberName 99(bname) 0 "b"
- Name 102 "storageBuffer"
- Name 112 "sampledImage"
- Name 127 "storageImage"
- Name 139 "inputAttachment"
- Name 149 "uniformTexelBuffer"
- Name 160 "storageTexelBuffer"
- Name 171 "uniformTexArr"
- Name 178 "uniformSampler"
- Name 182 "inTexcoord"
- Name 190 "v"
- Name 205 "uv"
- Name 215 "m"
- Name 223 "S"
- MemberName 223(S) 0 "a"
- Name 225 "s"
- Decorate 9(nupi) DecorationNonUniformEXT
+ Name 30 "nu_li2"
+ Name 38 "b"
+ Name 41 "nu_inv4"
+ Name 47 "nu_gf"
+ Name 53 "inputAttachmentDyn"
+ Name 54 "dyn_i"
+ Name 70 "uniformTexelBufferDyn"
+ Name 84 "storageTexelBufferDyn"
+ Name 93 "uname"
+ MemberName 93(uname) 0 "a"
+ Name 96 "uniformBuffer"
+ Name 98 "nu_ii"
+ Name 105 "bname"
+ MemberName 105(bname) 0 "b"
+ Name 108 "storageBuffer"
+ Name 118 "sampledImage"
+ Name 133 "storageImage"
+ Name 145 "inputAttachment"
+ Name 155 "uniformTexelBuffer"
+ Name 166 "storageTexelBuffer"
+ Name 177 "uniformTexArr"
+ Name 184 "uniformSampler"
+ Name 188 "inTexcoord"
+ Name 207 "v"
+ Name 222 "uv"
+ Name 232 "m"
+ Name 240 "S"
+ MemberName 240(S) 0 "a"
+ Name 242 "s"
+ Name 252 "arr"
+ Name 259 "um"
+ Name 268 "US"
+ MemberName 268(US) 0 "a"
+ Name 270 "us"
+ Name 278 "uarr"
Decorate 13 DecorationNonUniformEXT
- Decorate 17(nu_li) DecorationNonUniformEXT
- Decorate 17(nu_li) DecorationNonUniformEXT
Decorate 19 DecorationNonUniformEXT
- Decorate 18(param) DecorationNonUniformEXT
- Decorate 17(nu_li) DecorationNonUniformEXT
+ Decorate 21 DecorationNonUniformEXT
+ Decorate 22 DecorationNonUniformEXT
Decorate 24 DecorationNonUniformEXT
Decorate 28 DecorationNonUniformEXT
Decorate 29 DecorationNonUniformEXT
- Decorate 17(nu_li) DecorationNonUniformEXT
- Decorate 35(nu_inv4) Location 0
- Decorate 35(nu_inv4) DecorationNonUniformEXT
- Decorate 39 DecorationNonUniformEXT
- Decorate 40 DecorationNonUniformEXT
- Decorate 41(nu_gf) DecorationNonUniformEXT
- Decorate 41(nu_gf) DecorationNonUniformEXT
- Decorate 42 DecorationNonUniformEXT
- Decorate 43 DecorationNonUniformEXT
- Decorate 47(inputAttachmentDyn) DescriptorSet 0
- Decorate 47(inputAttachmentDyn) Binding 0
- Decorate 47(inputAttachmentDyn) InputAttachmentIndex 0
- Decorate 64(uniformTexelBufferDyn) DescriptorSet 0
- Decorate 64(uniformTexelBufferDyn) Binding 1
- Decorate 78(storageTexelBufferDyn) DescriptorSet 0
- Decorate 78(storageTexelBufferDyn) Binding 2
- MemberDecorate 87(uname) 0 Offset 0
- Decorate 87(uname) Block
- Decorate 90(uniformBuffer) DescriptorSet 0
- Decorate 90(uniformBuffer) Binding 3
- Decorate 92(nu_ii) Flat
- Decorate 92(nu_ii) Location 1
- Decorate 92(nu_ii) DecorationNonUniformEXT
- Decorate 92(nu_ii) DecorationNonUniformEXT
- Decorate 93 DecorationNonUniformEXT
- Decorate 95 DecorationNonUniformEXT
- Decorate 96 DecorationNonUniformEXT
- MemberDecorate 99(bname) 0 Offset 0
- Decorate 99(bname) BufferBlock
- Decorate 102(storageBuffer) DescriptorSet 0
- Decorate 102(storageBuffer) Binding 4
- Decorate 92(nu_ii) DecorationNonUniformEXT
- Decorate 103 DecorationNonUniformEXT
+ Decorate 34 DecorationNonUniformEXT
+ Decorate 35 DecorationNonUniformEXT
+ Decorate 41(nu_inv4) Location 0
+ Decorate 46 DecorationNonUniformEXT
+ Decorate 48 DecorationNonUniformEXT
+ Decorate 49 DecorationNonUniformEXT
+ Decorate 53(inputAttachmentDyn) DescriptorSet 0
+ Decorate 53(inputAttachmentDyn) Binding 0
+ Decorate 53(inputAttachmentDyn) InputAttachmentIndex 0
+ Decorate 70(uniformTexelBufferDyn) DescriptorSet 0
+ Decorate 70(uniformTexelBufferDyn) Binding 1
+ Decorate 84(storageTexelBufferDyn) DescriptorSet 0
+ Decorate 84(storageTexelBufferDyn) Binding 2
+ MemberDecorate 93(uname) 0 Offset 0
+ Decorate 93(uname) Block
+ Decorate 96(uniformBuffer) DescriptorSet 0
+ Decorate 96(uniformBuffer) Binding 3
+ Decorate 98(nu_ii) Flat
+ Decorate 98(nu_ii) Location 1
+ Decorate 99 DecorationNonUniformEXT
+ Decorate 101 DecorationNonUniformEXT
+ Decorate 102 DecorationNonUniformEXT
Decorate 104 DecorationNonUniformEXT
- Decorate 105 DecorationNonUniformEXT
- Decorate 112(sampledImage) DescriptorSet 0
- Decorate 112(sampledImage) Binding 5
- Decorate 92(nu_ii) DecorationNonUniformEXT
+ MemberDecorate 105(bname) 0 Offset 0
+ Decorate 105(bname) BufferBlock
+ Decorate 108(storageBuffer) DescriptorSet 0
+ Decorate 108(storageBuffer) Binding 4
+ Decorate 109 DecorationNonUniformEXT
+ Decorate 110 DecorationNonUniformEXT
+ Decorate 111 DecorationNonUniformEXT
Decorate 113 DecorationNonUniformEXT
- Decorate 115 DecorationNonUniformEXT
- Decorate 116 DecorationNonUniformEXT
- Decorate 127(storageImage) DescriptorSet 0
- Decorate 127(storageImage) Binding 6
- Decorate 92(nu_ii) DecorationNonUniformEXT
- Decorate 128 DecorationNonUniformEXT
- Decorate 130 DecorationNonUniformEXT
- Decorate 131 DecorationNonUniformEXT
- Decorate 139(inputAttachment) DescriptorSet 0
- Decorate 139(inputAttachment) Binding 7
- Decorate 139(inputAttachment) InputAttachmentIndex 1
- Decorate 92(nu_ii) DecorationNonUniformEXT
- Decorate 140 DecorationNonUniformEXT
- Decorate 141 DecorationNonUniformEXT
- Decorate 142 DecorationNonUniformEXT
- Decorate 149(uniformTexelBuffer) DescriptorSet 0
- Decorate 149(uniformTexelBuffer) Binding 8
- Decorate 92(nu_ii) DecorationNonUniformEXT
- Decorate 150 DecorationNonUniformEXT
- Decorate 151 DecorationNonUniformEXT
- Decorate 152 DecorationNonUniformEXT
- Decorate 153 DecorationNonUniformEXT
- Decorate 160(storageTexelBuffer) DescriptorSet 0
- Decorate 160(storageTexelBuffer) Binding 9
- Decorate 92(nu_ii) DecorationNonUniformEXT
- Decorate 161 DecorationNonUniformEXT
- Decorate 162 DecorationNonUniformEXT
- Decorate 163 DecorationNonUniformEXT
- Decorate 171(uniformTexArr) DescriptorSet 0
- Decorate 171(uniformTexArr) Binding 10
- Decorate 92(nu_ii) DecorationNonUniformEXT
- Decorate 172 DecorationNonUniformEXT
- Decorate 174 DecorationNonUniformEXT
- Decorate 175 DecorationNonUniformEXT
- Decorate 178(uniformSampler) DescriptorSet 0
- Decorate 178(uniformSampler) Binding 11
- Decorate 182(inTexcoord) Location 2
- Decorate 190(v) DecorationNonUniformEXT
- Decorate 192 DecorationNonUniformEXT
- Decorate 193 DecorationNonUniformEXT
+ Decorate 118(sampledImage) DescriptorSet 0
+ Decorate 118(sampledImage) Binding 5
+ Decorate 119 DecorationNonUniformEXT
+ Decorate 121 DecorationNonUniformEXT
+ Decorate 122 DecorationNonUniformEXT
+ Decorate 133(storageImage) DescriptorSet 0
+ Decorate 133(storageImage) Binding 6
+ Decorate 134 DecorationNonUniformEXT
+ Decorate 136 DecorationNonUniformEXT
+ Decorate 137 DecorationNonUniformEXT
+ Decorate 145(inputAttachment) DescriptorSet 0
+ Decorate 145(inputAttachment) Binding 7
+ Decorate 145(inputAttachment) InputAttachmentIndex 1
+ Decorate 146 DecorationNonUniformEXT
+ Decorate 147 DecorationNonUniformEXT
+ Decorate 148 DecorationNonUniformEXT
+ Decorate 155(uniformTexelBuffer) DescriptorSet 0
+ Decorate 155(uniformTexelBuffer) Binding 8
+ Decorate 156 DecorationNonUniformEXT
+ Decorate 157 DecorationNonUniformEXT
+ Decorate 158 DecorationNonUniformEXT
+ Decorate 159 DecorationNonUniformEXT
+ Decorate 166(storageTexelBuffer) DescriptorSet 0
+ Decorate 166(storageTexelBuffer) Binding 9
+ Decorate 167 DecorationNonUniformEXT
+ Decorate 168 DecorationNonUniformEXT
+ Decorate 169 DecorationNonUniformEXT
+ Decorate 177(uniformTexArr) DescriptorSet 0
+ Decorate 177(uniformTexArr) Binding 10
+ Decorate 178 DecorationNonUniformEXT
+ Decorate 180 DecorationNonUniformEXT
+ Decorate 181 DecorationNonUniformEXT
+ Decorate 184(uniformSampler) DescriptorSet 0
+ Decorate 184(uniformSampler) Binding 11
+ Decorate 188(inTexcoord) Location 2
Decorate 194 DecorationNonUniformEXT
Decorate 195 DecorationNonUniformEXT
+ Decorate 196 DecorationNonUniformEXT
Decorate 199 DecorationNonUniformEXT
- Decorate 200 DecorationNonUniformEXT
- Decorate 201 DecorationNonUniformEXT
- Decorate 202 DecorationNonUniformEXT
- Decorate 92(nu_ii) DecorationNonUniformEXT
- Decorate 206 DecorationNonUniformEXT
- Decorate 207 DecorationNonUniformEXT
- Decorate 208 DecorationNonUniformEXT
- Decorate 209 DecorationNonUniformEXT
Decorate 210 DecorationNonUniformEXT
- Decorate 215(m) DecorationNonUniformEXT
- Decorate 216 DecorationNonUniformEXT
+ Decorate 211 DecorationNonUniformEXT
+ Decorate 212 DecorationNonUniformEXT
+ Decorate 214 DecorationNonUniformEXT
Decorate 217 DecorationNonUniformEXT
- Decorate 225(s) DecorationNonUniformEXT
+ Decorate 218 DecorationNonUniformEXT
+ Decorate 219 DecorationNonUniformEXT
+ Decorate 221 DecorationNonUniformEXT
+ Decorate 223 DecorationNonUniformEXT
+ Decorate 224 DecorationNonUniformEXT
+ Decorate 225 DecorationNonUniformEXT
Decorate 226 DecorationNonUniformEXT
Decorate 227 DecorationNonUniformEXT
- Decorate 228 DecorationNonUniformEXT
Decorate 229 DecorationNonUniformEXT
- Decorate 92(nu_ii) DecorationNonUniformEXT
- Decorate 232 DecorationNonUniformEXT
Decorate 234 DecorationNonUniformEXT
+ Decorate 244 DecorationNonUniformEXT
+ Decorate 245 DecorationNonUniformEXT
+ Decorate 246 DecorationNonUniformEXT
+ Decorate 248 DecorationNonUniformEXT
+ Decorate 254 DecorationNonUniformEXT
+ Decorate 255 DecorationNonUniformEXT
+ Decorate 256 DecorationNonUniformEXT
+ Decorate 258 DecorationNonUniformEXT
+ Decorate 260 DecorationNonUniformEXT
+ Decorate 261 DecorationNonUniformEXT
+ Decorate 262 DecorationNonUniformEXT
+ Decorate 271 DecorationNonUniformEXT
+ Decorate 272 DecorationNonUniformEXT
+ Decorate 273 DecorationNonUniformEXT
+ Decorate 274 DecorationNonUniformEXT
+ Decorate 275 DecorationNonUniformEXT
+ Decorate 277 DecorationNonUniformEXT
+ Decorate 279 DecorationNonUniformEXT
+ Decorate 280 DecorationNonUniformEXT
+ Decorate 281 DecorationNonUniformEXT
+ Decorate 282 DecorationNonUniformEXT
+ Decorate 283 DecorationNonUniformEXT
+ Decorate 285 DecorationNonUniformEXT
+ Decorate 286 DecorationNonUniformEXT
+ Decorate 288 DecorationNonUniformEXT
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1
7: TypePointer Function 6(int)
8: TypeFunction 6(int) 7(ptr) 7(ptr)
26: 6(int) Constant 2
- 30: TypeFloat 32
- 31: TypePointer Function 30(float)
- 33: TypeVector 30(float) 4
- 34: TypePointer Input 33(fvec4)
- 35(nu_inv4): 34(ptr) Variable Input
- 36: TypeInt 32 0
- 37: 36(int) Constant 0
- 38: TypePointer Input 30(float)
- 44: TypeImage 30(float) SubpassData nonsampled format:Unknown
- 45: TypeRuntimeArray 44
- 46: TypePointer UniformConstant 45
-47(inputAttachmentDyn): 46(ptr) Variable UniformConstant
- 50: TypePointer UniformConstant 44
- 53: 6(int) Constant 0
- 54: TypeVector 6(int) 2
- 55: 54(ivec2) ConstantComposite 53 53
- 60: TypeImage 30(float) Buffer sampled format:Unknown
- 61: TypeSampledImage 60
- 62: TypeRuntimeArray 61
- 63: TypePointer UniformConstant 62
-64(uniformTexelBufferDyn): 63(ptr) Variable UniformConstant
- 66: TypePointer UniformConstant 61
- 69: 6(int) Constant 1
- 75: TypeImage 30(float) Buffer nonsampled format:R32f
- 76: TypeRuntimeArray 75
- 77: TypePointer UniformConstant 76
-78(storageTexelBufferDyn): 77(ptr) Variable UniformConstant
- 80: TypePointer UniformConstant 75
- 87(uname): TypeStruct 30(float)
- 88: TypeRuntimeArray 87(uname)
- 89: TypePointer Uniform 88
-90(uniformBuffer): 89(ptr) Variable Uniform
- 91: TypePointer Input 6(int)
- 92(nu_ii): 91(ptr) Variable Input
- 94: TypePointer Uniform 30(float)
- 99(bname): TypeStruct 30(float)
- 100: TypeRuntimeArray 99(bname)
- 101: TypePointer Uniform 100
-102(storageBuffer): 101(ptr) Variable Uniform
- 108: TypeImage 30(float) 2D sampled format:Unknown
- 109: TypeSampledImage 108
- 110: TypeRuntimeArray 109
- 111: TypePointer UniformConstant 110
-112(sampledImage): 111(ptr) Variable UniformConstant
- 114: TypePointer UniformConstant 109
- 117: TypeVector 30(float) 2
- 118: 30(float) Constant 1056964608
- 119: 117(fvec2) ConstantComposite 118 118
- 124: TypeImage 30(float) 2D nonsampled format:R32f
- 125: TypeRuntimeArray 124
- 126: TypePointer UniformConstant 125
-127(storageImage): 126(ptr) Variable UniformConstant
- 129: TypePointer UniformConstant 124
- 132: 54(ivec2) ConstantComposite 69 69
- 137: TypeRuntimeArray 44
- 138: TypePointer UniformConstant 137
-139(inputAttachment): 138(ptr) Variable UniformConstant
- 147: TypeRuntimeArray 61
- 148: TypePointer UniformConstant 147
-149(uniformTexelBuffer): 148(ptr) Variable UniformConstant
- 158: TypeRuntimeArray 75
- 159: TypePointer UniformConstant 158
-160(storageTexelBuffer): 159(ptr) Variable UniformConstant
- 168: 36(int) Constant 8
- 169: TypeArray 108 168
- 170: TypePointer UniformConstant 169
-171(uniformTexArr): 170(ptr) Variable UniformConstant
- 173: TypePointer UniformConstant 108
- 176: TypeSampler
- 177: TypePointer UniformConstant 176
-178(uniformSampler): 177(ptr) Variable UniformConstant
- 181: TypePointer Input 117(fvec2)
- 182(inTexcoord): 181(ptr) Variable Input
- 188: TypeVector 6(int) 4
- 189: TypePointer Function 188(ivec4)
- 191: 36(int) Constant 1
- 198: 36(int) Constant 2
- 213: TypeMatrix 33(fvec4) 4
- 214: TypePointer Function 213
- 223(S): TypeStruct 6(int)
- 224: TypePointer Function 223(S)
+ 36: TypeFloat 32
+ 37: TypePointer Function 36(float)
+ 39: TypeVector 36(float) 4
+ 40: TypePointer Input 39(fvec4)
+ 41(nu_inv4): 40(ptr) Variable Input
+ 42: TypeInt 32 0
+ 43: 42(int) Constant 0
+ 44: TypePointer Input 36(float)
+ 50: TypeImage 36(float) SubpassData nonsampled format:Unknown
+ 51: TypeRuntimeArray 50
+ 52: TypePointer UniformConstant 51
+53(inputAttachmentDyn): 52(ptr) Variable UniformConstant
+ 56: TypePointer UniformConstant 50
+ 59: 6(int) Constant 0
+ 60: TypeVector 6(int) 2
+ 61: 60(ivec2) ConstantComposite 59 59
+ 66: TypeImage 36(float) Buffer sampled format:Unknown
+ 67: TypeSampledImage 66
+ 68: TypeRuntimeArray 67
+ 69: TypePointer UniformConstant 68
+70(uniformTexelBufferDyn): 69(ptr) Variable UniformConstant
+ 72: TypePointer UniformConstant 67
+ 75: 6(int) Constant 1
+ 81: TypeImage 36(float) Buffer nonsampled format:R32f
+ 82: TypeRuntimeArray 81
+ 83: TypePointer UniformConstant 82
+84(storageTexelBufferDyn): 83(ptr) Variable UniformConstant
+ 86: TypePointer UniformConstant 81
+ 93(uname): TypeStruct 36(float)
+ 94: TypeRuntimeArray 93(uname)
+ 95: TypePointer Uniform 94
+96(uniformBuffer): 95(ptr) Variable Uniform
+ 97: TypePointer Input 6(int)
+ 98(nu_ii): 97(ptr) Variable Input
+ 100: TypePointer Uniform 36(float)
+ 105(bname): TypeStruct 36(float)
+ 106: TypeRuntimeArray 105(bname)
+ 107: TypePointer Uniform 106
+108(storageBuffer): 107(ptr) Variable Uniform
+ 114: TypeImage 36(float) 2D sampled format:Unknown
+ 115: TypeSampledImage 114
+ 116: TypeRuntimeArray 115
+ 117: TypePointer UniformConstant 116
+118(sampledImage): 117(ptr) Variable UniformConstant
+ 120: TypePointer UniformConstant 115
+ 123: TypeVector 36(float) 2
+ 124: 36(float) Constant 1056964608
+ 125: 123(fvec2) ConstantComposite 124 124
+ 130: TypeImage 36(float) 2D nonsampled format:R32f
+ 131: TypeRuntimeArray 130
+ 132: TypePointer UniformConstant 131
+133(storageImage): 132(ptr) Variable UniformConstant
+ 135: TypePointer UniformConstant 130
+ 138: 60(ivec2) ConstantComposite 75 75
+ 143: TypeRuntimeArray 50
+ 144: TypePointer UniformConstant 143
+145(inputAttachment): 144(ptr) Variable UniformConstant
+ 153: TypeRuntimeArray 67
+ 154: TypePointer UniformConstant 153
+155(uniformTexelBuffer): 154(ptr) Variable UniformConstant
+ 164: TypeRuntimeArray 81
+ 165: TypePointer UniformConstant 164
+166(storageTexelBuffer): 165(ptr) Variable UniformConstant
+ 174: 42(int) Constant 8
+ 175: TypeArray 114 174
+ 176: TypePointer UniformConstant 175
+177(uniformTexArr): 176(ptr) Variable UniformConstant
+ 179: TypePointer UniformConstant 114
+ 182: TypeSampler
+ 183: TypePointer UniformConstant 182
+184(uniformSampler): 183(ptr) Variable UniformConstant
+ 187: TypePointer Input 123(fvec2)
+ 188(inTexcoord): 187(ptr) Variable Input
+ 205: TypeVector 6(int) 4
+ 206: TypePointer Function 205(ivec4)
+ 208: 42(int) Constant 1
+ 215: 42(int) Constant 2
+ 230: TypeMatrix 39(fvec4) 4
+ 231: TypePointer Function 230
+ 240(S): TypeStruct 6(int)
+ 241: TypePointer Function 240(S)
+ 249: 42(int) Constant 10
+ 250: TypeArray 6(int) 249
+ 251: TypePointer Function 250
+ 268(US): TypeStruct 250
+ 269: TypePointer Function 268(US)
4(main): 2 Function None 3
5: Label
16(a): 7(ptr) Variable Function
17(nu_li): 7(ptr) Variable Function
18(param): 7(ptr) Variable Function
20(param): 7(ptr) Variable Function
- 32(b): 31(ptr) Variable Function
- 41(nu_gf): 31(ptr) Variable Function
- 48(dyn_i): 7(ptr) Variable Function
- 190(v): 189(ptr) Variable Function
- 205(uv): 189(ptr) Variable Function
- 215(m): 214(ptr) Variable Function
- 225(s): 224(ptr) Variable Function
+ 30(nu_li2): 7(ptr) Variable Function
+ 38(b): 37(ptr) Variable Function
+ 47(nu_gf): 37(ptr) Variable Function
+ 54(dyn_i): 7(ptr) Variable Function
+ 207(v): 206(ptr) Variable Function
+ 222(uv): 206(ptr) Variable Function
+ 232(m): 231(ptr) Variable Function
+ 242(s): 241(ptr) Variable Function
+ 252(arr): 251(ptr) Variable Function
+ 259(um): 231(ptr) Variable Function
+ 270(us): 269(ptr) Variable Function
+ 278(uarr): 251(ptr) Variable Function
19: 6(int) Load 17(nu_li)
Store 18(param) 19
21: 6(int) FunctionCall 11(foo(i1;i1;) 18(param) 20(param)
@@ -287,141 +309,191 @@
28: 6(int) CopyObject 27
29: 6(int) IAdd 24 28
Store 17(nu_li) 29
- 39: 38(ptr) AccessChain 35(nu_inv4) 37
- 40: 30(float) Load 39
- 42: 30(float) Load 41(nu_gf)
- 43: 30(float) FMul 40 42
- Store 32(b) 43
- 49: 6(int) Load 48(dyn_i)
- 51: 50(ptr) AccessChain 47(inputAttachmentDyn) 49
- 52: 44 Load 51
- 56: 33(fvec4) ImageRead 52 55
- 57: 30(float) CompositeExtract 56 0
- 58: 30(float) Load 32(b)
- 59: 30(float) FAdd 58 57
- Store 32(b) 59
- 65: 6(int) Load 48(dyn_i)
- 67: 66(ptr) AccessChain 64(uniformTexelBufferDyn) 65
- 68: 61 Load 67
- 70: 60 Image 68
- 71: 33(fvec4) ImageFetch 70 69
- 72: 30(float) CompositeExtract 71 0
- 73: 30(float) Load 32(b)
- 74: 30(float) FAdd 73 72
- Store 32(b) 74
- 79: 6(int) Load 48(dyn_i)
- 81: 80(ptr) AccessChain 78(storageTexelBufferDyn) 79
- 82: 75 Load 81
- 83: 33(fvec4) ImageRead 82 69
- 84: 30(float) CompositeExtract 83 0
- 85: 30(float) Load 32(b)
- 86: 30(float) FAdd 85 84
- Store 32(b) 86
- 93: 6(int) Load 92(nu_ii)
- 95: 94(ptr) AccessChain 90(uniformBuffer) 93 53
- 96: 30(float) Load 95
- 97: 30(float) Load 32(b)
- 98: 30(float) FAdd 97 96
- Store 32(b) 98
- 103: 6(int) Load 92(nu_ii)
- 104: 94(ptr) AccessChain 102(storageBuffer) 103 53
- 105: 30(float) Load 104
- 106: 30(float) Load 32(b)
- 107: 30(float) FAdd 106 105
- Store 32(b) 107
- 113: 6(int) Load 92(nu_ii)
- 115: 114(ptr) AccessChain 112(sampledImage) 113
- 116: 109 Load 115
- 120: 33(fvec4) ImageSampleImplicitLod 116 119
- 121: 30(float) CompositeExtract 120 0
- 122: 30(float) Load 32(b)
- 123: 30(float) FAdd 122 121
- Store 32(b) 123
- 128: 6(int) Load 92(nu_ii)
- 130: 129(ptr) AccessChain 127(storageImage) 128
- 131: 124 Load 130
- 133: 33(fvec4) ImageRead 131 132
- 134: 30(float) CompositeExtract 133 0
- 135: 30(float) Load 32(b)
- 136: 30(float) FAdd 135 134
- Store 32(b) 136
- 140: 6(int) Load 92(nu_ii)
- 141: 50(ptr) AccessChain 139(inputAttachment) 140
- 142: 44 Load 141
- 143: 33(fvec4) ImageRead 142 55
- 144: 30(float) CompositeExtract 143 0
- 145: 30(float) Load 32(b)
- 146: 30(float) FAdd 145 144
- Store 32(b) 146
- 150: 6(int) Load 92(nu_ii)
- 151: 66(ptr) AccessChain 149(uniformTexelBuffer) 150
- 152: 61 Load 151
- 153: 60 Image 152
- 154: 33(fvec4) ImageFetch 153 69
- 155: 30(float) CompositeExtract 154 0
- 156: 30(float) Load 32(b)
- 157: 30(float) FAdd 156 155
- Store 32(b) 157
- 161: 6(int) Load 92(nu_ii)
- 162: 80(ptr) AccessChain 160(storageTexelBuffer) 161
- 163: 75 Load 162
- 164: 33(fvec4) ImageRead 163 69
- 165: 30(float) CompositeExtract 164 0
- 166: 30(float) Load 32(b)
- 167: 30(float) FAdd 166 165
- Store 32(b) 167
- 172: 6(int) Load 92(nu_ii)
- 174: 173(ptr) AccessChain 171(uniformTexArr) 172
- 175: 108 Load 174
- 179: 176 Load 178(uniformSampler)
- 180: 109 SampledImage 175 179
- 183: 117(fvec2) Load 182(inTexcoord)
- 184: 33(fvec4) ImageSampleImplicitLod 180 183
- 185: 30(float) CompositeExtract 184 0
- 186: 30(float) Load 32(b)
- 187: 30(float) FAdd 186 185
- Store 32(b) 187
- 192: 7(ptr) AccessChain 190(v) 191
- 193: 6(int) Load 192
- 194: 94(ptr) AccessChain 90(uniformBuffer) 193 53
- 195: 30(float) Load 194
- 196: 30(float) Load 32(b)
- 197: 30(float) FAdd 196 195
- Store 32(b) 197
- 199: 7(ptr) AccessChain 190(v) 198
- 200: 6(int) Load 199
- 201: 94(ptr) AccessChain 90(uniformBuffer) 200 53
- 202: 30(float) Load 201
- 203: 30(float) Load 32(b)
- 204: 30(float) FAdd 203 202
- Store 32(b) 204
- 206: 6(int) Load 92(nu_ii)
- 207: 7(ptr) AccessChain 205(uv) 206
- 208: 6(int) Load 207
- 209: 94(ptr) AccessChain 90(uniformBuffer) 208 53
- 210: 30(float) Load 209
- 211: 30(float) Load 32(b)
- 212: 30(float) FAdd 211 210
- Store 32(b) 212
- 216: 31(ptr) AccessChain 215(m) 26 198
- 217: 30(float) Load 216
- 218: 6(int) ConvertFToS 217
- 219: 94(ptr) AccessChain 90(uniformBuffer) 218 53
- 220: 30(float) Load 219
- 221: 30(float) Load 32(b)
- 222: 30(float) FAdd 221 220
- Store 32(b) 222
- 226: 7(ptr) AccessChain 225(s) 53
- 227: 6(int) Load 226
- 228: 94(ptr) AccessChain 90(uniformBuffer) 227 53
- 229: 30(float) Load 228
- 230: 30(float) Load 32(b)
- 231: 30(float) FAdd 230 229
- Store 32(b) 231
- 232: 6(int) Load 92(nu_ii)
- 233: 30(float) Load 32(b)
- 234: 94(ptr) AccessChain 102(storageBuffer) 232 53
- Store 234 233
+ 31: 6(int) Load 16(a)
+ 32: 6(int) Load 16(a)
+ 33: 6(int) IMul 32 26
+ 34: 6(int) CopyObject 33
+ 35: 6(int) IAdd 31 34
+ Store 30(nu_li2) 35
+ 45: 44(ptr) AccessChain 41(nu_inv4) 43
+ 46: 36(float) Load 45
+ 48: 36(float) Load 47(nu_gf)
+ 49: 36(float) FMul 46 48
+ Store 38(b) 49
+ 55: 6(int) Load 54(dyn_i)
+ 57: 56(ptr) AccessChain 53(inputAttachmentDyn) 55
+ 58: 50 Load 57
+ 62: 39(fvec4) ImageRead 58 61
+ 63: 36(float) CompositeExtract 62 0
+ 64: 36(float) Load 38(b)
+ 65: 36(float) FAdd 64 63
+ Store 38(b) 65
+ 71: 6(int) Load 54(dyn_i)
+ 73: 72(ptr) AccessChain 70(uniformTexelBufferDyn) 71
+ 74: 67 Load 73
+ 76: 66 Image 74
+ 77: 39(fvec4) ImageFetch 76 75
+ 78: 36(float) CompositeExtract 77 0
+ 79: 36(float) Load 38(b)
+ 80: 36(float) FAdd 79 78
+ Store 38(b) 80
+ 85: 6(int) Load 54(dyn_i)
+ 87: 86(ptr) AccessChain 84(storageTexelBufferDyn) 85
+ 88: 81 Load 87
+ 89: 39(fvec4) ImageRead 88 75
+ 90: 36(float) CompositeExtract 89 0
+ 91: 36(float) Load 38(b)
+ 92: 36(float) FAdd 91 90
+ Store 38(b) 92
+ 99: 6(int) Load 98(nu_ii)
+ 101: 100(ptr) AccessChain 96(uniformBuffer) 99 59
+ 102: 36(float) Load 101
+ 103: 36(float) Load 38(b)
+ 104: 36(float) FAdd 103 102
+ Store 38(b) 104
+ 109: 6(int) Load 98(nu_ii)
+ 110: 100(ptr) AccessChain 108(storageBuffer) 109 59
+ 111: 36(float) Load 110
+ 112: 36(float) Load 38(b)
+ 113: 36(float) FAdd 112 111
+ Store 38(b) 113
+ 119: 6(int) Load 98(nu_ii)
+ 121: 120(ptr) AccessChain 118(sampledImage) 119
+ 122: 115 Load 121
+ 126: 39(fvec4) ImageSampleImplicitLod 122 125
+ 127: 36(float) CompositeExtract 126 0
+ 128: 36(float) Load 38(b)
+ 129: 36(float) FAdd 128 127
+ Store 38(b) 129
+ 134: 6(int) Load 98(nu_ii)
+ 136: 135(ptr) AccessChain 133(storageImage) 134
+ 137: 130 Load 136
+ 139: 39(fvec4) ImageRead 137 138
+ 140: 36(float) CompositeExtract 139 0
+ 141: 36(float) Load 38(b)
+ 142: 36(float) FAdd 141 140
+ Store 38(b) 142
+ 146: 6(int) Load 98(nu_ii)
+ 147: 56(ptr) AccessChain 145(inputAttachment) 146
+ 148: 50 Load 147
+ 149: 39(fvec4) ImageRead 148 61
+ 150: 36(float) CompositeExtract 149 0
+ 151: 36(float) Load 38(b)
+ 152: 36(float) FAdd 151 150
+ Store 38(b) 152
+ 156: 6(int) Load 98(nu_ii)
+ 157: 72(ptr) AccessChain 155(uniformTexelBuffer) 156
+ 158: 67 Load 157
+ 159: 66 Image 158
+ 160: 39(fvec4) ImageFetch 159 75
+ 161: 36(float) CompositeExtract 160 0
+ 162: 36(float) Load 38(b)
+ 163: 36(float) FAdd 162 161
+ Store 38(b) 163
+ 167: 6(int) Load 98(nu_ii)
+ 168: 86(ptr) AccessChain 166(storageTexelBuffer) 167
+ 169: 81 Load 168
+ 170: 39(fvec4) ImageRead 169 75
+ 171: 36(float) CompositeExtract 170 0
+ 172: 36(float) Load 38(b)
+ 173: 36(float) FAdd 172 171
+ Store 38(b) 173
+ 178: 6(int) Load 98(nu_ii)
+ 180: 179(ptr) AccessChain 177(uniformTexArr) 178
+ 181: 114 Load 180
+ 185: 182 Load 184(uniformSampler)
+ 186: 115 SampledImage 181 185
+ 189: 123(fvec2) Load 188(inTexcoord)
+ 190: 39(fvec4) ImageSampleImplicitLod 186 189
+ 191: 36(float) CompositeExtract 190 0
+ 192: 36(float) Load 38(b)
+ 193: 36(float) FAdd 192 191
+ Store 38(b) 193
+ 194: 6(int) Load 98(nu_ii)
+ 195: 179(ptr) AccessChain 177(uniformTexArr) 194
+ 196: 114 Load 195
+ 197: 182 Load 184(uniformSampler)
+ 198: 115 SampledImage 196 197
+ 199: 115 CopyObject 198
+ 200: 123(fvec2) Load 188(inTexcoord)
+ 201: 39(fvec4) ImageSampleImplicitLod 199 200
+ 202: 36(float) CompositeExtract 201 0
+ 203: 36(float) Load 38(b)
+ 204: 36(float) FAdd 203 202
+ Store 38(b) 204
+ 209: 7(ptr) AccessChain 207(v) 208
+ 210: 6(int) Load 209
+ 211: 100(ptr) AccessChain 96(uniformBuffer) 210 59
+ 212: 36(float) Load 211
+ 213: 36(float) Load 38(b)
+ 214: 36(float) FAdd 213 212
+ Store 38(b) 214
+ 216: 7(ptr) AccessChain 207(v) 215
+ 217: 6(int) Load 216
+ 218: 100(ptr) AccessChain 96(uniformBuffer) 217 59
+ 219: 36(float) Load 218
+ 220: 36(float) Load 38(b)
+ 221: 36(float) FAdd 220 219
+ Store 38(b) 221
+ 223: 6(int) Load 98(nu_ii)
+ 224: 7(ptr) AccessChain 222(uv) 223
+ 225: 6(int) Load 224
+ 226: 100(ptr) AccessChain 96(uniformBuffer) 225 59
+ 227: 36(float) Load 226
+ 228: 36(float) Load 38(b)
+ 229: 36(float) FAdd 228 227
+ Store 38(b) 229
+ 233: 37(ptr) AccessChain 232(m) 26 215
+ 234: 36(float) Load 233
+ 235: 6(int) ConvertFToS 234
+ 236: 100(ptr) AccessChain 96(uniformBuffer) 235 59
+ 237: 36(float) Load 236
+ 238: 36(float) Load 38(b)
+ 239: 36(float) FAdd 238 237
+ Store 38(b) 239
+ 243: 7(ptr) AccessChain 242(s) 59
+ 244: 6(int) Load 243
+ 245: 100(ptr) AccessChain 96(uniformBuffer) 244 59
+ 246: 36(float) Load 245
+ 247: 36(float) Load 38(b)
+ 248: 36(float) FAdd 247 246
+ Store 38(b) 248
+ 253: 7(ptr) AccessChain 252(arr) 26
+ 254: 6(int) Load 253
+ 255: 100(ptr) AccessChain 96(uniformBuffer) 254 59
+ 256: 36(float) Load 255
+ 257: 36(float) Load 38(b)
+ 258: 36(float) FAdd 257 256
+ Store 38(b) 258
+ 260: 6(int) Load 98(nu_ii)
+ 261: 37(ptr) AccessChain 259(um) 260 215
+ 262: 36(float) Load 261
+ 263: 6(int) ConvertFToS 262
+ 264: 100(ptr) AccessChain 96(uniformBuffer) 263 59
+ 265: 36(float) Load 264
+ 266: 36(float) Load 38(b)
+ 267: 36(float) FAdd 266 265
+ Store 38(b) 267
+ 271: 6(int) Load 98(nu_ii)
+ 272: 7(ptr) AccessChain 270(us) 59 271
+ 273: 6(int) Load 272
+ 274: 100(ptr) AccessChain 96(uniformBuffer) 273 59
+ 275: 36(float) Load 274
+ 276: 36(float) Load 38(b)
+ 277: 36(float) FAdd 276 275
+ Store 38(b) 277
+ 279: 6(int) Load 98(nu_ii)
+ 280: 7(ptr) AccessChain 278(uarr) 279
+ 281: 6(int) Load 280
+ 282: 100(ptr) AccessChain 96(uniformBuffer) 281 59
+ 283: 36(float) Load 282
+ 284: 36(float) Load 38(b)
+ 285: 36(float) FAdd 284 283
+ Store 38(b) 285
+ 286: 6(int) Load 98(nu_ii)
+ 287: 36(float) Load 38(b)
+ 288: 100(ptr) AccessChain 108(storageBuffer) 286 59
+ Store 288 287
Return
FunctionEnd
11(foo(i1;i1;): 6(int) Function None 8
diff --git a/Test/baseResults/spv.nonuniform4.frag.out b/Test/baseResults/spv.nonuniform4.frag.out
index 92cbd36..6bfc957 100644
--- a/Test/baseResults/spv.nonuniform4.frag.out
+++ b/Test/baseResults/spv.nonuniform4.frag.out
@@ -23,6 +23,7 @@
Decorate 13(rIndex) Flat
Decorate 13(rIndex) Location 3
Decorate 15 DecorationNonUniformEXT
+ Decorate 17 DecorationNonUniformEXT
Decorate 21 DecorationNonUniformEXT
2: TypeVoid
3: TypeFunction 2
diff --git a/Test/baseResults/spv.nullInit.comp.out b/Test/baseResults/spv.nullInit.comp.out
new file mode 100755
index 0000000..b7908b5
--- /dev/null
+++ b/Test/baseResults/spv.nullInit.comp.out
@@ -0,0 +1,65 @@
+spv.nullInit.comp
+// Module Version 10000
+// Generated by (magic number): 8000a
+// Id's are bound by 37
+
+ Capability Shader
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint GLCompute 4 "main"
+ ExecutionMode 4 LocalSize 1 1 1
+ Source GLSL 460
+ SourceExtension "GL_EXT_null_initializer"
+ Name 4 "main"
+ Name 12 "S"
+ MemberName 12(S) 0 "v"
+ MemberName 12(S) 1 "a"
+ Name 15 "local"
+ Name 23 "f"
+ Name 24 "T"
+ MemberName 24(T) 0 "b"
+ MemberName 24(T) 1 "s"
+ Name 27 "t1"
+ Name 28 "t2"
+ Name 30 "s"
+ Name 31 "g"
+ Name 34 "i"
+ Name 36 "global"
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeFloat 32
+ 7: TypeVector 6(float) 3
+ 8: TypeInt 32 0
+ 9: 8(int) Constant 4
+ 10: TypeArray 7(fvec3) 9
+ 11: TypeInt 32 1
+ 12(S): TypeStruct 10 11(int)
+ 13: 12(S) ConstantNull
+ 14: TypePointer Function 12(S)
+ 16: 11(int) Constant 1
+ 17: TypePointer Function 11(int)
+ 21: 6(float) ConstantNull
+ 22: TypePointer Workgroup 6(float)
+ 23(f): 22(ptr) Variable Workgroup 21
+ 24(T): TypeStruct 11(int) 12(S)
+ 25: 24(T) ConstantNull
+ 26: TypePointer Workgroup 24(T)
+ 27(t1): 26(ptr) Variable Workgroup 25
+ 28(t2): 26(ptr) Variable Workgroup 25
+ 29: TypePointer Workgroup 12(S)
+ 30(s): 29(ptr) Variable Workgroup 13
+ 31(g): 22(ptr) Variable Workgroup 21
+ 32: 11(int) ConstantNull
+ 33: TypePointer Workgroup 11(int)
+ 34(i): 33(ptr) Variable Workgroup 32
+ 35: TypePointer Private 12(S)
+ 36(global): 35(ptr) Variable Private 13
+ 4(main): 2 Function None 3
+ 5: Label
+ 15(local): 14(ptr) Variable Function 13
+ 18: 17(ptr) AccessChain 15(local) 16
+ 19: 11(int) Load 18
+ 20: 11(int) IAdd 19 16
+ Store 18 20
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.queueFamilyScope.comp.out b/Test/baseResults/spv.queueFamilyScope.comp.out
new file mode 100644
index 0000000..9c239df
--- /dev/null
+++ b/Test/baseResults/spv.queueFamilyScope.comp.out
@@ -0,0 +1,43 @@
+spv.queueFamilyScope.comp
+// Module Version 10300
+// Generated by (magic number): 8000a
+// Id's are bound by 21
+
+ Capability Shader
+ Capability VulkanMemoryModelKHR
+ Extension "SPV_KHR_vulkan_memory_model"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical VulkanKHR
+ EntryPoint GLCompute 4 "main"
+ ExecutionMode 4 LocalSize 1 1 1
+ Source GLSL 450
+ SourceExtension "GL_KHR_memory_scope_semantics"
+ Name 4 "main"
+ Name 7 "Buffer"
+ MemberName 7(Buffer) 0 "a"
+ Name 9 "A"
+ MemberDecorate 7(Buffer) 0 Offset 0
+ Decorate 7(Buffer) Block
+ Decorate 9(A) DescriptorSet 0
+ Decorate 9(A) Binding 0
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 0
+ 7(Buffer): TypeStruct 6(int)
+ 8: TypePointer StorageBuffer 7(Buffer)
+ 9(A): 8(ptr) Variable StorageBuffer
+ 10: TypeInt 32 1
+ 11: 10(int) Constant 0
+ 12: TypePointer StorageBuffer 6(int)
+ 14: 10(int) Constant 5
+ 15: 10(int) Constant 64
+ 16: 10(int) Constant 2
+ 17: 6(int) Constant 1
+ 18: 6(int) Constant 0
+ 19: 6(int) Constant 66
+ 4(main): 2 Function None 3
+ 5: Label
+ 13: 12(ptr) AccessChain 9(A) 11
+ 20: 6(int) AtomicLoad 13 14 19
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/spv.rw.autoassign.frag.out b/Test/baseResults/spv.rw.autoassign.frag.out
index 43adedd..c696c52 100644
--- a/Test/baseResults/spv.rw.autoassign.frag.out
+++ b/Test/baseResults/spv.rw.autoassign.frag.out
@@ -1,4 +1,5 @@
spv.rw.autoassign.frag
+Validation failed
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 42
diff --git a/Test/baseResults/spv.scalarlayout.frag.out b/Test/baseResults/spv.scalarlayout.frag.out
index 549efaa..e08721f 100644
--- a/Test/baseResults/spv.scalarlayout.frag.out
+++ b/Test/baseResults/spv.scalarlayout.frag.out
@@ -1,5 +1,4 @@
spv.scalarlayout.frag
-Validation failed
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 20
diff --git a/Test/baseResults/spv.scalarlayoutfloat16.frag.out b/Test/baseResults/spv.scalarlayoutfloat16.frag.out
index fc0dca8..4f22730 100644
--- a/Test/baseResults/spv.scalarlayoutfloat16.frag.out
+++ b/Test/baseResults/spv.scalarlayoutfloat16.frag.out
@@ -1,5 +1,4 @@
spv.scalarlayoutfloat16.frag
-Validation failed
// Module Version 10000
// Generated by (magic number): 8000a
// Id's are bound by 18
diff --git a/Test/baseResults/spv.stereoViewRendering.tesc.out b/Test/baseResults/spv.stereoViewRendering.tesc.out
index a357346..f01e53b 100644
--- a/Test/baseResults/spv.stereoViewRendering.tesc.out
+++ b/Test/baseResults/spv.stereoViewRendering.tesc.out
@@ -3,7 +3,6 @@
// Generated by (magic number): 8000a
// Id's are bound by 42
- Capability Geometry
Capability Tessellation
Capability ShaderViewportIndexLayerNV
Capability ShaderViewportMaskNV
diff --git a/Test/baseResults/spv.stereoViewRendering.vert.out b/Test/baseResults/spv.stereoViewRendering.vert.out
index 0667cb8..e74921a 100644
--- a/Test/baseResults/spv.stereoViewRendering.vert.out
+++ b/Test/baseResults/spv.stereoViewRendering.vert.out
@@ -4,7 +4,6 @@
// Id's are bound by 27
Capability Shader
- Capability Geometry
Capability ShaderViewportIndexLayerNV
Capability ShaderViewportMaskNV
Capability ShaderStereoViewNV
diff --git a/Test/baseResults/spv.viewportArray2.tesc.out b/Test/baseResults/spv.viewportArray2.tesc.out
index 6a9dccc..74235a5 100644
--- a/Test/baseResults/spv.viewportArray2.tesc.out
+++ b/Test/baseResults/spv.viewportArray2.tesc.out
@@ -4,9 +4,7 @@
// Generated by (magic number): 8000a
// Id's are bound by 25
- Capability Geometry
Capability Tessellation
- Capability MultiViewport
Capability ShaderViewportIndexLayerNV
Capability ShaderViewportMaskNV
Extension "SPV_EXT_shader_viewport_index_layer"
diff --git a/Test/baseResults/spv.viewportArray2.vert.out b/Test/baseResults/spv.viewportArray2.vert.out
index 96e5b07..cf29cd7 100644
--- a/Test/baseResults/spv.viewportArray2.vert.out
+++ b/Test/baseResults/spv.viewportArray2.vert.out
@@ -4,8 +4,6 @@
// Id's are bound by 19
Capability Shader
- Capability Geometry
- Capability MultiViewport
Capability ShaderViewportIndexLayerNV
Capability ShaderViewportMaskNV
Extension "SPV_EXT_shader_viewport_index_layer"
diff --git a/Test/baseResults/spv.viewportindex.tese.out b/Test/baseResults/spv.viewportindex.tese.out
new file mode 100644
index 0000000..12a30cf
--- /dev/null
+++ b/Test/baseResults/spv.viewportindex.tese.out
@@ -0,0 +1,30 @@
+spv.viewportindex.tese
+// Module Version 10000
+// Generated by (magic number): 8000a
+// Id's are bound by 10
+
+ Capability Tessellation
+ Capability ShaderViewportIndexLayerNV
+ Extension "SPV_EXT_shader_viewport_index_layer"
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint TessellationEvaluation 4 "main" 8
+ ExecutionMode 4 Triangles
+ ExecutionMode 4 SpacingEqual
+ ExecutionMode 4 VertexOrderCcw
+ Source GLSL 450
+ SourceExtension "GL_ARB_shader_viewport_layer_array"
+ Name 4 "main"
+ Name 8 "gl_ViewportIndex"
+ Decorate 8(gl_ViewportIndex) BuiltIn ViewportIndex
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeInt 32 1
+ 7: TypePointer Output 6(int)
+8(gl_ViewportIndex): 7(ptr) Variable Output
+ 9: 6(int) Constant 1
+ 4(main): 2 Function None 3
+ 5: Label
+ Store 8(gl_ViewportIndex) 9
+ Return
+ FunctionEnd
diff --git a/Test/baseResults/vulkan.comp.out b/Test/baseResults/vulkan.comp.out
index e56dca4..3edb619 100644
--- a/Test/baseResults/vulkan.comp.out
+++ b/Test/baseResults/vulkan.comp.out
@@ -1,6 +1,17 @@
vulkan.comp
ERROR: 0:5: 'local_size' : cannot change previously set size
-ERROR: 1 compilation errors. No code generated.
+ERROR: 0:10: 'empty { } initializer' : not supported for this version or the enabled extensions
+ERROR: 0:15: 'empty { } initializer' : not supported for this version or the enabled extensions
+ERROR: 0:15: 'initialization with shared qualifier' : not supported for this version or the enabled extensions
+ERROR: 0:16: 'empty { } initializer' : not supported for this version or the enabled extensions
+ERROR: 0:26: '{}' : null initializers can't size unsized arrays
+ERROR: 0:31: 'structure' : non-uniform struct contains a sampler or image: sampVar
+ERROR: 0:31: '{}' : null initializers can't be used on opaque values
+ERROR: 0:33: 'atomic counter types' : not allowed when using GLSL for Vulkan
+ERROR: 0:33: 'atomic_uint' : atomic_uints can only be used in uniform variables or function parameters: a
+ERROR: 0:33: '{}' : null initializers can't be used on opaque values
+ERROR: 0:33: 'atomic_uint' : layout(binding=X) is required
+ERROR: 12 compilation errors. No code generated.
SPIR-V is not generated for failed compile or link
diff --git a/Test/hlsl.round.dx10.frag b/Test/hlsl.round.dx10.frag
new file mode 100644
index 0000000..cd88334
--- /dev/null
+++ b/Test/hlsl.round.dx10.frag
@@ -0,0 +1,4 @@
+float4 PixelShaderFunction(float4 input) : COLOR0
+{
+ return round(input);
+}
diff --git a/Test/hlsl.round.dx9.frag b/Test/hlsl.round.dx9.frag
new file mode 100644
index 0000000..cd88334
--- /dev/null
+++ b/Test/hlsl.round.dx9.frag
@@ -0,0 +1,4 @@
+float4 PixelShaderFunction(float4 input) : COLOR0
+{
+ return round(input);
+}
diff --git a/Test/rayQuery-global.rgen b/Test/rayQuery-global.rgen
new file mode 100644
index 0000000..3a57e74
--- /dev/null
+++ b/Test/rayQuery-global.rgen
@@ -0,0 +1,31 @@
+#version 460
+#extension GL_EXT_ray_query : enable
+#extension GL_EXT_ray_flags_primitive_culling : enable
+
+layout(binding = 1, set = 0) uniform accelerationStructureEXT rtas;
+
+rayQueryEXT rqGlobal;
+
+void otherWrapper(rayQueryEXT rq) {
+ rayQueryProceedEXT(rq);
+ rayQueryProceedEXT(rqGlobal);
+}
+
+void wrapper(rayQueryEXT rq) {
+ rayQueryEXT rq2;
+ rayQueryProceedEXT(rq);
+ rayQueryProceedEXT(rqGlobal);
+ otherWrapper(rq);
+ otherWrapper(rq2);
+ otherWrapper(rqGlobal);
+}
+
+void main() {
+ rayQueryInitializeEXT(rqGlobal, rtas, gl_RayFlagsNoneEXT, 0xFF, vec3(0,0,0), 0.0, vec3(1,0,0), 1.0);
+ wrapper(rqGlobal);
+ otherWrapper(rqGlobal);
+ rayQueryEXT rq2;
+ rayQueryInitializeEXT(rq2, rtas, gl_RayFlagsNoneEXT, 0xFF, vec3(0,0,0), 0.0, vec3(1,0,0), 1.0);
+ wrapper(rq2);
+ otherWrapper(rq2);
+}
diff --git a/Test/rayQuery-types.comp b/Test/rayQuery-types.comp
new file mode 100644
index 0000000..c70a3fc
--- /dev/null
+++ b/Test/rayQuery-types.comp
@@ -0,0 +1,45 @@
+#version 460
+#extension GL_EXT_ray_query : require
+
+layout(local_size_x = 16, local_size_y = 8, local_size_z = 1) in;
+
+layout(binding = 0, set = 0) uniform accelerationStructureEXT tlas;
+
+void main()
+{
+ rayQueryEXT rayQuery;
+ rayQueryInitializeEXT(rayQuery, // Ray query
+ tlas, // Top-level acceleration structure
+ 0, // Ray flags
+ 0xFF, // 8-bit instance mask
+ vec3(0), // Ray origin
+ 0.0, // Minimum t-value
+ vec3(1, 0, 0), // Ray direction
+ 10000.0); // Maximum t-value
+
+ // yes this is silly, just want to verify the return types
+ bool rq_proceed = rayQueryProceedEXT(rayQuery);
+ while(rq_proceed)
+ {
+ rq_proceed = rayQueryProceedEXT(rayQuery);
+ }
+
+ const uint intersectionType = rayQueryGetIntersectionTypeEXT(rayQuery, true);
+ const float rayTMin = rayQueryGetRayTMinEXT(rayQuery);
+ const uint rayFlags = rayQueryGetRayFlagsEXT(rayQuery);
+ const vec3 worldRayOrigin = rayQueryGetWorldRayOriginEXT(rayQuery);
+ const vec3 worldDirection = rayQueryGetWorldRayDirectionEXT(rayQuery);
+ const float intersectionT = rayQueryGetIntersectionTEXT(rayQuery, true);
+ const int customIndex = rayQueryGetIntersectionInstanceCustomIndexEXT(rayQuery, true);
+ const int instanceId = rayQueryGetIntersectionInstanceIdEXT(rayQuery, true);
+ const uint sbtOffset = rayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetEXT(rayQuery, true);
+ const int geometryIndex = rayQueryGetIntersectionGeometryIndexEXT(rayQuery, true);
+ const int primitiveIndex = rayQueryGetIntersectionPrimitiveIndexEXT(rayQuery, true);
+ const vec2 barys = rayQueryGetIntersectionBarycentricsEXT(rayQuery, true);
+ const bool frontface = rayQueryGetIntersectionFrontFaceEXT(rayQuery, true);
+ const bool aabbOpaque = rayQueryGetIntersectionCandidateAABBOpaqueEXT(rayQuery);
+ const vec3 objRayDirection = rayQueryGetIntersectionObjectRayDirectionEXT(rayQuery, true);
+ const vec3 objRayOrigin = rayQueryGetIntersectionObjectRayOriginEXT(rayQuery, true);
+ const mat4x3 objToWorld = rayQueryGetIntersectionObjectToWorldEXT(rayQuery, true);
+ const mat4x3 worldToObj = rayQueryGetIntersectionWorldToObjectEXT(rayQuery, true);
+}
diff --git a/Test/runtests b/Test/runtests
index df07046..51f1a6a 100755
--- a/Test/runtests
+++ b/Test/runtests
@@ -169,7 +169,7 @@
-G -H spv.debugInfo.frag --rsb frag 3 > $TARGETDIR/spv.debugInfo.frag.out
diff -b $BASEDIR/spv.debugInfo.frag.out $TARGETDIR/spv.debugInfo.frag.out || HASERROR=1
run -g -Od --target-env vulkan1.1 --relaxed-errors --suppress-warnings --aml --amb --hlsl-offsets --nsf --spirv-val \
- -G -H spv.debugInfo.frag --rsb frag 3 > $TARGETDIR/spv.debugInfo.1.1.frag.out
+ -V -H spv.debugInfo.frag --rsb frag 3 > $TARGETDIR/spv.debugInfo.1.1.frag.out
diff -b $BASEDIR/spv.debugInfo.1.1.frag.out $TARGETDIR/spv.debugInfo.1.1.frag.out || HASERROR=1
run -g -D -Od -e newMain -g --amb --aml --fua --hlsl-iomap --nsf --spirv-val --sib 1 --ssb 2 --sbb 3 --stb 4 --suavb 5 --sub 6 \
--sep origMain -H -Od spv.hlslDebugInfo.vert --rsb vert t0 0 0 > $TARGETDIR/spv.hlslDebugInfo.frag.out
diff --git a/Test/spv.MissShader.rmiss b/Test/spv.MissShader.rmiss
index 06113de..3c6b31c 100644
--- a/Test/spv.MissShader.rmiss
+++ b/Test/spv.MissShader.rmiss
@@ -9,8 +9,7 @@
uvec3 v1 = gl_LaunchSizeNV;
vec3 v2 = gl_WorldRayOriginNV;
vec3 v3 = gl_WorldRayDirectionNV;
- vec3 v4 = gl_ObjectRayOriginNV;
- vec3 v5 = gl_ObjectRayDirectionNV;
+ uint v4 = gl_IncomingRayFlagsNV;
float v6 = gl_RayTminNV;
float v7 = gl_RayTmaxNV;
traceNV(accNV, 0u, 1u, 2u, 3u, 0u, vec3(0.5f), 0.5f, vec3(1.0f), 0.75f, 1);
diff --git a/Test/spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp b/Test/spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp
new file mode 100644
index 0000000..e06555e
--- /dev/null
+++ b/Test/spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp
@@ -0,0 +1,18 @@
+#version 430 core
+
+#extension GL_EXT_shared_memory_block : enable
+#extension GL_EXT_shader_explicit_arithmetic_types: enable
+
+layout(local_size_x = 2) in;
+
+shared first
+{
+ int16_t a;
+ float16_t f;
+};
+
+void main()
+{
+ a = int16_t(3);
+ f = float16_t(12.3);
+}
diff --git a/Test/spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp b/Test/spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp
new file mode 100644
index 0000000..aaa512c
--- /dev/null
+++ b/Test/spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp
@@ -0,0 +1,16 @@
+#version 430 core
+
+#extension GL_EXT_shared_memory_block : enable
+#extension GL_EXT_shader_explicit_arithmetic_types: enable
+
+layout(local_size_x = 2) in;
+
+shared first
+{
+ int8_t a;
+};
+
+void main()
+{
+ a = int8_t(2);
+}
diff --git a/Test/spv.WorkgroupMemoryExplicitLayout.MixBlockNonBlock_Errors.comp b/Test/spv.WorkgroupMemoryExplicitLayout.MixBlockNonBlock_Errors.comp
new file mode 100644
index 0000000..573d092
--- /dev/null
+++ b/Test/spv.WorkgroupMemoryExplicitLayout.MixBlockNonBlock_Errors.comp
@@ -0,0 +1,20 @@
+#version 430 core
+
+#extension GL_EXT_shared_memory_block : enable
+
+layout(local_size_x = 8) in;
+
+shared first
+{
+ int a;
+};
+
+shared int b;
+
+// Cannot mix shared block and shared non-block, will fail at linking.
+
+void main()
+{
+ a = 2;
+ b = 3;
+}
diff --git a/Test/spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp b/Test/spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp
new file mode 100644
index 0000000..675a443
--- /dev/null
+++ b/Test/spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp
@@ -0,0 +1,21 @@
+#version 430 core
+
+#extension GL_EXT_shared_memory_block : enable
+
+layout(local_size_x = 8) in;
+
+shared first
+{
+ int a;
+};
+
+shared second
+{
+ int b;
+};
+
+void main()
+{
+ a = 2;
+ b = 3;
+}
diff --git a/Test/spv.WorkgroupMemoryExplicitLayout.NonBlock.comp b/Test/spv.WorkgroupMemoryExplicitLayout.NonBlock.comp
new file mode 100644
index 0000000..38316a5
--- /dev/null
+++ b/Test/spv.WorkgroupMemoryExplicitLayout.NonBlock.comp
@@ -0,0 +1,14 @@
+#version 430 core
+
+#extension GL_EXT_shared_memory_block : enable
+
+layout(local_size_x = 8) in;
+
+shared int a;
+shared int b;
+
+void main()
+{
+ a = 2;
+ b = 3;
+}
diff --git a/Test/spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp b/Test/spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp
new file mode 100644
index 0000000..2a17c61
--- /dev/null
+++ b/Test/spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp
@@ -0,0 +1,15 @@
+#version 430 core
+
+#extension GL_EXT_shared_memory_block : enable
+
+layout(local_size_x = 8) in;
+
+shared first
+{
+ int a;
+};
+
+void main()
+{
+ a = 2;
+}
diff --git a/Test/spv.WorkgroupMemoryExplicitLayout.scalar.comp b/Test/spv.WorkgroupMemoryExplicitLayout.scalar.comp
new file mode 100644
index 0000000..38085b4
--- /dev/null
+++ b/Test/spv.WorkgroupMemoryExplicitLayout.scalar.comp
@@ -0,0 +1,39 @@
+#version 430 core
+
+#extension GL_EXT_scalar_block_layout : enable
+#extension GL_EXT_shared_memory_block : enable
+
+layout(local_size_x = 8) in;
+
+struct T
+{
+ float t[3];
+};
+
+struct S
+{
+ float f;
+ vec2 v2;
+ vec3 v3;
+ vec4 v4;
+ T t;
+
+ float f_array[6];
+ vec2 v2_array[6];
+ vec3 v3_array[6];
+ vec4 v4_array[6];
+ T t_array[6];
+};
+
+// Use a default qualifier.
+layout(scalar) shared;
+
+shared Block
+{
+ S s;
+ S s_array[6];
+};
+
+void main()
+{
+}
diff --git a/Test/spv.WorkgroupMemoryExplicitLayout.std140.comp b/Test/spv.WorkgroupMemoryExplicitLayout.std140.comp
new file mode 100644
index 0000000..f4f2475
--- /dev/null
+++ b/Test/spv.WorkgroupMemoryExplicitLayout.std140.comp
@@ -0,0 +1,35 @@
+#version 430 core
+
+#extension GL_EXT_shared_memory_block : enable
+
+layout(local_size_x = 8) in;
+
+struct T
+{
+ float t[3];
+};
+
+struct S
+{
+ float f;
+ vec2 v2;
+ vec3 v3;
+ vec4 v4;
+ T t;
+
+ float f_array[6];
+ vec2 v2_array[6];
+ vec3 v3_array[6];
+ vec4 v4_array[6];
+ T t_array[6];
+};
+
+layout(std140) shared Block
+{
+ S s;
+ S s_array[6];
+};
+
+void main()
+{
+}
diff --git a/Test/spv.WorkgroupMemoryExplicitLayout.std430.comp b/Test/spv.WorkgroupMemoryExplicitLayout.std430.comp
new file mode 100644
index 0000000..717593b
--- /dev/null
+++ b/Test/spv.WorkgroupMemoryExplicitLayout.std430.comp
@@ -0,0 +1,35 @@
+#version 430 core
+
+#extension GL_EXT_shared_memory_block : enable
+
+layout(local_size_x = 8) in;
+
+struct T
+{
+ float t[3];
+};
+
+struct S
+{
+ float f;
+ vec2 v2;
+ vec3 v3;
+ vec4 v4;
+ T t;
+
+ float f_array[6];
+ vec2 v2_array[6];
+ vec3 v3_array[6];
+ vec4 v4_array[6];
+ T t_array[6];
+};
+
+layout(std430) shared Block
+{
+ S s;
+ S s_array[6];
+};
+
+void main()
+{
+}
diff --git a/Test/spv.ext.AccelDecl.frag b/Test/spv.ext.AccelDecl.frag
new file mode 100644
index 0000000..4374bf3
--- /dev/null
+++ b/Test/spv.ext.AccelDecl.frag
@@ -0,0 +1,14 @@
+#version 460
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_EXT_nonuniform_qualifier : enable
+#extension GL_GOOGLE_include_directive : enable
+#extension GL_EXT_scalar_block_layout : enable
+#extension GL_EXT_ray_query : enable
+
+layout(location = 0) out vec4 outColor;
+
+layout(binding = 1, set = 0) uniform accelerationStructureEXT topLevelAS;
+
+void main() {
+ outColor = vec4(0.0);
+}
diff --git a/Test/spv.ext.AnyHitShader.rahit b/Test/spv.ext.AnyHitShader.rahit
index ee7d9c7..871f8fe 100644
--- a/Test/spv.ext.AnyHitShader.rahit
+++ b/Test/spv.ext.AnyHitShader.rahit
@@ -1,5 +1,6 @@
#version 460
#extension GL_EXT_ray_tracing : enable
+#extension GL_KHR_shader_subgroup_basic : enable
layout(location = 1) rayPayloadInEXT vec4 incomingPayload;
void main()
{
@@ -22,8 +23,10 @@
mat3x4 v16 = gl_ObjectToWorld3x4EXT;
mat3x4 v17 = gl_WorldToObject3x4EXT;
incomingPayload = vec4(0.5f);
- if (v2 == 1)
- ignoreIntersectionEXT();
- else
- terminateRayEXT();
+ if (v2 == 1) {
+ ignoreIntersectionEXT;
+ v0.x++;
+ }
+ incomingPayload.x += float(gl_SubgroupSize);
+ terminateRayEXT;
}
diff --git a/Test/spv.ext.ClosestHitShader_Errors.rchit b/Test/spv.ext.ClosestHitShader_Errors.rchit
index 05e05fe..6416f1f 100644
--- a/Test/spv.ext.ClosestHitShader_Errors.rchit
+++ b/Test/spv.ext.ClosestHitShader_Errors.rchit
@@ -2,12 +2,14 @@
#extension GL_EXT_ray_tracing : enable
hitAttributeEXT vec4 payload;
layout(binding = 0, set = 0) uniform accelerationStructureEXT accEXT;
-
+layout(location = 2) rayPayloadEXT vec4 payload0;
+layout(location = 2) rayPayloadInEXT block { vec4 data; }; // ERROR : location already used
void main()
{
payload.x = 1.0f; // ERROR, cannot write to hitattributeEXT in stage
reportIntersectionEXT(1.0, 1U); // ERROR, unsupported builtin in stage
- terminateRayEXT();
- ignoreIntersectionEXT();
+ terminateRayEXT;
+ ignoreIntersectionEXT;
bool e1 = gl_IncomingRayFlagsEXT == gl_RayFlagsSkipAABBEXT;
+ traceRayEXT(accEXT, 0, 0, 0, 0, 0, vec3(0.0), 0.0, vec3(1.0), 1.0, 0); //ERROR no payload variable with location = 0
}
diff --git a/Test/spv.ext.ClosestHitShader_Subgroup.rchit b/Test/spv.ext.ClosestHitShader_Subgroup.rchit
new file mode 100644
index 0000000..ce2091a
--- /dev/null
+++ b/Test/spv.ext.ClosestHitShader_Subgroup.rchit
@@ -0,0 +1,16 @@
+#version 460
+#pragma use_vulkan_memory_model
+#extension GL_EXT_ray_tracing : enable
+#extension GL_NV_shader_sm_builtins : enable
+#extension GL_KHR_shader_subgroup_ballot : enable
+#extension GL_ARB_shader_ballot : enable
+#extension GL_NV_shader_sm_builtins : enable
+layout(binding = 0, set = 0) uniform accelerationStructureEXT accEXT;
+layout(location = 1) rayPayloadInEXT vec4 incomingPayload;
+void main()
+{
+ traceRayEXT(accEXT, 0u, 1u, 2u, 3u, 0u, vec3(0.5f), 0.5f, vec3(1.0f), 0.75f, 1);
+ incomingPayload.x = float(gl_SubgroupInvocationID) + float(gl_SubGroupGeMaskARB) +
+ float(gl_SubgroupGtMask) + float(gl_SubgroupLeMask) +
+ float(gl_SubGroupLtMaskARB) + float(gl_SMIDNV);
+}
diff --git a/Test/spv.ext.MissShader.rmiss b/Test/spv.ext.MissShader.rmiss
index e774334..982bd84 100644
--- a/Test/spv.ext.MissShader.rmiss
+++ b/Test/spv.ext.MissShader.rmiss
@@ -1,5 +1,9 @@
#version 460
#extension GL_EXT_ray_tracing : enable
+#extension GL_NV_shader_sm_builtins : enable
+#extension GL_KHR_shader_subgroup_ballot : enable
+#extension GL_ARB_shader_ballot : enable
+#extension GL_NV_shader_sm_builtins : enable
layout(binding = 0, set = 0) uniform accelerationStructureEXT accEXT;
layout(location = 0) rayPayloadEXT vec4 localPayload;
layout(location = 1) rayPayloadInEXT vec4 incomingPayload;
@@ -12,4 +16,5 @@
float v4 = gl_RayTminEXT;
float v5 = gl_RayTmaxEXT;
traceRayEXT(accEXT, 0u, 1u, 2u, 3u, 0u, vec3(0.5f), 0.5f, vec3(1.0f), 0.75f, 1);
+ incomingPayload.x = float(gl_SubGroupSizeARB) + float(gl_SubgroupEqMask) + float(gl_WarpIDNV);
}
diff --git a/Test/spv.ext.MissShader_Errors.rmiss b/Test/spv.ext.MissShader_Errors.rmiss
index 2391211..c921f23 100644
--- a/Test/spv.ext.MissShader_Errors.rmiss
+++ b/Test/spv.ext.MissShader_Errors.rmiss
@@ -11,6 +11,6 @@
float e12 = gl_HitTEXT; // ERROR, unsupported builtin in stage
float e13 = gl_HitKindEXT; // ERROR, unsupported builtin in stage
reportIntersectionEXT(1.0, 1U); // ERROR, unsupported builtin in stage
- ignoreIntersectionEXT(); // ERROR, unsupported builtin in stage
- terminateRayEXT(); // ERROR, unsupported builtin in stage
+ ignoreIntersectionEXT; // ERROR, unsupported in stage
+ terminateRayEXT; // ERROR, unsupported in stage
}
diff --git a/Test/spv.ext.RayCallable_Errors.rcall b/Test/spv.ext.RayCallable_Errors.rcall
index d35672e..660ea75 100644
--- a/Test/spv.ext.RayCallable_Errors.rcall
+++ b/Test/spv.ext.RayCallable_Errors.rcall
@@ -3,7 +3,8 @@
hitAttributeEXT vec4 hitattr; // ERROR, hitattributeEXT unsupported in this stage
rayPayloadEXT vec4 payload; // ERROR, rayPayloadEXT unsupported in this stage
rayPayloadInEXT vec4 payloadIn; // ERROR, rayPayloadInEXT unsupported in this stage
-
+layout(location = 0) callableDataEXT vec4 cd0;
+layout(location = 0) callableDataEXT float cd1; // ERROR, location already used
void main()
{
int e0 = gl_PrimitiveID; // ERROR, unsupported builtin in stage
@@ -21,6 +22,7 @@
float e13 = gl_HitKindEXT; // ERROR, unsupported builtin in stage
uint curFlags = gl_IncomingRayFlagsEXT; // ERROR, unsupported builtin in stage
reportIntersectionEXT(1.0, 1U); // ERROR, unsupported builtin in stage
- ignoreIntersectionEXT(); // ERROR, unsupported builtin in stage
- terminateRayEXT(); // ERROR, unsupported builtin in stage
+ ignoreIntersectionEXT; // ERROR, unsupported in stage
+ terminateRayEXT; // ERROR, unsupported in stage
+ executeCallableEXT(1,1); // ERROR, no callable data with location 1
}
diff --git a/Test/spv.ext.RayConstants.rgen b/Test/spv.ext.RayConstants.rgen
index 73cb0c1..8e681ba 100644
--- a/Test/spv.ext.RayConstants.rgen
+++ b/Test/spv.ext.RayConstants.rgen
@@ -1,7 +1,7 @@
#version 460
#extension GL_EXT_ray_tracing : enable
layout(binding = 0, set = 0) uniform accelerationStructureEXT accEXT;
-layout(location = 0) rayPayloadEXT vec4 payload;
+layout(location = 1) rayPayloadEXT vec4 payload;
void main()
{
const uint rayFlags = gl_RayFlagsNoneEXT | gl_RayFlagsOpaqueEXT |
diff --git a/Test/spv.ext.RayGenSBTlayout.rgen b/Test/spv.ext.RayGenSBTlayout.rgen
new file mode 100644
index 0000000..a5fa2b6
--- /dev/null
+++ b/Test/spv.ext.RayGenSBTlayout.rgen
@@ -0,0 +1,28 @@
+#version 460
+#extension GL_EXT_ray_tracing : enable
+#extension GL_ARB_gpu_shader_int64 : enable
+layout(location = 1) rayPayloadEXT vec4 payload;
+// should get std430 layout
+layout(shaderRecordEXT) buffer block
+{
+ vec3 dir;
+ vec3 origin;
+ int i;
+ uvec2 aHandle32;
+ uint64_t aHandle64;
+ vec2 arr2[2];
+ float a;
+ vec3 arr3[2];
+ float packme;
+ vec2 b;
+ float c;
+};
+void main()
+{
+ uint lx = gl_LaunchIDEXT.x;
+ uint ly = gl_LaunchIDEXT.y;
+ uint sx = gl_LaunchSizeEXT.x;
+ uint sy = gl_LaunchSizeEXT.y;
+ traceRayEXT(accelerationStructureEXT(aHandle32), lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
+ traceRayEXT(accelerationStructureEXT(aHandle64), lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
+}
diff --git a/Test/spv.ext.RayGenSBTlayout140.rgen b/Test/spv.ext.RayGenSBTlayout140.rgen
new file mode 100644
index 0000000..7d673a8
--- /dev/null
+++ b/Test/spv.ext.RayGenSBTlayout140.rgen
@@ -0,0 +1,27 @@
+#version 460
+#extension GL_EXT_ray_tracing : enable
+#extension GL_ARB_gpu_shader_int64 : enable
+layout(location = 1) rayPayloadEXT vec4 payload;
+layout(shaderRecordEXT, std140) buffer block
+{
+ vec3 dir;
+ vec3 origin;
+ int i;
+ uvec2 aHandle32;
+ uint64_t aHandle64;
+ vec2 arr[2];
+ float a;
+ vec3 arr3[2];
+ float packme;
+ vec2 b;
+ float c;
+};
+void main()
+{
+ uint lx = gl_LaunchIDEXT.x;
+ uint ly = gl_LaunchIDEXT.y;
+ uint sx = gl_LaunchSizeEXT.x;
+ uint sy = gl_LaunchSizeEXT.y;
+ traceRayEXT(accelerationStructureEXT(aHandle32), lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
+ traceRayEXT(accelerationStructureEXT(aHandle64), lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
+}
diff --git a/Test/spv.ext.RayGenSBTlayout430.rgen b/Test/spv.ext.RayGenSBTlayout430.rgen
new file mode 100644
index 0000000..bd308b4
--- /dev/null
+++ b/Test/spv.ext.RayGenSBTlayout430.rgen
@@ -0,0 +1,27 @@
+#version 460
+#extension GL_EXT_ray_tracing : enable
+#extension GL_ARB_gpu_shader_int64 : enable
+layout(location = 1) rayPayloadEXT vec4 payload;
+layout(shaderRecordEXT, std430) buffer block
+{
+ vec3 dir;
+ vec3 origin;
+ int i;
+ uvec2 aHandle32;
+ uint64_t aHandle64;
+ vec2 arr[2];
+ float a;
+ vec3 arr3[2];
+ float packme;
+ vec2 b;
+ float c;
+};
+void main()
+{
+ uint lx = gl_LaunchIDEXT.x;
+ uint ly = gl_LaunchIDEXT.y;
+ uint sx = gl_LaunchSizeEXT.x;
+ uint sy = gl_LaunchSizeEXT.y;
+ traceRayEXT(accelerationStructureEXT(aHandle32), lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
+ traceRayEXT(accelerationStructureEXT(aHandle64), lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
+}
diff --git a/Test/spv.ext.RayGenSBTlayoutscalar.rgen b/Test/spv.ext.RayGenSBTlayoutscalar.rgen
new file mode 100644
index 0000000..16bcb13
--- /dev/null
+++ b/Test/spv.ext.RayGenSBTlayoutscalar.rgen
@@ -0,0 +1,28 @@
+#version 460
+#extension GL_EXT_ray_tracing : enable
+#extension GL_ARB_gpu_shader_int64 : enable
+#extension GL_EXT_scalar_block_layout : enable
+layout(location = 1) rayPayloadEXT vec4 payload;
+layout(shaderRecordEXT, scalar) buffer block
+{
+ vec3 dir;
+ vec3 origin;
+ int i;
+ uvec2 aHandle32;
+ uint64_t aHandle64;
+ vec2 arr[2];
+ float a;
+ vec3 arr3[2];
+ float packme;
+ vec2 b;
+ float c;
+};
+void main()
+{
+ uint lx = gl_LaunchIDEXT.x;
+ uint ly = gl_LaunchIDEXT.y;
+ uint sx = gl_LaunchSizeEXT.x;
+ uint sy = gl_LaunchSizeEXT.y;
+ traceRayEXT(accelerationStructureEXT(aHandle32), lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
+ traceRayEXT(accelerationStructureEXT(aHandle64), lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
+}
diff --git a/Test/spv.ext.RayGenShader.rgen b/Test/spv.ext.RayGenShader.rgen
index 9fedf3a..e9eb2cb 100644
--- a/Test/spv.ext.RayGenShader.rgen
+++ b/Test/spv.ext.RayGenShader.rgen
@@ -4,7 +4,7 @@
layout(binding = 0) uniform accelerationStructureEXT accEXT0;
layout(binding = 1, set = 0) uniform accelerationStructureEXT accEXT1; // Unused
layout(binding = 2, r32ui) shadercallcoherent uniform uimage2D imageu;
-layout(location = 0) rayPayloadEXT vec4 payload;
+layout(location = 1) rayPayloadEXT vec4 payload;
layout(shaderRecordEXT) buffer block
{
vec3 dir;
diff --git a/Test/spv.ext.RayGenShader11.rgen b/Test/spv.ext.RayGenShader11.rgen
index 4817026..50853d4 100644
--- a/Test/spv.ext.RayGenShader11.rgen
+++ b/Test/spv.ext.RayGenShader11.rgen
@@ -1,7 +1,7 @@
#version 460
#extension GL_EXT_ray_tracing : enable
layout(binding = 0, set = 0) uniform accelerationStructureEXT accEXT;
-layout(location = 0) rayPayloadEXT vec4 payload;
+layout(location = 1) rayPayloadEXT vec4 payload;
layout(shaderRecordEXT) buffer block
{
vec3 dir;
diff --git a/Test/spv.ext.RayGenShaderArray.rgen b/Test/spv.ext.RayGenShaderArray.rgen
index d3f99de..66286d9 100644
--- a/Test/spv.ext.RayGenShaderArray.rgen
+++ b/Test/spv.ext.RayGenShaderArray.rgen
@@ -1,14 +1,17 @@
#version 460
#extension GL_EXT_ray_tracing : enable
#extension GL_EXT_nonuniform_qualifier : enable
+#extension GL_ARB_gpu_shader_int64 : enable
layout(binding = 0, set = 0) uniform accelerationStructureEXT accEXT0[];
layout(binding = 1, set = 0) uniform accelerationStructureEXT accEXT1[2];
-layout(location = 0) rayPayloadEXT vec4 payload;
+layout(location = 1) rayPayloadEXT vec4 payload;
layout(shaderRecordEXT) buffer block
{
vec3 dir;
vec3 origin;
int i;
+ uvec2 aHandle32;
+ uint64_t aHandle64;
};
void main()
{
@@ -19,4 +22,6 @@
traceRayEXT(accEXT0[i], lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
traceRayEXT(accEXT1[i], lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
traceRayEXT(accEXT0[nonuniformEXT(i)], lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
+ traceRayEXT(accelerationStructureEXT(aHandle32), lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
+ traceRayEXT(accelerationStructureEXT(aHandle64), lx, ly, sx, sy, 0u, origin, 0.5f, dir, 0.75f, 1);
}
diff --git a/Test/spv.ext.RayGenShader_Errors.rgen b/Test/spv.ext.RayGenShader_Errors.rgen
index 3498342..107df0f 100644
--- a/Test/spv.ext.RayGenShader_Errors.rgen
+++ b/Test/spv.ext.RayGenShader_Errors.rgen
@@ -20,7 +20,7 @@
};
void main()
{
- accelerationStructureEXT a = 0;
+ accelerationStructureEXT a = accelerationStructureEXT(c);
int e0 = gl_PrimitiveID; // ERROR, unsupported builtin in stage
int e1 = gl_InstanceID; // ERROR, unsupported builtin in stage
int e3 = gl_InstanceCustomIndexEXT; // ERROR, unsupported builtin in stage
@@ -36,7 +36,7 @@
float e13 = gl_HitKindEXT; // ERROR, unsupported builtin in stage
int e14 = gl_RayFlagsSkipAABBEXT; // ERROR, unsupported builtin in stage
reportIntersectionEXT(1.0, 1U); // ERROR, unsupported builtin in stage
- ignoreIntersectionEXT(); // ERROR, unsupported builtin in stage
- terminateRayEXT(); // ERROR, unsupported builtin in stage
- d = 1.0f; // ERROR, can't modify shaderRecordEXT block
+ ignoreIntersectionEXT; // ERROR, unsupported builtin in stage
+ terminateRayEXT; // ERROR, unsupported builtin in stage
+ d = 1.0f; // ERROR, can't modify shaderRecordEXT block
}
diff --git a/Test/spv.ext.RayQueryDecl.frag b/Test/spv.ext.RayQueryDecl.frag
new file mode 100644
index 0000000..8a144d6
--- /dev/null
+++ b/Test/spv.ext.RayQueryDecl.frag
@@ -0,0 +1,14 @@
+#version 460
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_EXT_nonuniform_qualifier : enable
+#extension GL_GOOGLE_include_directive : enable
+#extension GL_EXT_scalar_block_layout : enable
+#extension GL_EXT_ray_query : enable
+
+layout(location = 0) out vec4 outColor;
+
+rayQueryEXT rq;
+
+void main() {
+ outColor = vec4(0.0);
+}
diff --git a/Test/spv.layer.tese b/Test/spv.layer.tese
new file mode 100644
index 0000000..b0ce079
--- /dev/null
+++ b/Test/spv.layer.tese
@@ -0,0 +1,8 @@
+#version 450
+
+#extension GL_ARB_shader_viewport_layer_array : require
+
+layout(triangles) in;
+void main() {
+ gl_Layer = 1;
+}
diff --git a/Test/spv.nonuniform.frag b/Test/spv.nonuniform.frag
index c136d25..cf7ebed 100644
--- a/Test/spv.nonuniform.frag
+++ b/Test/spv.nonuniform.frag
@@ -28,10 +28,12 @@
void main()
{
nonuniformEXT int nu_li;
+ nonuniformEXT int nu_li2;
int dyn_i;
int a = foo(nu_li, nu_li);
nu_li = nonuniformEXT(a) + nonuniformEXT(a * 2);
+ nu_li2 = a + nonuniformEXT(a * 2);
float b;
b = nu_inv4.x * nu_gf;
@@ -46,16 +48,25 @@
b += texelFetch(uniformTexelBuffer[nu_ii], 1).x;
b += imageLoad(storageTexelBuffer[nu_ii], 1).x;
b += texture(sampler2D(uniformTexArr[nu_ii], uniformSampler), inTexcoord.xy).x;
+ b += texture(nonuniformEXT(sampler2D(uniformTexArr[nu_ii], uniformSampler)), inTexcoord.xy).x;
nonuniformEXT ivec4 v;
nonuniformEXT mat4 m;
nonuniformEXT struct S { int a; } s;
+ nonuniformEXT int arr[10];
ivec4 uv;
+ mat4 um;
+ struct US { int a[10]; } us;
+ int uarr[10];
b += uniformBuffer[v.y].a;
b += uniformBuffer[v[2]].a;
b += uniformBuffer[uv[nu_ii]].a;
b += uniformBuffer[int(m[2].z)].a;
b += uniformBuffer[s.a].a;
+ b += uniformBuffer[arr[2]].a;
+ b += uniformBuffer[int(um[nu_ii].z)].a;
+ b += uniformBuffer[us.a[nu_ii]].a;
+ b += uniformBuffer[uarr[nu_ii]].a;
storageBuffer[nu_ii].b = b;
}
diff --git a/Test/spv.nullInit.comp b/Test/spv.nullInit.comp
new file mode 100644
index 0000000..256fd54
--- /dev/null
+++ b/Test/spv.nullInit.comp
@@ -0,0 +1,32 @@
+#version 460
+
+#extension GL_EXT_null_initializer : enable
+
+#ifdef GL_EXT_null_initializer
+
+struct S {
+ vec3[4] v;
+ int a;
+};
+
+struct T {
+ int b;
+ S s;
+};
+
+shared float f = { };
+shared T t1 = { };
+shared T t2 = { };
+shared S s = { };
+shared float g = { };
+shared int i = { };
+
+void main()
+{
+ S local = { };
+ ++local.a;
+}
+
+S global = { };
+
+#endif
diff --git a/Test/spv.queueFamilyScope.comp b/Test/spv.queueFamilyScope.comp
new file mode 100644
index 0000000..0d79850
--- /dev/null
+++ b/Test/spv.queueFamilyScope.comp
@@ -0,0 +1,10 @@
+#version 450
+#extension GL_KHR_memory_scope_semantics : require
+
+layout (binding = 0) buffer Buffer { uint a; } A;
+
+void main()
+{
+ atomicLoad(A.a, gl_ScopeQueueFamily, gl_StorageSemanticsBuffer, gl_SemanticsAcquire);
+}
+
diff --git a/Test/spv.viewportindex.tese b/Test/spv.viewportindex.tese
new file mode 100644
index 0000000..0da4cc8
--- /dev/null
+++ b/Test/spv.viewportindex.tese
@@ -0,0 +1,8 @@
+#version 450
+
+#extension GL_ARB_shader_viewport_layer_array : require
+
+layout(triangles) in;
+void main() {
+ gl_ViewportIndex = 1;
+}
diff --git a/Test/vulkan.comp b/Test/vulkan.comp
index 6b6f4cf..98d93ed 100644
--- a/Test/vulkan.comp
+++ b/Test/vulkan.comp
@@ -7,6 +7,27 @@
void main()
{
gl_WorkGroupSize;
+ int i = { }; // ERROR, need an extension
}
layout(local_size_y_id = 19) in; // ERROR, already used: TODO not yet reported
+
+shared float f = { }; // ERROR, need an extension
+float g = { }; // ERROR, need an extension
+
+#extension GL_EXT_null_initializer : enable
+
+shared float f2 = { };
+float g2 = { };
+
+void foo()
+{
+ int i = { };
+ float fa[] = { };
+}
+
+struct samp {
+ sampler2D s2D;
+} sampVar = { };
+
+atomic_uint a = { };
diff --git a/build_info.h.tmpl b/build_info.h.tmpl
index eacecb0..5b5e9e6 100644
--- a/build_info.h.tmpl
+++ b/build_info.h.tmpl
@@ -34,10 +34,10 @@
#ifndef GLSLANG_BUILD_INFO
#define GLSLANG_BUILD_INFO
-#define GLSLANG_VERSION_MAJOR <major>
-#define GLSLANG_VERSION_MINOR <minor>
-#define GLSLANG_VERSION_PATCH <patch>
-#define GLSLANG_VERSION_FLAVOR "<flavor>"
+#define GLSLANG_VERSION_MAJOR @major@
+#define GLSLANG_VERSION_MINOR @minor@
+#define GLSLANG_VERSION_PATCH @patch@
+#define GLSLANG_VERSION_FLAVOR "@flavor@"
#define GLSLANG_VERSION_GREATER_THAN(major, minor, patch) \
(((major) > GLSLANG_VERSION_MAJOR) || ((major) == GLSLANG_VERSION_MAJOR && \
diff --git a/build_info.py b/build_info.py
index 2ac864b..7c1998f 100755
--- a/build_info.py
+++ b/build_info.py
@@ -201,13 +201,13 @@
software_version = deduce_software_version(directory)
commit = describe(directory)
output = template \
- .replace("<major>", software_version["major"]) \
- .replace("<minor>", software_version["minor"]) \
- .replace("<patch>", software_version["patch"]) \
- .replace("<flavor>", software_version["flavor"]) \
- .replace("<-flavor>", software_version["-flavor"]) \
- .replace("<date>", software_version["date"]) \
- .replace("<commit>", commit)
+ .replace("@major@", software_version["major"]) \
+ .replace("@minor@", software_version["minor"]) \
+ .replace("@patch@", software_version["patch"]) \
+ .replace("@flavor@", software_version["flavor"]) \
+ .replace("@-flavor@", software_version["-flavor"]) \
+ .replace("@date@", software_version["date"]) \
+ .replace("@commit@", commit)
if output_file is None:
print(output)
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index 1c7d22a..fc925ea 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -33,7 +33,7 @@
if(WIN32)
add_subdirectory(OSDependent/Windows)
-elseif(UNIX)
+elseif(UNIX OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
add_subdirectory(OSDependent/Unix)
else(WIN32)
message("unknown platform")
diff --git a/glslang/HLSL/hlslParseHelper.cpp b/glslang/HLSL/hlslParseHelper.cpp
index ff0f35a..63dd8e3 100644
--- a/glslang/HLSL/hlslParseHelper.cpp
+++ b/glslang/HLSL/hlslParseHelper.cpp
@@ -5492,6 +5492,10 @@
op = fnCandidate->getBuiltInOp();
if (builtIn && op != EOpNull) {
+ // SM 4.0 and above guarantees roundEven semantics for round()
+ if (!hlslDX9Compatible() && op == EOpRound)
+ op = EOpRoundEven;
+
// A function call mapped to a built-in operation.
result = intermediate.addBuiltInFunctionCall(loc, op, fnCandidate->getParamCount() == 1, arguments,
fnCandidate->getType());
@@ -9865,7 +9869,7 @@
} else {
// Use the original declaration type for the linkage
paramType->getQualifier().builtIn = biType;
- if (biType == EbvTessLevelInner || biType == EbvTessLevelInner)
+ if (biType == EbvTessLevelInner || biType == EbvTessLevelOuter)
paramType->getQualifier().patch = true;
if (notInEntryPoint.count(tInterstageIoData(biType, storage)) == 1)
diff --git a/glslang/HLSL/hlslParseables.cpp b/glslang/HLSL/hlslParseables.cpp
index 025cb5e..4673b46 100644
--- a/glslang/HLSL/hlslParseables.cpp
+++ b/glslang/HLSL/hlslParseables.cpp
@@ -1123,7 +1123,7 @@
symbolTable.relateToOperator("reflect", EOpReflect);
symbolTable.relateToOperator("refract", EOpRefract);
symbolTable.relateToOperator("reversebits", EOpBitFieldReverse);
- symbolTable.relateToOperator("round", EOpRoundEven);
+ symbolTable.relateToOperator("round", EOpRound);
symbolTable.relateToOperator("rsqrt", EOpInverseSqrt);
symbolTable.relateToOperator("saturate", EOpSaturate);
symbolTable.relateToOperator("sign", EOpSign);
diff --git a/glslang/Include/Types.h b/glslang/Include/Types.h
index a3043f8..603203d 100644
--- a/glslang/Include/Types.h
+++ b/glslang/Include/Types.h
@@ -499,6 +499,7 @@
declaredBuiltIn = EbvNone;
#ifndef GLSLANG_WEB
noContraction = false;
+ nullInit = false;
#endif
}
@@ -512,6 +513,7 @@
clearMemory();
specConstant = false;
nonUniform = false;
+ nullInit = false;
clearLayout();
}
@@ -588,6 +590,8 @@
bool isNoContraction() const { return false; }
void setNoContraction() { }
bool isPervertexNV() const { return false; }
+ void setNullInit() { }
+ bool isNullInit() const { return false; }
#else
bool noContraction: 1; // prevent contraction and reassociation, e.g., for 'precise' keyword, and expressions it affects
bool nopersp : 1;
@@ -609,6 +613,7 @@
bool subgroupcoherent : 1;
bool shadercallcoherent : 1;
bool nonprivate : 1;
+ bool nullInit : 1;
bool isWriteOnly() const { return writeonly; }
bool isReadOnly() const { return readonly; }
bool isRestrict() const { return restrict; }
@@ -644,6 +649,8 @@
bool isNoContraction() const { return noContraction; }
void setNoContraction() { noContraction = true; }
bool isPervertexNV() const { return pervertexNV; }
+ void setNullInit() { nullInit = true; }
+ bool isNullInit() const { return nullInit; }
#endif
bool isPipeInput() const
@@ -757,6 +764,12 @@
bool isPerPrimitive() const { return perPrimitiveNV; }
bool isPerView() const { return perViewNV; }
bool isTaskMemory() const { return perTaskNV; }
+ bool isAnyPayload() const {
+ return storage == EvqPayload || storage == EvqPayloadIn;
+ }
+ bool isAnyCallable() const {
+ return storage == EvqCallableData || storage == EvqCallableDataIn;
+ }
// True if this type of IO is supposed to be arrayed with extra level for per-vertex data
bool isArrayedIo(EShLanguage language) const
@@ -2158,6 +2171,8 @@
appendStr(" specialization-constant");
if (qualifier.nonUniform)
appendStr(" nonuniform");
+ if (qualifier.isNullInit())
+ appendStr(" null-init");
appendStr(" ");
appendStr(getStorageQualifierString());
if (isArray()) {
diff --git a/glslang/Include/glslang_c_shader_types.h b/glslang/Include/glslang_c_shader_types.h
index d01a115..f100a9a 100644
--- a/glslang/Include/glslang_c_shader_types.h
+++ b/glslang/Include/glslang_c_shader_types.h
@@ -100,8 +100,9 @@
typedef enum {
GLSLANG_TARGET_VULKAN_1_0 = (1 << 22),
GLSLANG_TARGET_VULKAN_1_1 = (1 << 22) | (1 << 12),
+ GLSLANG_TARGET_VULKAN_1_2 = (1 << 22) | (2 << 12),
GLSLANG_TARGET_OPENGL_450 = 450,
- LAST_ELEMENT_MARKER(GLSLANG_TARGET_CLIENT_VERSION_COUNT),
+ LAST_ELEMENT_MARKER(GLSLANG_TARGET_CLIENT_VERSION_COUNT = 4),
} glslang_target_client_version_t;
/* SH_TARGET_LanguageVersion counterpart */
@@ -112,7 +113,7 @@
GLSLANG_TARGET_SPV_1_3 = (1 << 16) | (3 << 8),
GLSLANG_TARGET_SPV_1_4 = (1 << 16) | (4 << 8),
GLSLANG_TARGET_SPV_1_5 = (1 << 16) | (5 << 8),
- LAST_ELEMENT_MARKER(GLSLANG_TARGET_LANGUAGE_VERSION_COUNT),
+ LAST_ELEMENT_MARKER(GLSLANG_TARGET_LANGUAGE_VERSION_COUNT = 6),
} glslang_target_language_version_t;
/* EShExecutable counterpart */
diff --git a/glslang/Include/intermediate.h b/glslang/Include/intermediate.h
index a587434..85edd63 100644
--- a/glslang/Include/intermediate.h
+++ b/glslang/Include/intermediate.h
@@ -280,6 +280,12 @@
EOpConvUvec2ToPtr,
EOpConvPtrToUvec2,
+ // uint64_t -> accelerationStructureEXT
+ EOpConvUint64ToAccStruct,
+
+ // uvec2 -> accelerationStructureEXT
+ EOpConvUvec2ToAccStruct,
+
//
// binary operations
//
@@ -631,6 +637,8 @@
EOpKill, // Fragment only
EOpTerminateInvocation, // Fragment only
EOpDemote, // Fragment only
+ EOpTerminateRayKHR, // Any-hit only
+ EOpIgnoreIntersectionKHR, // Any-hit only
EOpReturn,
EOpBreak,
EOpContinue,
@@ -752,6 +760,7 @@
EOpConstructNonuniform, // expected to be transformed away, not present in final AST
EOpConstructReference,
EOpConstructCooperativeMatrix,
+ EOpConstructAccStruct,
EOpConstructGuardEnd,
//
@@ -912,11 +921,13 @@
EOpAverageRounded,
EOpMul32x16,
- EOpTrace,
+ EOpTraceNV,
+ EOpTraceKHR,
EOpReportIntersection,
- EOpIgnoreIntersection,
- EOpTerminateRay,
- EOpExecuteCallable,
+ EOpIgnoreIntersectionNV,
+ EOpTerminateRayNV,
+ EOpExecuteCallableNV,
+ EOpExecuteCallableKHR,
EOpWritePackedPrimitiveIndices4x8NV,
//
diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp
index c765199..a5ef6cc 100644
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -4421,9 +4421,7 @@
"\n");
stageBuiltins[EShLangAnyHit].append(
"void ignoreIntersectionNV();"
- "void ignoreIntersectionEXT();"
"void terminateRayNV();"
- "void terminateRayEXT();"
"\n");
stageBuiltins[EShLangClosestHit].append(
"void traceNV(accelerationStructureNV,uint,uint,uint,uint,uint,vec3,float,vec3,float,int);"
@@ -5436,6 +5434,12 @@
"\n");
}
+ if (version >= 300 /* both ES and non-ES */) {
+ stageBuiltins[EShLangFragment].append(
+ "flat in highp uint gl_ViewID_OVR;" // GL_OVR_multiview, GL_OVR_multiview2
+ "\n");
+ }
+
#ifndef GLSLANG_ANGLE
// GL_ARB_shader_ballot
if (profile != EEsProfile && version >= 450) {
@@ -5448,6 +5452,15 @@
"in uint64_t gl_SubGroupLeMaskARB;"
"in uint64_t gl_SubGroupLtMaskARB;"
"\n";
+ const char* rtBallotDecls =
+ "uniform volatile uint gl_SubGroupSizeARB;"
+ "in volatile uint gl_SubGroupInvocationARB;"
+ "in volatile uint64_t gl_SubGroupEqMaskARB;"
+ "in volatile uint64_t gl_SubGroupGeMaskARB;"
+ "in volatile uint64_t gl_SubGroupGtMaskARB;"
+ "in volatile uint64_t gl_SubGroupLeMaskARB;"
+ "in volatile uint64_t gl_SubGroupLtMaskARB;"
+ "\n";
const char* fragmentBallotDecls =
"uniform uint gl_SubGroupSizeARB;"
"flat in uint gl_SubGroupInvocationARB;"
@@ -5465,6 +5478,13 @@
stageBuiltins[EShLangFragment] .append(fragmentBallotDecls);
stageBuiltins[EShLangMeshNV] .append(ballotDecls);
stageBuiltins[EShLangTaskNV] .append(ballotDecls);
+ stageBuiltins[EShLangRayGen] .append(rtBallotDecls);
+ stageBuiltins[EShLangIntersect] .append(rtBallotDecls);
+ // No volatile qualifier on these builtins in any-hit
+ stageBuiltins[EShLangAnyHit] .append(ballotDecls);
+ stageBuiltins[EShLangClosestHit] .append(rtBallotDecls);
+ stageBuiltins[EShLangMiss] .append(rtBallotDecls);
+ stageBuiltins[EShLangCallable] .append(rtBallotDecls);
}
// GL_KHR_shader_subgroup
@@ -5502,6 +5522,21 @@
"in highp uint gl_NumSubgroups;"
"in highp uint gl_SubgroupID;"
"\n";
+ // These builtins are volatile for RT stages
+ const char* rtSubgroupDecls =
+ "in mediump volatile uint gl_SubgroupSize;"
+ "in mediump volatile uint gl_SubgroupInvocationID;"
+ "in highp volatile uvec4 gl_SubgroupEqMask;"
+ "in highp volatile uvec4 gl_SubgroupGeMask;"
+ "in highp volatile uvec4 gl_SubgroupGtMask;"
+ "in highp volatile uvec4 gl_SubgroupLeMask;"
+ "in highp volatile uvec4 gl_SubgroupLtMask;"
+ // GL_NV_shader_sm_builtins
+ "in highp uint gl_WarpsPerSMNV;"
+ "in highp uint gl_SMCountNV;"
+ "in highp volatile uint gl_WarpIDNV;"
+ "in highp volatile uint gl_SMIDNV;"
+ "\n";
stageBuiltins[EShLangVertex] .append(subgroupDecls);
stageBuiltins[EShLangTessControl] .append(subgroupDecls);
@@ -5514,12 +5549,13 @@
stageBuiltins[EShLangMeshNV] .append(computeSubgroupDecls);
stageBuiltins[EShLangTaskNV] .append(subgroupDecls);
stageBuiltins[EShLangTaskNV] .append(computeSubgroupDecls);
- stageBuiltins[EShLangRayGen] .append(subgroupDecls);
- stageBuiltins[EShLangIntersect] .append(subgroupDecls);
+ stageBuiltins[EShLangRayGen] .append(rtSubgroupDecls);
+ stageBuiltins[EShLangIntersect] .append(rtSubgroupDecls);
+ // No volatile qualifier on these builtins in any-hit
stageBuiltins[EShLangAnyHit] .append(subgroupDecls);
- stageBuiltins[EShLangClosestHit] .append(subgroupDecls);
- stageBuiltins[EShLangMiss] .append(subgroupDecls);
- stageBuiltins[EShLangCallable] .append(subgroupDecls);
+ stageBuiltins[EShLangClosestHit] .append(rtSubgroupDecls);
+ stageBuiltins[EShLangMiss] .append(rtSubgroupDecls);
+ stageBuiltins[EShLangCallable] .append(rtSubgroupDecls);
}
// GL_NV_ray_tracing/GL_EXT_ray_tracing
@@ -5587,7 +5623,7 @@
"in float gl_RayTminNV;"
"in float gl_RayTminEXT;"
"in float gl_RayTmaxNV;"
- "in float gl_RayTmaxEXT;"
+ "in volatile float gl_RayTmaxEXT;"
"in mat4x3 gl_ObjectToWorldNV;"
"in mat4x3 gl_ObjectToWorldEXT;"
"in mat3x4 gl_ObjectToWorld3x4EXT;"
@@ -5707,14 +5743,6 @@
commonBuiltins.append("const int gl_StorageSemanticsOutput = 0x1000;\n");
}
-#endif // !GLSLANG_ANGLE
-
- if (version >= 300 /* both ES and non-ES */) {
- stageBuiltins[EShLangFragment].append(
- "flat in highp uint gl_ViewID_OVR;" // GL_OVR_multiview, GL_OVR_multiview2
- "\n");
- }
-
// Adding these to common built-ins triggers an assert due to a memory corruption in related code when testing
// So instead add to each stage individually, avoiding the GLSLang bug
if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 310)) {
@@ -5764,6 +5792,7 @@
}
}
}
+#endif // !GLSLANG_ANGLE
#endif // !GLSLANG_WEB
@@ -8455,9 +8484,7 @@
symbolTable.setFunctionExtensions("reportIntersectionNV", 1, &E_GL_NV_ray_tracing);
symbolTable.setFunctionExtensions("reportIntersectionEXT", 1, &E_GL_EXT_ray_tracing);
symbolTable.setFunctionExtensions("ignoreIntersectionNV", 1, &E_GL_NV_ray_tracing);
- symbolTable.setFunctionExtensions("ignoreIntersectionEXT", 1, &E_GL_EXT_ray_tracing);
symbolTable.setFunctionExtensions("terminateRayNV", 1, &E_GL_NV_ray_tracing);
- symbolTable.setFunctionExtensions("terminateRayEXT", 1, &E_GL_EXT_ray_tracing);
symbolTable.setFunctionExtensions("executeCallableNV", 1, &E_GL_NV_ray_tracing);
symbolTable.setFunctionExtensions("executeCallableEXT", 1, &E_GL_EXT_ray_tracing);
@@ -9287,10 +9314,10 @@
case EShLangClosestHit:
case EShLangMiss:
if (profile != EEsProfile && version >= 460) {
- symbolTable.relateToOperator("traceNV", EOpTrace);
- symbolTable.relateToOperator("traceRayEXT", EOpTrace);
- symbolTable.relateToOperator("executeCallableNV", EOpExecuteCallable);
- symbolTable.relateToOperator("executeCallableEXT", EOpExecuteCallable);
+ symbolTable.relateToOperator("traceNV", EOpTraceNV);
+ symbolTable.relateToOperator("traceRayEXT", EOpTraceKHR);
+ symbolTable.relateToOperator("executeCallableNV", EOpExecuteCallableNV);
+ symbolTable.relateToOperator("executeCallableEXT", EOpExecuteCallableKHR);
}
break;
case EShLangIntersect:
@@ -9301,16 +9328,14 @@
break;
case EShLangAnyHit:
if (profile != EEsProfile && version >= 460) {
- symbolTable.relateToOperator("ignoreIntersectionNV", EOpIgnoreIntersection);
- symbolTable.relateToOperator("ignoreIntersectionEXT", EOpIgnoreIntersection);
- symbolTable.relateToOperator("terminateRayNV", EOpTerminateRay);
- symbolTable.relateToOperator("terminateRayEXT", EOpTerminateRay);
+ symbolTable.relateToOperator("ignoreIntersectionNV", EOpIgnoreIntersectionNV);
+ symbolTable.relateToOperator("terminateRayNV", EOpTerminateRayNV);
}
break;
case EShLangCallable:
if (profile != EEsProfile && version >= 460) {
- symbolTable.relateToOperator("executeCallableNV", EOpExecuteCallable);
- symbolTable.relateToOperator("executeCallableEXT", EOpExecuteCallable);
+ symbolTable.relateToOperator("executeCallableNV", EOpExecuteCallableNV);
+ symbolTable.relateToOperator("executeCallableEXT", EOpExecuteCallableKHR);
}
break;
case EShLangMeshNV:
diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp
index 2face35..cadf6f3 100644
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -2298,6 +2298,10 @@
case EbtReference:
op = EOpConstructReference;
break;
+
+ case EbtAccStruct:
+ op = EOpConstructAccStruct;
+ break;
#endif
default:
break;
@@ -2866,7 +2870,7 @@
return;
}
- callGraph.push_front(TCall(caller, callee));
+ callGraph.emplace_front(caller, callee);
}
//
diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index e58b866..cba242a 100644
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -87,6 +87,10 @@
globalInputDefaults.clear();
globalOutputDefaults.clear();
+ globalSharedDefaults.clear();
+ globalSharedDefaults.layoutMatrix = ElmColumnMajor;
+ globalSharedDefaults.layoutPacking = ElpStd430;
+
#ifndef GLSLANG_WEB
// "Shaders in the transform
// feedback capturing mode have an initial global default of
@@ -2076,14 +2080,32 @@
}
#ifndef GLSLANG_WEB
- case EOpTrace:
+ case EOpTraceNV:
if (!(*argp)[10]->getAsConstantUnion())
- error(loc, "argument must be compile-time constant", "payload number", "");
+ error(loc, "argument must be compile-time constant", "payload number", "a");
break;
- case EOpExecuteCallable:
+ case EOpTraceKHR:
+ if (!(*argp)[10]->getAsConstantUnion())
+ error(loc, "argument must be compile-time constant", "payload number", "a");
+ else {
+ unsigned int location = (*argp)[10]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+ if (intermediate.checkLocationRT(0, location) < 0)
+ error(loc, "with layout(location =", "no rayPayloadEXT/rayPayloadInEXT declared", "%d)", location);
+ }
+ break;
+ case EOpExecuteCallableNV:
if (!(*argp)[1]->getAsConstantUnion())
error(loc, "argument must be compile-time constant", "callable data number", "");
break;
+ case EOpExecuteCallableKHR:
+ if (!(*argp)[1]->getAsConstantUnion())
+ error(loc, "argument must be compile-time constant", "callable data number", "");
+ else {
+ unsigned int location = (*argp)[1]->getAsConstantUnion()->getAsConstantUnion()->getConstArray()[0].getUConst();
+ if (intermediate.checkLocationRT(1, location) < 0)
+ error(loc, "with layout(location =", "no callableDataEXT/callableDataInEXT declared", "%d)", location);
+ }
+ break;
case EOpRayQueryGetIntersectionType:
case EOpRayQueryGetIntersectionT:
@@ -3440,7 +3462,7 @@
if (! symbolTable.atGlobalLevel())
return;
- if (!(publicType.userDef && publicType.userDef->isReference())) {
+ if (!(publicType.userDef && publicType.userDef->isReference()) && !parsingBuiltins) {
if (qualifier.isMemoryQualifierImageAndSSBOOnly() && ! publicType.isImage() && publicType.qualifier.storage != EvqBuffer) {
error(loc, "memory qualifiers cannot be used on this type", "", "");
} else if (qualifier.isMemory() && (publicType.basicType != EbtSampler) && !publicType.qualifier.isUniformOrBuffer()) {
@@ -5449,7 +5471,14 @@
if (! IsPow2(value))
error(loc, "must be a power of 2", "buffer_reference_align", "");
else
+#ifdef __ANDROID__
+ // Android NDK r15c tageting ABI 15 doesn't have full support for C++11
+ // (no std::exp2/log2). ::exp2 is available from C99 but ::log2 isn't
+ // available up until ABI 18 so we use the mathematical equivalent form
+ publicType.qualifier.layoutBufferReferenceAlign = (unsigned int)(std::log(value) / std::log(2.0));
+#else
publicType.qualifier.layoutBufferReferenceAlign = (unsigned int)std::log2(value);
+#endif
if (nonLiteral)
error(loc, "needs a literal integer", "buffer_reference_align", "");
return;
@@ -6010,12 +6039,28 @@
}
}
+static bool storageCanHaveLayoutInBlock(const enum TStorageQualifier storage)
+{
+ switch (storage) {
+ case EvqUniform:
+ case EvqBuffer:
+ case EvqShared:
+ return true;
+ default:
+ return false;
+ }
+}
+
// Do layout error checking that can be done within a layout qualifier proper, not needing to know
// if there are blocks, atomic counters, variables, etc.
void TParseContext::layoutQualifierCheck(const TSourceLoc& loc, const TQualifier& qualifier)
{
- if (qualifier.storage == EvqShared && qualifier.hasLayout())
- error(loc, "cannot apply layout qualifiers to a shared variable", "shared", "");
+ if (qualifier.storage == EvqShared && qualifier.hasLayout()) {
+ if (spvVersion.spv > 0 && spvVersion.spv < EShTargetSpv_1_4) {
+ error(loc, "shared block requires at least SPIR-V 1.4", "shared block", "");
+ }
+ profileRequires(loc, EEsProfile | ECoreProfile | ECompatibilityProfile, 0, E_GL_EXT_shared_memory_block, "shared block");
+ }
// "It is a compile-time error to use *component* without also specifying the location qualifier (order does not matter)."
if (qualifier.hasComponent() && ! qualifier.hasLocation())
@@ -6098,7 +6143,7 @@
error(loc, "can only be used on an output", "xfb layout qualifier", "");
}
if (qualifier.hasUniformLayout()) {
- if (! qualifier.isUniformOrBuffer() && !qualifier.isTaskMemory()) {
+ if (!storageCanHaveLayoutInBlock(qualifier.storage) && !qualifier.isTaskMemory()) {
if (qualifier.hasMatrix() || qualifier.hasPacking())
error(loc, "matrix or packing qualifiers can only be used on a uniform or buffer", "layout", "");
if (qualifier.hasOffset() || qualifier.hasAlign())
@@ -6792,6 +6837,11 @@
//
TIntermNode* TParseContext::executeInitializer(const TSourceLoc& loc, TIntermTyped* initializer, TVariable* variable)
{
+ // A null initializer is an aggregate that hasn't had an op assigned yet
+ // (still EOpNull, no relation to nullInit), and has no children.
+ bool nullInit = initializer->getAsAggregate() && initializer->getAsAggregate()->getOp() == EOpNull &&
+ initializer->getAsAggregate()->getSequence().size() == 0;
+
//
// Identifier must be of type constant, a global, or a temporary, and
// starting at version 120, desktop allows uniforms to have initializers.
@@ -6799,9 +6849,36 @@
TStorageQualifier qualifier = variable->getType().getQualifier().storage;
if (! (qualifier == EvqTemporary || qualifier == EvqGlobal || qualifier == EvqConst ||
(qualifier == EvqUniform && !isEsProfile() && version >= 120))) {
- error(loc, " cannot initialize this type of qualifier ", variable->getType().getStorageQualifierString(), "");
+ if (qualifier == EvqShared) {
+ // GL_EXT_null_initializer allows this for shared, if it's a null initializer
+ if (nullInit) {
+ const char* feature = "initialization with shared qualifier";
+ profileRequires(loc, EEsProfile, 0, E_GL_EXT_null_initializer, feature);
+ profileRequires(loc, ~EEsProfile, 0, E_GL_EXT_null_initializer, feature);
+ } else {
+ error(loc, "initializer can only be a null initializer ('{}')", "shared", "");
+ }
+ } else {
+ error(loc, " cannot initialize this type of qualifier ",
+ variable->getType().getStorageQualifierString(), "");
+ return nullptr;
+ }
+ }
+
+ if (nullInit) {
+ // only some types can be null initialized
+ if (variable->getType().containsUnsizedArray()) {
+ error(loc, "null initializers can't size unsized arrays", "{}", "");
+ return nullptr;
+ }
+ if (variable->getType().containsOpaque()) {
+ error(loc, "null initializers can't be used on opaque values", "{}", "");
+ return nullptr;
+ }
+ variable->getWritableType().getQualifier().setNullInit();
return nullptr;
}
+
arrayObjectCheck(loc, variable->getType(), "array initializer");
//
@@ -6845,13 +6922,15 @@
// Uniforms require a compile-time constant initializer
if (qualifier == EvqUniform && ! initializer->getType().getQualifier().isFrontEndConstant()) {
- error(loc, "uniform initializers must be constant", "=", "'%s'", variable->getType().getCompleteString().c_str());
+ error(loc, "uniform initializers must be constant", "=", "'%s'",
+ variable->getType().getCompleteString().c_str());
variable->getWritableType().getQualifier().makeTemporary();
return nullptr;
}
// Global consts require a constant initializer (specialization constant is okay)
if (qualifier == EvqConst && symbolTable.atGlobalLevel() && ! initializer->getType().getQualifier().isConstant()) {
- error(loc, "global const initializers must be constant", "=", "'%s'", variable->getType().getCompleteString().c_str());
+ error(loc, "global const initializers must be constant", "=", "'%s'",
+ variable->getType().getCompleteString().c_str());
variable->getWritableType().getQualifier().makeTemporary();
return nullptr;
}
@@ -6871,7 +6950,8 @@
// "In declarations of global variables with no storage qualifier or with a const
// qualifier any initializer must be a constant expression."
if (symbolTable.atGlobalLevel() && ! initializer->getType().getQualifier().isConstant()) {
- const char* initFeature = "non-constant global initializer (needs GL_EXT_shader_non_constant_global_initializers)";
+ const char* initFeature =
+ "non-constant global initializer (needs GL_EXT_shader_non_constant_global_initializers)";
if (isEsProfile()) {
if (relaxedErrors() && ! extensionTurnedOn(E_GL_EXT_shader_non_constant_global_initializers))
warn(loc, "not allowed in this version", initFeature, "");
@@ -6885,7 +6965,8 @@
// Compile-time tagging of the variable with its constant value...
initializer = intermediate.addConversion(EOpAssign, variable->getType(), initializer);
- if (! initializer || ! initializer->getType().getQualifier().isConstant() || variable->getType() != initializer->getType()) {
+ if (! initializer || ! initializer->getType().getQualifier().isConstant() ||
+ variable->getType() != initializer->getType()) {
error(loc, "non-matching or non-convertible constant type for const initializer",
variable->getType().getStorageQualifierString(), "");
variable->getWritableType().getQualifier().makeTemporary();
@@ -7462,6 +7543,19 @@
return node;
+ case EOpConstructAccStruct:
+ if ((node->getType().isScalar() && node->getType().getBasicType() == EbtUint64)) {
+ // construct acceleration structure from uint64
+ requireExtensions(loc, 1, &E_GL_EXT_ray_tracing, "uint64_t conversion to acclerationStructureEXT");
+ return intermediate.addBuiltInFunctionCall(node->getLoc(), EOpConvUint64ToAccStruct, true, node,
+ type);
+ } else if (node->getType().isVector() && node->getType().getBasicType() == EbtUint && node->getVectorSize() == 2) {
+ // construct acceleration structure from uint64
+ requireExtensions(loc, 1, &E_GL_EXT_ray_tracing, "uvec2 conversion to accelerationStructureEXT");
+ return intermediate.addBuiltInFunctionCall(node->getLoc(), EOpConvUvec2ToAccStruct, true, node,
+ type);
+ } else
+ return nullptr;
#endif // GLSLANG_WEB
default:
@@ -7595,6 +7689,7 @@
case EvqBuffer: defaultQualification = globalBufferDefaults; break;
case EvqVaryingIn: defaultQualification = globalInputDefaults; break;
case EvqVaryingOut: defaultQualification = globalOutputDefaults; break;
+ case EvqShared: defaultQualification = globalSharedDefaults; break;
default: defaultQualification.clear(); break;
}
@@ -7858,6 +7953,12 @@
error(loc, "output blocks cannot be used in a task shader", "out", "");
}
break;
+ case EvqShared:
+ if (spvVersion.spv > 0 && spvVersion.spv < EShTargetSpv_1_4) {
+ error(loc, "shared block requires at least SPIR-V 1.4", "shared block", "");
+ }
+ profileRequires(loc, EEsProfile | ECoreProfile | ECompatibilityProfile, 0, E_GL_EXT_shared_memory_block, "shared block");
+ break;
#ifndef GLSLANG_WEB
case EvqPayload:
profileRequires(loc, ~EEsProfile, 460, 2, extsrt, "rayPayloadNV block");
@@ -8016,7 +8117,7 @@
//
void TParseContext::fixBlockUniformOffsets(TQualifier& qualifier, TTypeList& typeList)
{
- if (!qualifier.isUniformOrBuffer() && !qualifier.isTaskMemory())
+ if (!storageCanHaveLayoutInBlock(qualifier.storage) && !qualifier.isTaskMemory())
return;
if (qualifier.layoutPacking != ElpStd140 && qualifier.layoutPacking != ElpStd430 && qualifier.layoutPacking != ElpScalar)
return;
@@ -8530,8 +8631,14 @@
}
#endif
break;
+ case EvqShared:
+ if (qualifier.hasMatrix())
+ globalSharedDefaults.layoutMatrix = qualifier.layoutMatrix;
+ if (qualifier.hasPacking())
+ globalSharedDefaults.layoutPacking = qualifier.layoutPacking;
+ break;
default:
- error(loc, "default qualifier requires 'uniform', 'buffer', 'in', or 'out' storage qualification", "", "");
+ error(loc, "default qualifier requires 'uniform', 'buffer', 'in', 'out' or 'shared' storage qualification", "", "");
return;
}
diff --git a/glslang/MachineIndependent/ParseHelper.h b/glslang/MachineIndependent/ParseHelper.h
index df53b5e..ad9b8d6 100644
--- a/glslang/MachineIndependent/ParseHelper.h
+++ b/glslang/MachineIndependent/ParseHelper.h
@@ -485,6 +485,7 @@
TQualifier globalUniformDefaults;
TQualifier globalInputDefaults;
TQualifier globalOutputDefaults;
+ TQualifier globalSharedDefaults;
TString currentCaller; // name of last function body entered (not valid when at global scope)
#ifndef GLSLANG_WEB
int* atomicUintOffsets; // to become an array of the right size to hold an offset per binding point
diff --git a/glslang/MachineIndependent/Scan.cpp b/glslang/MachineIndependent/Scan.cpp
index bcf4047..78c8a36 100644
--- a/glslang/MachineIndependent/Scan.cpp
+++ b/glslang/MachineIndependent/Scan.cpp
@@ -366,6 +366,8 @@
(*KeywordMap)["else"] = ELSE;
(*KeywordMap)["discard"] = DISCARD;
(*KeywordMap)["terminateInvocation"] = TERMINATE_INVOCATION;
+ (*KeywordMap)["terminateRayEXT"] = TERMINATE_RAY;
+ (*KeywordMap)["ignoreIntersectionEXT"] = IGNORE_INTERSECTION;
(*KeywordMap)["return"] = RETURN;
(*KeywordMap)["void"] = VOID;
(*KeywordMap)["bool"] = BOOL;
@@ -942,6 +944,12 @@
return identifierOrType();
return keyword;
+ case TERMINATE_RAY:
+ case IGNORE_INTERSECTION:
+ if (!parseContext.extensionTurnedOn(E_GL_EXT_ray_tracing))
+ return identifierOrType();
+ return keyword;
+
case BUFFER:
afterBuffer = true;
if ((parseContext.isEsProfile() && parseContext.version < 310) ||
diff --git a/glslang/MachineIndependent/Versions.cpp b/glslang/MachineIndependent/Versions.cpp
index 69b8863..488c98c 100644
--- a/glslang/MachineIndependent/Versions.cpp
+++ b/glslang/MachineIndependent/Versions.cpp
@@ -305,6 +305,7 @@
extensionBehavior[E_GL_EXT_tessellation_point_size] = EBhDisable;
extensionBehavior[E_GL_EXT_texture_buffer] = EBhDisable;
extensionBehavior[E_GL_EXT_texture_cube_map_array] = EBhDisable;
+ extensionBehavior[E_GL_EXT_null_initializer] = EBhDisable;
// OES matching AEP
extensionBehavior[E_GL_OES_geometry_shader] = EBhDisable;
@@ -330,6 +331,7 @@
extensionBehavior[E_GL_EXT_fragment_shading_rate] = EBhDisable;
extensionBehavior[E_GL_EXT_shader_image_int64] = EBhDisable;
extensionBehavior[E_GL_EXT_terminate_invocation] = EBhDisable;
+ extensionBehavior[E_GL_EXT_shared_memory_block] = EBhDisable;
// OVR extensions
extensionBehavior[E_GL_OVR_multiview] = EBhDisable;
@@ -408,9 +410,12 @@
"#define GL_EXT_shader_non_constant_global_initializers 1\n"
;
- if (isEsProfile() && version >= 300) {
+ if (version >= 300) {
preamble += "#define GL_NV_shader_noperspective_interpolation 1\n";
}
+ if (version >= 310) {
+ preamble += "#define GL_EXT_null_initializer 1\n";
+ }
} else { // !isEsProfile()
preamble =
@@ -468,6 +473,7 @@
"#define GL_EXT_demote_to_helper_invocation 1\n"
"#define GL_EXT_debug_printf 1\n"
"#define GL_EXT_fragment_shading_rate 1\n"
+ "#define GL_EXT_shared_memory_block 1\n"
// GL_KHR_shader_subgroup
"#define GL_KHR_shader_subgroup_basic 1\n"
@@ -538,6 +544,9 @@
if (profile == ECompatibilityProfile)
preamble += "#define GL_compatibility_profile 1\n";
}
+ if (version >= 140) {
+ preamble += "#define GL_EXT_null_initializer 1\n";
+ }
#endif // GLSLANG_WEB
}
diff --git a/glslang/MachineIndependent/Versions.h b/glslang/MachineIndependent/Versions.h
index eb17c52..f377973 100644
--- a/glslang/MachineIndependent/Versions.h
+++ b/glslang/MachineIndependent/Versions.h
@@ -201,6 +201,8 @@
const char* const E_GL_EXT_shader_implicit_conversions = "GL_EXT_shader_implicit_conversions";
const char* const E_GL_EXT_fragment_shading_rate = "GL_EXT_fragment_shading_rate";
const char* const E_GL_EXT_shader_image_int64 = "GL_EXT_shader_image_int64";
+const char* const E_GL_EXT_null_initializer = "GL_EXT_null_initializer";
+const char* const E_GL_EXT_shared_memory_block = "GL_EXT_shared_memory_block";
// Arrays of extensions for the above viewportEXTs duplications
diff --git a/glslang/MachineIndependent/glslang.m4 b/glslang/MachineIndependent/glslang.m4
index 5b0adb0..4d37639 100644
--- a/glslang/MachineIndependent/glslang.m4
+++ b/glslang/MachineIndependent/glslang.m4
@@ -294,6 +294,7 @@
%token <lex> STRUCT VOID WHILE
%token <lex> BREAK CONTINUE DO ELSE FOR IF DISCARD RETURN SWITCH CASE DEFAULT
%token <lex> TERMINATE_INVOCATION
+%token <lex> TERMINATE_RAY IGNORE_INTERSECTION
%token <lex> UNIFORM SHARED BUFFER
%token <lex> FLAT SMOOTH LAYOUT
@@ -3574,6 +3575,12 @@
parseContext.profileRequires($1.loc, ~EEsProfile, 420, E_GL_ARB_shading_language_420pack, initFeature);
$$ = $2;
}
+ | LEFT_BRACE RIGHT_BRACE {
+ const char* initFeature = "empty { } initializer";
+ parseContext.profileRequires($1.loc, EEsProfile, 0, E_GL_EXT_null_initializer, initFeature);
+ parseContext.profileRequires($1.loc, ~EEsProfile, 0, E_GL_EXT_null_initializer, initFeature);
+ $$ = parseContext.intermediate.makeAggregate($1.loc);
+ }
GLSLANG_WEB_EXCLUDE_OFF
;
@@ -3932,6 +3939,16 @@
parseContext.requireStage($1.loc, EShLangFragment, "terminateInvocation");
$$ = parseContext.intermediate.addBranch(EOpTerminateInvocation, $1.loc);
}
+GLSLANG_WEB_EXCLUDE_ON
+ | TERMINATE_RAY SEMICOLON {
+ parseContext.requireStage($1.loc, EShLangAnyHit, "terminateRayEXT");
+ $$ = parseContext.intermediate.addBranch(EOpTerminateRayKHR, $1.loc);
+ }
+ | IGNORE_INTERSECTION SEMICOLON {
+ parseContext.requireStage($1.loc, EShLangAnyHit, "ignoreIntersectionEXT");
+ $$ = parseContext.intermediate.addBranch(EOpIgnoreIntersectionKHR, $1.loc);
+ }
+GLSLANG_WEB_EXCLUDE_OFF
;
// Grammar Note: No 'goto'. Gotos are not supported.
diff --git a/glslang/MachineIndependent/glslang.y b/glslang/MachineIndependent/glslang.y
index 4093b7d..0b711ae 100644
--- a/glslang/MachineIndependent/glslang.y
+++ b/glslang/MachineIndependent/glslang.y
@@ -294,6 +294,7 @@
%token <lex> STRUCT VOID WHILE
%token <lex> BREAK CONTINUE DO ELSE FOR IF DISCARD RETURN SWITCH CASE DEFAULT
%token <lex> TERMINATE_INVOCATION
+%token <lex> TERMINATE_RAY IGNORE_INTERSECTION
%token <lex> UNIFORM SHARED BUFFER
%token <lex> FLAT SMOOTH LAYOUT
@@ -3574,6 +3575,12 @@
parseContext.profileRequires($1.loc, ~EEsProfile, 420, E_GL_ARB_shading_language_420pack, initFeature);
$$ = $2;
}
+ | LEFT_BRACE RIGHT_BRACE {
+ const char* initFeature = "empty { } initializer";
+ parseContext.profileRequires($1.loc, EEsProfile, 0, E_GL_EXT_null_initializer, initFeature);
+ parseContext.profileRequires($1.loc, ~EEsProfile, 0, E_GL_EXT_null_initializer, initFeature);
+ $$ = parseContext.intermediate.makeAggregate($1.loc);
+ }
;
@@ -3932,6 +3939,16 @@
parseContext.requireStage($1.loc, EShLangFragment, "terminateInvocation");
$$ = parseContext.intermediate.addBranch(EOpTerminateInvocation, $1.loc);
}
+
+ | TERMINATE_RAY SEMICOLON {
+ parseContext.requireStage($1.loc, EShLangAnyHit, "terminateRayEXT");
+ $$ = parseContext.intermediate.addBranch(EOpTerminateRayKHR, $1.loc);
+ }
+ | IGNORE_INTERSECTION SEMICOLON {
+ parseContext.requireStage($1.loc, EShLangAnyHit, "ignoreIntersectionEXT");
+ $$ = parseContext.intermediate.addBranch(EOpIgnoreIntersectionKHR, $1.loc);
+ }
+
;
// Grammar Note: No 'goto'. Gotos are not supported.
diff --git a/glslang/MachineIndependent/glslang_tab.cpp b/glslang/MachineIndependent/glslang_tab.cpp
index ad7deb3..da0658c 100644
--- a/glslang/MachineIndependent/glslang_tab.cpp
+++ b/glslang/MachineIndependent/glslang_tab.cpp
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.7.2. */
+/* A Bison parser, made by GNU Bison 3.7.4. */
/* Bison implementation for Yacc-like parsers in C
@@ -45,11 +45,11 @@
define necessary library symbols; they are noted "INFRINGES ON
USER NAME SPACE" below. */
-/* Identify Bison output. */
-#define YYBISON 1
+/* Identify Bison output, and Bison version. */
+#define YYBISON 30704
-/* Bison version. */
-#define YYBISON_VERSION "3.7.2"
+/* Bison version string. */
+#define YYBISON_VERSION "3.7.4"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -67,7 +67,7 @@
/* First part of user prologue. */
-#line 69 "glslang/MachineIndependent/glslang.y"
+#line 69 "MachineIndependent/glslang.y"
/* Based on:
@@ -93,7 +93,7 @@
using namespace glslang;
-#line 97 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 97 "MachineIndependent/glslang_tab.cpp"
# ifndef YY_CAST
# ifdef __cplusplus
@@ -517,170 +517,172 @@
YYSYMBOL_CASE = 393, /* CASE */
YYSYMBOL_DEFAULT = 394, /* DEFAULT */
YYSYMBOL_TERMINATE_INVOCATION = 395, /* TERMINATE_INVOCATION */
- YYSYMBOL_UNIFORM = 396, /* UNIFORM */
- YYSYMBOL_SHARED = 397, /* SHARED */
- YYSYMBOL_BUFFER = 398, /* BUFFER */
- YYSYMBOL_FLAT = 399, /* FLAT */
- YYSYMBOL_SMOOTH = 400, /* SMOOTH */
- YYSYMBOL_LAYOUT = 401, /* LAYOUT */
- YYSYMBOL_DOUBLECONSTANT = 402, /* DOUBLECONSTANT */
- YYSYMBOL_INT16CONSTANT = 403, /* INT16CONSTANT */
- YYSYMBOL_UINT16CONSTANT = 404, /* UINT16CONSTANT */
- YYSYMBOL_FLOAT16CONSTANT = 405, /* FLOAT16CONSTANT */
- YYSYMBOL_INT32CONSTANT = 406, /* INT32CONSTANT */
- YYSYMBOL_UINT32CONSTANT = 407, /* UINT32CONSTANT */
- YYSYMBOL_INT64CONSTANT = 408, /* INT64CONSTANT */
- YYSYMBOL_UINT64CONSTANT = 409, /* UINT64CONSTANT */
- YYSYMBOL_SUBROUTINE = 410, /* SUBROUTINE */
- YYSYMBOL_DEMOTE = 411, /* DEMOTE */
- YYSYMBOL_PAYLOADNV = 412, /* PAYLOADNV */
- YYSYMBOL_PAYLOADINNV = 413, /* PAYLOADINNV */
- YYSYMBOL_HITATTRNV = 414, /* HITATTRNV */
- YYSYMBOL_CALLDATANV = 415, /* CALLDATANV */
- YYSYMBOL_CALLDATAINNV = 416, /* CALLDATAINNV */
- YYSYMBOL_PAYLOADEXT = 417, /* PAYLOADEXT */
- YYSYMBOL_PAYLOADINEXT = 418, /* PAYLOADINEXT */
- YYSYMBOL_HITATTREXT = 419, /* HITATTREXT */
- YYSYMBOL_CALLDATAEXT = 420, /* CALLDATAEXT */
- YYSYMBOL_CALLDATAINEXT = 421, /* CALLDATAINEXT */
- YYSYMBOL_PATCH = 422, /* PATCH */
- YYSYMBOL_SAMPLE = 423, /* SAMPLE */
- YYSYMBOL_NONUNIFORM = 424, /* NONUNIFORM */
- YYSYMBOL_COHERENT = 425, /* COHERENT */
- YYSYMBOL_VOLATILE = 426, /* VOLATILE */
- YYSYMBOL_RESTRICT = 427, /* RESTRICT */
- YYSYMBOL_READONLY = 428, /* READONLY */
- YYSYMBOL_WRITEONLY = 429, /* WRITEONLY */
- YYSYMBOL_DEVICECOHERENT = 430, /* DEVICECOHERENT */
- YYSYMBOL_QUEUEFAMILYCOHERENT = 431, /* QUEUEFAMILYCOHERENT */
- YYSYMBOL_WORKGROUPCOHERENT = 432, /* WORKGROUPCOHERENT */
- YYSYMBOL_SUBGROUPCOHERENT = 433, /* SUBGROUPCOHERENT */
- YYSYMBOL_NONPRIVATE = 434, /* NONPRIVATE */
- YYSYMBOL_SHADERCALLCOHERENT = 435, /* SHADERCALLCOHERENT */
- YYSYMBOL_NOPERSPECTIVE = 436, /* NOPERSPECTIVE */
- YYSYMBOL_EXPLICITINTERPAMD = 437, /* EXPLICITINTERPAMD */
- YYSYMBOL_PERVERTEXNV = 438, /* PERVERTEXNV */
- YYSYMBOL_PERPRIMITIVENV = 439, /* PERPRIMITIVENV */
- YYSYMBOL_PERVIEWNV = 440, /* PERVIEWNV */
- YYSYMBOL_PERTASKNV = 441, /* PERTASKNV */
- YYSYMBOL_PRECISE = 442, /* PRECISE */
- YYSYMBOL_YYACCEPT = 443, /* $accept */
- YYSYMBOL_variable_identifier = 444, /* variable_identifier */
- YYSYMBOL_primary_expression = 445, /* primary_expression */
- YYSYMBOL_postfix_expression = 446, /* postfix_expression */
- YYSYMBOL_integer_expression = 447, /* integer_expression */
- YYSYMBOL_function_call = 448, /* function_call */
- YYSYMBOL_function_call_or_method = 449, /* function_call_or_method */
- YYSYMBOL_function_call_generic = 450, /* function_call_generic */
- YYSYMBOL_function_call_header_no_parameters = 451, /* function_call_header_no_parameters */
- YYSYMBOL_function_call_header_with_parameters = 452, /* function_call_header_with_parameters */
- YYSYMBOL_function_call_header = 453, /* function_call_header */
- YYSYMBOL_function_identifier = 454, /* function_identifier */
- YYSYMBOL_unary_expression = 455, /* unary_expression */
- YYSYMBOL_unary_operator = 456, /* unary_operator */
- YYSYMBOL_multiplicative_expression = 457, /* multiplicative_expression */
- YYSYMBOL_additive_expression = 458, /* additive_expression */
- YYSYMBOL_shift_expression = 459, /* shift_expression */
- YYSYMBOL_relational_expression = 460, /* relational_expression */
- YYSYMBOL_equality_expression = 461, /* equality_expression */
- YYSYMBOL_and_expression = 462, /* and_expression */
- YYSYMBOL_exclusive_or_expression = 463, /* exclusive_or_expression */
- YYSYMBOL_inclusive_or_expression = 464, /* inclusive_or_expression */
- YYSYMBOL_logical_and_expression = 465, /* logical_and_expression */
- YYSYMBOL_logical_xor_expression = 466, /* logical_xor_expression */
- YYSYMBOL_logical_or_expression = 467, /* logical_or_expression */
- YYSYMBOL_conditional_expression = 468, /* conditional_expression */
- YYSYMBOL_469_1 = 469, /* $@1 */
- YYSYMBOL_assignment_expression = 470, /* assignment_expression */
- YYSYMBOL_assignment_operator = 471, /* assignment_operator */
- YYSYMBOL_expression = 472, /* expression */
- YYSYMBOL_constant_expression = 473, /* constant_expression */
- YYSYMBOL_declaration = 474, /* declaration */
- YYSYMBOL_block_structure = 475, /* block_structure */
- YYSYMBOL_476_2 = 476, /* $@2 */
- YYSYMBOL_identifier_list = 477, /* identifier_list */
- YYSYMBOL_function_prototype = 478, /* function_prototype */
- YYSYMBOL_function_declarator = 479, /* function_declarator */
- YYSYMBOL_function_header_with_parameters = 480, /* function_header_with_parameters */
- YYSYMBOL_function_header = 481, /* function_header */
- YYSYMBOL_parameter_declarator = 482, /* parameter_declarator */
- YYSYMBOL_parameter_declaration = 483, /* parameter_declaration */
- YYSYMBOL_parameter_type_specifier = 484, /* parameter_type_specifier */
- YYSYMBOL_init_declarator_list = 485, /* init_declarator_list */
- YYSYMBOL_single_declaration = 486, /* single_declaration */
- YYSYMBOL_fully_specified_type = 487, /* fully_specified_type */
- YYSYMBOL_invariant_qualifier = 488, /* invariant_qualifier */
- YYSYMBOL_interpolation_qualifier = 489, /* interpolation_qualifier */
- YYSYMBOL_layout_qualifier = 490, /* layout_qualifier */
- YYSYMBOL_layout_qualifier_id_list = 491, /* layout_qualifier_id_list */
- YYSYMBOL_layout_qualifier_id = 492, /* layout_qualifier_id */
- YYSYMBOL_precise_qualifier = 493, /* precise_qualifier */
- YYSYMBOL_type_qualifier = 494, /* type_qualifier */
- YYSYMBOL_single_type_qualifier = 495, /* single_type_qualifier */
- YYSYMBOL_storage_qualifier = 496, /* storage_qualifier */
- YYSYMBOL_non_uniform_qualifier = 497, /* non_uniform_qualifier */
- YYSYMBOL_type_name_list = 498, /* type_name_list */
- YYSYMBOL_type_specifier = 499, /* type_specifier */
- YYSYMBOL_array_specifier = 500, /* array_specifier */
- YYSYMBOL_type_parameter_specifier_opt = 501, /* type_parameter_specifier_opt */
- YYSYMBOL_type_parameter_specifier = 502, /* type_parameter_specifier */
- YYSYMBOL_type_parameter_specifier_list = 503, /* type_parameter_specifier_list */
- YYSYMBOL_type_specifier_nonarray = 504, /* type_specifier_nonarray */
- YYSYMBOL_precision_qualifier = 505, /* precision_qualifier */
- YYSYMBOL_struct_specifier = 506, /* struct_specifier */
- YYSYMBOL_507_3 = 507, /* $@3 */
- YYSYMBOL_508_4 = 508, /* $@4 */
- YYSYMBOL_struct_declaration_list = 509, /* struct_declaration_list */
- YYSYMBOL_struct_declaration = 510, /* struct_declaration */
- YYSYMBOL_struct_declarator_list = 511, /* struct_declarator_list */
- YYSYMBOL_struct_declarator = 512, /* struct_declarator */
- YYSYMBOL_initializer = 513, /* initializer */
- YYSYMBOL_initializer_list = 514, /* initializer_list */
- YYSYMBOL_declaration_statement = 515, /* declaration_statement */
- YYSYMBOL_statement = 516, /* statement */
- YYSYMBOL_simple_statement = 517, /* simple_statement */
- YYSYMBOL_demote_statement = 518, /* demote_statement */
- YYSYMBOL_compound_statement = 519, /* compound_statement */
- YYSYMBOL_520_5 = 520, /* $@5 */
- YYSYMBOL_521_6 = 521, /* $@6 */
- YYSYMBOL_statement_no_new_scope = 522, /* statement_no_new_scope */
- YYSYMBOL_statement_scoped = 523, /* statement_scoped */
- YYSYMBOL_524_7 = 524, /* $@7 */
- YYSYMBOL_525_8 = 525, /* $@8 */
- YYSYMBOL_compound_statement_no_new_scope = 526, /* compound_statement_no_new_scope */
- YYSYMBOL_statement_list = 527, /* statement_list */
- YYSYMBOL_expression_statement = 528, /* expression_statement */
- YYSYMBOL_selection_statement = 529, /* selection_statement */
- YYSYMBOL_selection_statement_nonattributed = 530, /* selection_statement_nonattributed */
- YYSYMBOL_selection_rest_statement = 531, /* selection_rest_statement */
- YYSYMBOL_condition = 532, /* condition */
- YYSYMBOL_switch_statement = 533, /* switch_statement */
- YYSYMBOL_switch_statement_nonattributed = 534, /* switch_statement_nonattributed */
- YYSYMBOL_535_9 = 535, /* $@9 */
- YYSYMBOL_switch_statement_list = 536, /* switch_statement_list */
- YYSYMBOL_case_label = 537, /* case_label */
- YYSYMBOL_iteration_statement = 538, /* iteration_statement */
- YYSYMBOL_iteration_statement_nonattributed = 539, /* iteration_statement_nonattributed */
- YYSYMBOL_540_10 = 540, /* $@10 */
- YYSYMBOL_541_11 = 541, /* $@11 */
- YYSYMBOL_542_12 = 542, /* $@12 */
- YYSYMBOL_for_init_statement = 543, /* for_init_statement */
- YYSYMBOL_conditionopt = 544, /* conditionopt */
- YYSYMBOL_for_rest_statement = 545, /* for_rest_statement */
- YYSYMBOL_jump_statement = 546, /* jump_statement */
- YYSYMBOL_translation_unit = 547, /* translation_unit */
- YYSYMBOL_external_declaration = 548, /* external_declaration */
- YYSYMBOL_function_definition = 549, /* function_definition */
- YYSYMBOL_550_13 = 550, /* $@13 */
- YYSYMBOL_attribute = 551, /* attribute */
- YYSYMBOL_attribute_list = 552, /* attribute_list */
- YYSYMBOL_single_attribute = 553 /* single_attribute */
+ YYSYMBOL_TERMINATE_RAY = 396, /* TERMINATE_RAY */
+ YYSYMBOL_IGNORE_INTERSECTION = 397, /* IGNORE_INTERSECTION */
+ YYSYMBOL_UNIFORM = 398, /* UNIFORM */
+ YYSYMBOL_SHARED = 399, /* SHARED */
+ YYSYMBOL_BUFFER = 400, /* BUFFER */
+ YYSYMBOL_FLAT = 401, /* FLAT */
+ YYSYMBOL_SMOOTH = 402, /* SMOOTH */
+ YYSYMBOL_LAYOUT = 403, /* LAYOUT */
+ YYSYMBOL_DOUBLECONSTANT = 404, /* DOUBLECONSTANT */
+ YYSYMBOL_INT16CONSTANT = 405, /* INT16CONSTANT */
+ YYSYMBOL_UINT16CONSTANT = 406, /* UINT16CONSTANT */
+ YYSYMBOL_FLOAT16CONSTANT = 407, /* FLOAT16CONSTANT */
+ YYSYMBOL_INT32CONSTANT = 408, /* INT32CONSTANT */
+ YYSYMBOL_UINT32CONSTANT = 409, /* UINT32CONSTANT */
+ YYSYMBOL_INT64CONSTANT = 410, /* INT64CONSTANT */
+ YYSYMBOL_UINT64CONSTANT = 411, /* UINT64CONSTANT */
+ YYSYMBOL_SUBROUTINE = 412, /* SUBROUTINE */
+ YYSYMBOL_DEMOTE = 413, /* DEMOTE */
+ YYSYMBOL_PAYLOADNV = 414, /* PAYLOADNV */
+ YYSYMBOL_PAYLOADINNV = 415, /* PAYLOADINNV */
+ YYSYMBOL_HITATTRNV = 416, /* HITATTRNV */
+ YYSYMBOL_CALLDATANV = 417, /* CALLDATANV */
+ YYSYMBOL_CALLDATAINNV = 418, /* CALLDATAINNV */
+ YYSYMBOL_PAYLOADEXT = 419, /* PAYLOADEXT */
+ YYSYMBOL_PAYLOADINEXT = 420, /* PAYLOADINEXT */
+ YYSYMBOL_HITATTREXT = 421, /* HITATTREXT */
+ YYSYMBOL_CALLDATAEXT = 422, /* CALLDATAEXT */
+ YYSYMBOL_CALLDATAINEXT = 423, /* CALLDATAINEXT */
+ YYSYMBOL_PATCH = 424, /* PATCH */
+ YYSYMBOL_SAMPLE = 425, /* SAMPLE */
+ YYSYMBOL_NONUNIFORM = 426, /* NONUNIFORM */
+ YYSYMBOL_COHERENT = 427, /* COHERENT */
+ YYSYMBOL_VOLATILE = 428, /* VOLATILE */
+ YYSYMBOL_RESTRICT = 429, /* RESTRICT */
+ YYSYMBOL_READONLY = 430, /* READONLY */
+ YYSYMBOL_WRITEONLY = 431, /* WRITEONLY */
+ YYSYMBOL_DEVICECOHERENT = 432, /* DEVICECOHERENT */
+ YYSYMBOL_QUEUEFAMILYCOHERENT = 433, /* QUEUEFAMILYCOHERENT */
+ YYSYMBOL_WORKGROUPCOHERENT = 434, /* WORKGROUPCOHERENT */
+ YYSYMBOL_SUBGROUPCOHERENT = 435, /* SUBGROUPCOHERENT */
+ YYSYMBOL_NONPRIVATE = 436, /* NONPRIVATE */
+ YYSYMBOL_SHADERCALLCOHERENT = 437, /* SHADERCALLCOHERENT */
+ YYSYMBOL_NOPERSPECTIVE = 438, /* NOPERSPECTIVE */
+ YYSYMBOL_EXPLICITINTERPAMD = 439, /* EXPLICITINTERPAMD */
+ YYSYMBOL_PERVERTEXNV = 440, /* PERVERTEXNV */
+ YYSYMBOL_PERPRIMITIVENV = 441, /* PERPRIMITIVENV */
+ YYSYMBOL_PERVIEWNV = 442, /* PERVIEWNV */
+ YYSYMBOL_PERTASKNV = 443, /* PERTASKNV */
+ YYSYMBOL_PRECISE = 444, /* PRECISE */
+ YYSYMBOL_YYACCEPT = 445, /* $accept */
+ YYSYMBOL_variable_identifier = 446, /* variable_identifier */
+ YYSYMBOL_primary_expression = 447, /* primary_expression */
+ YYSYMBOL_postfix_expression = 448, /* postfix_expression */
+ YYSYMBOL_integer_expression = 449, /* integer_expression */
+ YYSYMBOL_function_call = 450, /* function_call */
+ YYSYMBOL_function_call_or_method = 451, /* function_call_or_method */
+ YYSYMBOL_function_call_generic = 452, /* function_call_generic */
+ YYSYMBOL_function_call_header_no_parameters = 453, /* function_call_header_no_parameters */
+ YYSYMBOL_function_call_header_with_parameters = 454, /* function_call_header_with_parameters */
+ YYSYMBOL_function_call_header = 455, /* function_call_header */
+ YYSYMBOL_function_identifier = 456, /* function_identifier */
+ YYSYMBOL_unary_expression = 457, /* unary_expression */
+ YYSYMBOL_unary_operator = 458, /* unary_operator */
+ YYSYMBOL_multiplicative_expression = 459, /* multiplicative_expression */
+ YYSYMBOL_additive_expression = 460, /* additive_expression */
+ YYSYMBOL_shift_expression = 461, /* shift_expression */
+ YYSYMBOL_relational_expression = 462, /* relational_expression */
+ YYSYMBOL_equality_expression = 463, /* equality_expression */
+ YYSYMBOL_and_expression = 464, /* and_expression */
+ YYSYMBOL_exclusive_or_expression = 465, /* exclusive_or_expression */
+ YYSYMBOL_inclusive_or_expression = 466, /* inclusive_or_expression */
+ YYSYMBOL_logical_and_expression = 467, /* logical_and_expression */
+ YYSYMBOL_logical_xor_expression = 468, /* logical_xor_expression */
+ YYSYMBOL_logical_or_expression = 469, /* logical_or_expression */
+ YYSYMBOL_conditional_expression = 470, /* conditional_expression */
+ YYSYMBOL_471_1 = 471, /* $@1 */
+ YYSYMBOL_assignment_expression = 472, /* assignment_expression */
+ YYSYMBOL_assignment_operator = 473, /* assignment_operator */
+ YYSYMBOL_expression = 474, /* expression */
+ YYSYMBOL_constant_expression = 475, /* constant_expression */
+ YYSYMBOL_declaration = 476, /* declaration */
+ YYSYMBOL_block_structure = 477, /* block_structure */
+ YYSYMBOL_478_2 = 478, /* $@2 */
+ YYSYMBOL_identifier_list = 479, /* identifier_list */
+ YYSYMBOL_function_prototype = 480, /* function_prototype */
+ YYSYMBOL_function_declarator = 481, /* function_declarator */
+ YYSYMBOL_function_header_with_parameters = 482, /* function_header_with_parameters */
+ YYSYMBOL_function_header = 483, /* function_header */
+ YYSYMBOL_parameter_declarator = 484, /* parameter_declarator */
+ YYSYMBOL_parameter_declaration = 485, /* parameter_declaration */
+ YYSYMBOL_parameter_type_specifier = 486, /* parameter_type_specifier */
+ YYSYMBOL_init_declarator_list = 487, /* init_declarator_list */
+ YYSYMBOL_single_declaration = 488, /* single_declaration */
+ YYSYMBOL_fully_specified_type = 489, /* fully_specified_type */
+ YYSYMBOL_invariant_qualifier = 490, /* invariant_qualifier */
+ YYSYMBOL_interpolation_qualifier = 491, /* interpolation_qualifier */
+ YYSYMBOL_layout_qualifier = 492, /* layout_qualifier */
+ YYSYMBOL_layout_qualifier_id_list = 493, /* layout_qualifier_id_list */
+ YYSYMBOL_layout_qualifier_id = 494, /* layout_qualifier_id */
+ YYSYMBOL_precise_qualifier = 495, /* precise_qualifier */
+ YYSYMBOL_type_qualifier = 496, /* type_qualifier */
+ YYSYMBOL_single_type_qualifier = 497, /* single_type_qualifier */
+ YYSYMBOL_storage_qualifier = 498, /* storage_qualifier */
+ YYSYMBOL_non_uniform_qualifier = 499, /* non_uniform_qualifier */
+ YYSYMBOL_type_name_list = 500, /* type_name_list */
+ YYSYMBOL_type_specifier = 501, /* type_specifier */
+ YYSYMBOL_array_specifier = 502, /* array_specifier */
+ YYSYMBOL_type_parameter_specifier_opt = 503, /* type_parameter_specifier_opt */
+ YYSYMBOL_type_parameter_specifier = 504, /* type_parameter_specifier */
+ YYSYMBOL_type_parameter_specifier_list = 505, /* type_parameter_specifier_list */
+ YYSYMBOL_type_specifier_nonarray = 506, /* type_specifier_nonarray */
+ YYSYMBOL_precision_qualifier = 507, /* precision_qualifier */
+ YYSYMBOL_struct_specifier = 508, /* struct_specifier */
+ YYSYMBOL_509_3 = 509, /* $@3 */
+ YYSYMBOL_510_4 = 510, /* $@4 */
+ YYSYMBOL_struct_declaration_list = 511, /* struct_declaration_list */
+ YYSYMBOL_struct_declaration = 512, /* struct_declaration */
+ YYSYMBOL_struct_declarator_list = 513, /* struct_declarator_list */
+ YYSYMBOL_struct_declarator = 514, /* struct_declarator */
+ YYSYMBOL_initializer = 515, /* initializer */
+ YYSYMBOL_initializer_list = 516, /* initializer_list */
+ YYSYMBOL_declaration_statement = 517, /* declaration_statement */
+ YYSYMBOL_statement = 518, /* statement */
+ YYSYMBOL_simple_statement = 519, /* simple_statement */
+ YYSYMBOL_demote_statement = 520, /* demote_statement */
+ YYSYMBOL_compound_statement = 521, /* compound_statement */
+ YYSYMBOL_522_5 = 522, /* $@5 */
+ YYSYMBOL_523_6 = 523, /* $@6 */
+ YYSYMBOL_statement_no_new_scope = 524, /* statement_no_new_scope */
+ YYSYMBOL_statement_scoped = 525, /* statement_scoped */
+ YYSYMBOL_526_7 = 526, /* $@7 */
+ YYSYMBOL_527_8 = 527, /* $@8 */
+ YYSYMBOL_compound_statement_no_new_scope = 528, /* compound_statement_no_new_scope */
+ YYSYMBOL_statement_list = 529, /* statement_list */
+ YYSYMBOL_expression_statement = 530, /* expression_statement */
+ YYSYMBOL_selection_statement = 531, /* selection_statement */
+ YYSYMBOL_selection_statement_nonattributed = 532, /* selection_statement_nonattributed */
+ YYSYMBOL_selection_rest_statement = 533, /* selection_rest_statement */
+ YYSYMBOL_condition = 534, /* condition */
+ YYSYMBOL_switch_statement = 535, /* switch_statement */
+ YYSYMBOL_switch_statement_nonattributed = 536, /* switch_statement_nonattributed */
+ YYSYMBOL_537_9 = 537, /* $@9 */
+ YYSYMBOL_switch_statement_list = 538, /* switch_statement_list */
+ YYSYMBOL_case_label = 539, /* case_label */
+ YYSYMBOL_iteration_statement = 540, /* iteration_statement */
+ YYSYMBOL_iteration_statement_nonattributed = 541, /* iteration_statement_nonattributed */
+ YYSYMBOL_542_10 = 542, /* $@10 */
+ YYSYMBOL_543_11 = 543, /* $@11 */
+ YYSYMBOL_544_12 = 544, /* $@12 */
+ YYSYMBOL_for_init_statement = 545, /* for_init_statement */
+ YYSYMBOL_conditionopt = 546, /* conditionopt */
+ YYSYMBOL_for_rest_statement = 547, /* for_rest_statement */
+ YYSYMBOL_jump_statement = 548, /* jump_statement */
+ YYSYMBOL_translation_unit = 549, /* translation_unit */
+ YYSYMBOL_external_declaration = 550, /* external_declaration */
+ YYSYMBOL_function_definition = 551, /* function_definition */
+ YYSYMBOL_552_13 = 552, /* $@13 */
+ YYSYMBOL_attribute = 553, /* attribute */
+ YYSYMBOL_attribute_list = 554, /* attribute_list */
+ YYSYMBOL_single_attribute = 555 /* single_attribute */
};
typedef enum yysymbol_kind_t yysymbol_kind_t;
/* Second part of user prologue. */
-#line 133 "glslang/MachineIndependent/glslang.y"
+#line 133 "MachineIndependent/glslang.y"
/* windows only pragma */
@@ -696,7 +698,7 @@
extern int yylex(YYSTYPE*, TParseContext&);
-#line 700 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 702 "MachineIndependent/glslang_tab.cpp"
#ifdef short
@@ -1002,19 +1004,19 @@
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 416
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 10058
+#define YYLAST 10537
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 443
+#define YYNTOKENS 445
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 111
/* YYNRULES -- Number of rules. */
-#define YYNRULES 614
+#define YYNRULES 617
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 760
+#define YYNSTATES 765
/* YYMAXUTOK -- Last valid token kind. */
-#define YYMAXUTOK 697
+#define YYMAXUTOK 699
/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -1097,75 +1099,75 @@
405, 406, 407, 408, 409, 410, 411, 412, 413, 414,
415, 416, 417, 418, 419, 420, 421, 422, 423, 424,
425, 426, 427, 428, 429, 430, 431, 432, 433, 434,
- 435, 436, 437, 438, 439, 440, 441, 442
+ 435, 436, 437, 438, 439, 440, 441, 442, 443, 444
};
#if YYDEBUG
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_int16 yyrline[] =
{
- 0, 370, 370, 376, 379, 384, 387, 390, 394, 398,
- 401, 405, 409, 413, 417, 421, 425, 431, 439, 442,
- 445, 448, 451, 456, 464, 471, 478, 484, 488, 495,
- 498, 504, 511, 521, 529, 534, 562, 571, 577, 581,
- 585, 605, 606, 607, 608, 614, 615, 620, 625, 634,
- 635, 640, 648, 649, 655, 664, 665, 670, 675, 680,
- 688, 689, 698, 710, 711, 720, 721, 730, 731, 740,
- 741, 749, 750, 758, 759, 767, 768, 768, 786, 787,
- 803, 807, 811, 815, 820, 824, 828, 832, 836, 840,
- 844, 851, 854, 865, 872, 877, 882, 889, 893, 897,
- 901, 906, 911, 920, 920, 931, 935, 942, 949, 952,
- 959, 967, 987, 1010, 1025, 1050, 1061, 1071, 1081, 1091,
- 1100, 1103, 1107, 1111, 1116, 1124, 1131, 1136, 1141, 1146,
- 1155, 1165, 1192, 1201, 1208, 1216, 1223, 1230, 1238, 1248,
- 1255, 1266, 1272, 1275, 1282, 1286, 1290, 1299, 1309, 1312,
- 1323, 1326, 1329, 1333, 1337, 1342, 1346, 1353, 1357, 1362,
- 1368, 1374, 1381, 1386, 1394, 1400, 1412, 1426, 1432, 1437,
- 1445, 1453, 1461, 1469, 1477, 1485, 1493, 1501, 1508, 1515,
- 1519, 1524, 1529, 1534, 1539, 1544, 1549, 1553, 1557, 1561,
- 1565, 1571, 1582, 1589, 1592, 1601, 1606, 1616, 1621, 1629,
- 1633, 1643, 1646, 1652, 1658, 1665, 1675, 1679, 1683, 1687,
- 1692, 1696, 1701, 1706, 1711, 1716, 1721, 1726, 1731, 1736,
- 1741, 1747, 1753, 1759, 1764, 1769, 1774, 1779, 1784, 1789,
- 1794, 1799, 1804, 1809, 1814, 1820, 1827, 1832, 1837, 1842,
- 1847, 1852, 1857, 1862, 1867, 1872, 1877, 1882, 1890, 1898,
- 1906, 1912, 1918, 1924, 1930, 1936, 1942, 1948, 1954, 1960,
- 1966, 1972, 1978, 1984, 1990, 1996, 2002, 2008, 2014, 2020,
- 2026, 2032, 2038, 2044, 2050, 2056, 2062, 2068, 2074, 2080,
- 2086, 2092, 2098, 2104, 2112, 2120, 2128, 2136, 2144, 2152,
- 2160, 2168, 2176, 2184, 2192, 2200, 2206, 2212, 2218, 2224,
- 2230, 2236, 2242, 2248, 2254, 2260, 2266, 2272, 2278, 2284,
- 2290, 2296, 2302, 2308, 2314, 2320, 2326, 2332, 2338, 2344,
- 2350, 2356, 2362, 2368, 2374, 2380, 2386, 2392, 2398, 2404,
- 2410, 2416, 2420, 2424, 2428, 2433, 2439, 2444, 2449, 2454,
- 2459, 2464, 2469, 2475, 2480, 2485, 2490, 2495, 2500, 2506,
- 2512, 2518, 2524, 2530, 2536, 2542, 2548, 2554, 2560, 2566,
- 2572, 2578, 2584, 2589, 2594, 2599, 2604, 2609, 2614, 2620,
- 2625, 2630, 2635, 2640, 2645, 2650, 2655, 2661, 2666, 2671,
- 2676, 2681, 2686, 2691, 2696, 2701, 2706, 2711, 2716, 2721,
- 2726, 2731, 2737, 2742, 2747, 2753, 2759, 2764, 2769, 2774,
- 2780, 2785, 2790, 2795, 2801, 2806, 2811, 2816, 2822, 2827,
- 2832, 2837, 2843, 2849, 2855, 2861, 2866, 2872, 2878, 2884,
- 2889, 2894, 2899, 2904, 2909, 2915, 2920, 2925, 2930, 2936,
- 2941, 2946, 2951, 2957, 2962, 2967, 2972, 2978, 2983, 2988,
- 2993, 2999, 3004, 3009, 3014, 3020, 3025, 3030, 3035, 3041,
- 3046, 3051, 3056, 3062, 3067, 3072, 3077, 3083, 3088, 3093,
- 3098, 3104, 3109, 3114, 3119, 3125, 3130, 3135, 3140, 3146,
- 3151, 3156, 3161, 3167, 3172, 3177, 3182, 3188, 3193, 3198,
- 3203, 3209, 3214, 3219, 3224, 3229, 3234, 3239, 3244, 3249,
- 3254, 3259, 3264, 3269, 3274, 3279, 3284, 3289, 3294, 3299,
- 3304, 3309, 3314, 3319, 3324, 3329, 3335, 3341, 3347, 3353,
- 3360, 3367, 3373, 3379, 3385, 3391, 3397, 3403, 3410, 3415,
- 3431, 3436, 3441, 3449, 3449, 3460, 3460, 3470, 3473, 3486,
- 3508, 3535, 3539, 3545, 3550, 3561, 3565, 3571, 3582, 3585,
- 3592, 3596, 3597, 3603, 3604, 3605, 3606, 3607, 3608, 3609,
- 3611, 3617, 3626, 3627, 3631, 3627, 3643, 3644, 3648, 3648,
- 3655, 3655, 3669, 3672, 3680, 3688, 3699, 3700, 3704, 3708,
- 3715, 3722, 3726, 3734, 3738, 3751, 3755, 3762, 3762, 3782,
- 3785, 3791, 3803, 3815, 3819, 3826, 3826, 3841, 3841, 3857,
- 3857, 3878, 3881, 3887, 3890, 3896, 3900, 3907, 3912, 3917,
- 3924, 3927, 3931, 3940, 3944, 3953, 3956, 3960, 3969, 3969,
- 4011, 4017, 4020, 4025, 4028
+ 0, 371, 371, 377, 380, 385, 388, 391, 395, 399,
+ 402, 406, 410, 414, 418, 422, 426, 432, 440, 443,
+ 446, 449, 452, 457, 465, 472, 479, 485, 489, 496,
+ 499, 505, 512, 522, 530, 535, 563, 572, 578, 582,
+ 586, 606, 607, 608, 609, 615, 616, 621, 626, 635,
+ 636, 641, 649, 650, 656, 665, 666, 671, 676, 681,
+ 689, 690, 699, 711, 712, 721, 722, 731, 732, 741,
+ 742, 750, 751, 759, 760, 768, 769, 769, 787, 788,
+ 804, 808, 812, 816, 821, 825, 829, 833, 837, 841,
+ 845, 852, 855, 866, 873, 878, 883, 890, 894, 898,
+ 902, 907, 912, 921, 921, 932, 936, 943, 950, 953,
+ 960, 968, 988, 1011, 1026, 1051, 1062, 1072, 1082, 1092,
+ 1101, 1104, 1108, 1112, 1117, 1125, 1132, 1137, 1142, 1147,
+ 1156, 1166, 1193, 1202, 1209, 1217, 1224, 1231, 1239, 1249,
+ 1256, 1267, 1273, 1276, 1283, 1287, 1291, 1300, 1310, 1313,
+ 1324, 1327, 1330, 1334, 1338, 1343, 1347, 1354, 1358, 1363,
+ 1369, 1375, 1382, 1387, 1395, 1401, 1413, 1427, 1433, 1438,
+ 1446, 1454, 1462, 1470, 1478, 1486, 1494, 1502, 1509, 1516,
+ 1520, 1525, 1530, 1535, 1540, 1545, 1550, 1554, 1558, 1562,
+ 1566, 1572, 1583, 1590, 1593, 1602, 1607, 1617, 1622, 1630,
+ 1634, 1644, 1647, 1653, 1659, 1666, 1676, 1680, 1684, 1688,
+ 1693, 1697, 1702, 1707, 1712, 1717, 1722, 1727, 1732, 1737,
+ 1742, 1748, 1754, 1760, 1765, 1770, 1775, 1780, 1785, 1790,
+ 1795, 1800, 1805, 1810, 1815, 1821, 1828, 1833, 1838, 1843,
+ 1848, 1853, 1858, 1863, 1868, 1873, 1878, 1883, 1891, 1899,
+ 1907, 1913, 1919, 1925, 1931, 1937, 1943, 1949, 1955, 1961,
+ 1967, 1973, 1979, 1985, 1991, 1997, 2003, 2009, 2015, 2021,
+ 2027, 2033, 2039, 2045, 2051, 2057, 2063, 2069, 2075, 2081,
+ 2087, 2093, 2099, 2105, 2113, 2121, 2129, 2137, 2145, 2153,
+ 2161, 2169, 2177, 2185, 2193, 2201, 2207, 2213, 2219, 2225,
+ 2231, 2237, 2243, 2249, 2255, 2261, 2267, 2273, 2279, 2285,
+ 2291, 2297, 2303, 2309, 2315, 2321, 2327, 2333, 2339, 2345,
+ 2351, 2357, 2363, 2369, 2375, 2381, 2387, 2393, 2399, 2405,
+ 2411, 2417, 2421, 2425, 2429, 2434, 2440, 2445, 2450, 2455,
+ 2460, 2465, 2470, 2476, 2481, 2486, 2491, 2496, 2501, 2507,
+ 2513, 2519, 2525, 2531, 2537, 2543, 2549, 2555, 2561, 2567,
+ 2573, 2579, 2585, 2590, 2595, 2600, 2605, 2610, 2615, 2621,
+ 2626, 2631, 2636, 2641, 2646, 2651, 2656, 2662, 2667, 2672,
+ 2677, 2682, 2687, 2692, 2697, 2702, 2707, 2712, 2717, 2722,
+ 2727, 2732, 2738, 2743, 2748, 2754, 2760, 2765, 2770, 2775,
+ 2781, 2786, 2791, 2796, 2802, 2807, 2812, 2817, 2823, 2828,
+ 2833, 2838, 2844, 2850, 2856, 2862, 2867, 2873, 2879, 2885,
+ 2890, 2895, 2900, 2905, 2910, 2916, 2921, 2926, 2931, 2937,
+ 2942, 2947, 2952, 2958, 2963, 2968, 2973, 2979, 2984, 2989,
+ 2994, 3000, 3005, 3010, 3015, 3021, 3026, 3031, 3036, 3042,
+ 3047, 3052, 3057, 3063, 3068, 3073, 3078, 3084, 3089, 3094,
+ 3099, 3105, 3110, 3115, 3120, 3126, 3131, 3136, 3141, 3147,
+ 3152, 3157, 3162, 3168, 3173, 3178, 3183, 3189, 3194, 3199,
+ 3204, 3210, 3215, 3220, 3225, 3230, 3235, 3240, 3245, 3250,
+ 3255, 3260, 3265, 3270, 3275, 3280, 3285, 3290, 3295, 3300,
+ 3305, 3310, 3315, 3320, 3325, 3330, 3336, 3342, 3348, 3354,
+ 3361, 3368, 3374, 3380, 3386, 3392, 3398, 3404, 3411, 3416,
+ 3432, 3437, 3442, 3450, 3450, 3461, 3461, 3471, 3474, 3487,
+ 3509, 3536, 3540, 3546, 3551, 3562, 3566, 3572, 3578, 3589,
+ 3592, 3599, 3603, 3604, 3610, 3611, 3612, 3613, 3614, 3615,
+ 3616, 3618, 3624, 3633, 3634, 3638, 3634, 3650, 3651, 3655,
+ 3655, 3662, 3662, 3676, 3679, 3687, 3695, 3706, 3707, 3711,
+ 3715, 3722, 3729, 3733, 3741, 3745, 3758, 3762, 3769, 3769,
+ 3789, 3792, 3798, 3810, 3822, 3826, 3833, 3833, 3848, 3848,
+ 3864, 3864, 3885, 3888, 3894, 3897, 3903, 3907, 3914, 3919,
+ 3924, 3931, 3934, 3938, 3943, 3947, 3957, 3961, 3970, 3973,
+ 3977, 3986, 3986, 4028, 4034, 4037, 4042, 4045
};
#endif
@@ -1266,19 +1268,20 @@
"IDENTIFIER", "TYPE_NAME", "CENTROID", "IN", "OUT", "INOUT", "STRUCT",
"VOID", "WHILE", "BREAK", "CONTINUE", "DO", "ELSE", "FOR", "IF",
"DISCARD", "RETURN", "SWITCH", "CASE", "DEFAULT", "TERMINATE_INVOCATION",
- "UNIFORM", "SHARED", "BUFFER", "FLAT", "SMOOTH", "LAYOUT",
- "DOUBLECONSTANT", "INT16CONSTANT", "UINT16CONSTANT", "FLOAT16CONSTANT",
- "INT32CONSTANT", "UINT32CONSTANT", "INT64CONSTANT", "UINT64CONSTANT",
- "SUBROUTINE", "DEMOTE", "PAYLOADNV", "PAYLOADINNV", "HITATTRNV",
- "CALLDATANV", "CALLDATAINNV", "PAYLOADEXT", "PAYLOADINEXT", "HITATTREXT",
- "CALLDATAEXT", "CALLDATAINEXT", "PATCH", "SAMPLE", "NONUNIFORM",
- "COHERENT", "VOLATILE", "RESTRICT", "READONLY", "WRITEONLY",
- "DEVICECOHERENT", "QUEUEFAMILYCOHERENT", "WORKGROUPCOHERENT",
- "SUBGROUPCOHERENT", "NONPRIVATE", "SHADERCALLCOHERENT", "NOPERSPECTIVE",
- "EXPLICITINTERPAMD", "PERVERTEXNV", "PERPRIMITIVENV", "PERVIEWNV",
- "PERTASKNV", "PRECISE", "$accept", "variable_identifier",
- "primary_expression", "postfix_expression", "integer_expression",
- "function_call", "function_call_or_method", "function_call_generic",
+ "TERMINATE_RAY", "IGNORE_INTERSECTION", "UNIFORM", "SHARED", "BUFFER",
+ "FLAT", "SMOOTH", "LAYOUT", "DOUBLECONSTANT", "INT16CONSTANT",
+ "UINT16CONSTANT", "FLOAT16CONSTANT", "INT32CONSTANT", "UINT32CONSTANT",
+ "INT64CONSTANT", "UINT64CONSTANT", "SUBROUTINE", "DEMOTE", "PAYLOADNV",
+ "PAYLOADINNV", "HITATTRNV", "CALLDATANV", "CALLDATAINNV", "PAYLOADEXT",
+ "PAYLOADINEXT", "HITATTREXT", "CALLDATAEXT", "CALLDATAINEXT", "PATCH",
+ "SAMPLE", "NONUNIFORM", "COHERENT", "VOLATILE", "RESTRICT", "READONLY",
+ "WRITEONLY", "DEVICECOHERENT", "QUEUEFAMILYCOHERENT",
+ "WORKGROUPCOHERENT", "SUBGROUPCOHERENT", "NONPRIVATE",
+ "SHADERCALLCOHERENT", "NOPERSPECTIVE", "EXPLICITINTERPAMD",
+ "PERVERTEXNV", "PERPRIMITIVENV", "PERVIEWNV", "PERTASKNV", "PRECISE",
+ "$accept", "variable_identifier", "primary_expression",
+ "postfix_expression", "integer_expression", "function_call",
+ "function_call_or_method", "function_call_generic",
"function_call_header_no_parameters",
"function_call_header_with_parameters", "function_call_header",
"function_identifier", "unary_expression", "unary_operator",
@@ -1373,16 +1376,16 @@
665, 666, 667, 668, 669, 670, 671, 672, 673, 674,
675, 676, 677, 678, 679, 680, 681, 682, 683, 684,
685, 686, 687, 688, 689, 690, 691, 692, 693, 694,
- 695, 696, 697
+ 695, 696, 697, 698, 699
};
#endif
-#define YYPACT_NINF (-728)
+#define YYPACT_NINF (-733)
#define yypact_value_is_default(Yyn) \
((Yyn) == YYPACT_NINF)
-#define YYTABLE_NINF (-559)
+#define YYTABLE_NINF (-560)
#define yytable_value_is_error(Yyn) \
0
@@ -1391,82 +1394,83 @@
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- 4283, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- 109, -728, -728, -728, -728, -728, 1, -728, -728, -728,
- -728, -728, -728, -327, -323, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, 11, -271, 12,
- 19, 6483, 8, -728, 57, -728, -728, -728, -728, 4723,
- -728, -728, -728, -728, 37, -728, -728, 763, -728, -728,
- 16, -728, 107, -29, 92, -728, -336, -728, 136, -728,
- 6483, -728, -728, -728, 6483, 110, 117, -728, 54, -728,
- 68, -728, -728, 9027, 140, -728, -728, -728, 134, 6483,
- -728, 146, -728, 13, -728, -728, 59, 7343, -728, -335,
- 1203, -728, -728, -728, -728, 140, -331, -728, 7764, -330,
- -728, 126, -728, 85, 9027, 9027, -728, 9027, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, 36, -728, -728,
- -728, 170, 66, 9448, 173, -728, 9027, -728, -728, -343,
- 172, -728, 6483, 141, 5163, -728, 6483, 9027, -728, -29,
- -728, 145, -728, -728, 142, 93, 108, 26, 114, 154,
- 157, 159, 196, 195, 23, 181, 8185, -728, 183, 182,
- -728, -728, 186, 178, 180, -728, 191, 192, 184, 8606,
- 193, 9027, 187, 188, 194, 129, -728, -728, 99, -728,
- -271, 197, 202, -728, -728, -728, -728, -728, 1643, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, -22, 172,
- 7764, 21, 7764, -728, -728, 7764, 6483, -728, 160, -728,
- -728, -728, 76, -728, -728, 9027, 167, -728, -728, 9027,
- 204, -728, -728, -728, 9027, -728, 141, 140, 106, -728,
- -728, -728, 5603, -728, -728, -728, -728, 9027, 9027, 9027,
- 9027, 9027, 9027, 9027, 9027, 9027, 9027, 9027, 9027, 9027,
- 9027, 9027, 9027, 9027, 9027, 9027, -728, -728, -728, 207,
- 171, -728, 2083, -728, -728, -728, 2083, -728, 9027, -728,
- -728, 122, 9027, 143, -728, -728, -728, -728, -728, -728,
- -728, -728, -728, -728, -728, -728, -728, -728, 9027, 9027,
- -728, -728, -728, -728, -728, -728, -728, 7764, -728, 132,
- -728, 6043, -728, -728, 208, 205, -728, -728, -728, 123,
- 172, 141, -728, -728, -728, -728, -728, 142, 142, 93,
- 93, 108, 108, 108, 108, 26, 26, 114, 154, 157,
- 159, 196, 195, 9027, -728, 213, 61, -728, 2083, 3843,
- 174, 3403, 78, -728, 81, -728, -728, -728, -728, -728,
- 6922, -728, -728, -728, -728, 153, 9027, 211, 171, 210,
- 205, 185, 6483, 218, 220, -728, -728, 3843, 219, -728,
- -728, -728, 9027, 221, -728, -728, -728, 215, 2523, 9027,
- -728, 217, 224, 189, 225, 2963, -728, 226, -728, -728,
- 7764, -728, -728, -728, 83, 9027, 2523, 219, -728, -728,
- 2083, -728, 222, 205, -728, -728, 2083, 223, -728, -728
+ 4304, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ 109, -733, -733, -733, -733, -733, 3, -733, -733, -733,
+ -733, -733, -733, -322, -261, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, 19, 101, 140,
+ 79, 6514, 57, -733, 96, -733, -733, -733, -733, 4746,
+ -733, -733, -733, -733, 133, -733, -733, 768, -733, -733,
+ 16, -733, 151, -32, 125, -733, -335, -733, 158, -733,
+ 6514, -733, -733, -733, 6514, 127, 128, -733, 13, -733,
+ 72, -733, -733, 9493, 163, -733, -733, -733, 156, 6514,
+ -733, 160, -733, 20, -733, -733, 61, 7801, -733, 10,
+ 1210, -733, -733, -733, -733, 163, -330, -733, 8224, 14,
+ -733, 134, -733, 88, 9493, 9493, -733, 9493, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, 54, -733, -733,
+ -733, 166, 62, 9916, 171, -733, 9493, -733, -733, -343,
+ 173, -733, 6514, 137, 5188, -733, 6514, 9493, -733, -32,
+ -733, 141, -733, -733, 122, 93, 39, 28, 41, 157,
+ 159, 161, 192, 195, 21, 181, 8647, -733, 183, 182,
+ -733, -733, 186, 178, 179, -733, 190, 191, 184, 9070,
+ 196, 9493, 187, 188, 189, 194, 197, 131, -733, -733,
+ 99, -733, 101, 200, 205, -733, -733, -733, -733, -733,
+ 1652, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -376, 173, 8224, 36, 6955, -733, -733, 8224, 6514, -733,
+ 170, -733, -733, -733, 71, -733, -733, 9493, 176, -733,
+ -733, 9493, 208, -733, -733, -733, 9493, -733, 137, 163,
+ 106, -733, -733, -733, 5630, -733, -733, -733, -733, 9493,
+ 9493, 9493, 9493, 9493, 9493, 9493, 9493, 9493, 9493, 9493,
+ 9493, 9493, 9493, 9493, 9493, 9493, 9493, 9493, -733, -733,
+ -733, 210, 180, -733, 2094, -733, -733, -733, 2094, -733,
+ 9493, -733, -733, 108, 9493, 29, -733, -733, -733, -733,
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, 9493, 9493, -733, -733, -733, -733, -733, -733,
+ -733, 8224, -733, -733, 139, -733, 6072, -733, -733, 211,
+ 185, -733, -733, -733, 123, 173, 137, -733, -733, -733,
+ -733, -733, 122, 122, 93, 93, 39, 39, 39, 39,
+ 28, 28, 41, 157, 159, 161, 192, 195, 9493, -733,
+ 215, 85, -733, 2094, 3862, 153, 3420, 76, -733, 80,
+ -733, -733, -733, -733, -733, 7378, -733, -733, -733, -733,
+ 86, 9493, 214, 180, 216, 185, 193, 6514, 219, 222,
+ -733, -733, 3862, 220, -733, -733, -733, 9493, 224, -733,
+ -733, -733, 217, 2536, 9493, -733, 213, 226, 199, 227,
+ 2978, -733, 228, -733, -733, 8224, -733, -733, -733, 83,
+ 9493, 2536, 220, -733, -733, 2094, -733, 223, 185, -733,
+ -733, 2094, 225, -733, -733
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1505,85 +1509,86 @@
421, 415, 420, 422, 423, 425, 426, 427, 429, 430,
431, 433, 434, 435, 437, 438, 411, 412, 413, 424,
414, 416, 417, 418, 428, 432, 436, 507, 508, 511,
- 512, 513, 514, 509, 510, 607, 132, 520, 521, 522,
+ 512, 513, 514, 509, 510, 610, 132, 520, 521, 522,
0, 519, 161, 159, 160, 158, 0, 206, 162, 163,
164, 134, 133, 0, 190, 171, 173, 169, 175, 177,
172, 174, 170, 176, 178, 167, 168, 192, 179, 186,
187, 188, 189, 180, 181, 182, 183, 184, 185, 135,
- 136, 137, 138, 139, 140, 147, 606, 0, 608, 0,
+ 136, 137, 138, 139, 140, 147, 609, 0, 611, 0,
109, 108, 0, 120, 125, 154, 153, 151, 155, 0,
- 148, 150, 156, 130, 202, 152, 518, 0, 603, 605,
+ 148, 150, 156, 130, 202, 152, 518, 0, 606, 608,
0, 525, 0, 0, 0, 97, 0, 94, 0, 107,
0, 116, 110, 118, 0, 119, 0, 95, 126, 100,
- 0, 149, 131, 0, 195, 201, 1, 604, 0, 0,
+ 0, 149, 131, 0, 195, 201, 1, 607, 0, 0,
523, 144, 146, 0, 142, 193, 0, 0, 98, 0,
- 0, 609, 111, 115, 117, 113, 121, 112, 0, 127,
+ 0, 612, 111, 115, 117, 113, 121, 112, 0, 127,
103, 0, 101, 0, 0, 0, 9, 0, 43, 42,
44, 41, 5, 6, 7, 8, 2, 16, 14, 15,
17, 10, 11, 12, 13, 3, 18, 37, 20, 25,
26, 0, 0, 30, 0, 204, 0, 36, 34, 0,
196, 96, 0, 0, 0, 527, 0, 0, 141, 0,
191, 0, 197, 45, 49, 52, 55, 60, 63, 65,
- 67, 69, 71, 73, 75, 0, 0, 99, 0, 553,
- 562, 566, 0, 0, 0, 587, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 45, 78, 91, 0, 540,
- 0, 156, 130, 543, 564, 542, 550, 541, 0, 544,
- 545, 568, 546, 575, 547, 548, 583, 549, 0, 114,
- 0, 122, 0, 535, 129, 0, 0, 105, 0, 102,
- 38, 39, 0, 22, 23, 0, 0, 28, 27, 0,
- 206, 31, 33, 40, 0, 203, 0, 533, 0, 531,
- 526, 528, 0, 93, 145, 143, 194, 0, 0, 0,
+ 67, 69, 71, 73, 75, 0, 0, 99, 0, 554,
+ 563, 567, 0, 0, 0, 588, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 45, 78, 91,
+ 0, 541, 0, 156, 130, 544, 565, 543, 551, 542,
+ 0, 545, 546, 569, 547, 576, 548, 549, 584, 550,
+ 0, 114, 0, 122, 0, 535, 129, 0, 0, 105,
+ 0, 102, 38, 39, 0, 22, 23, 0, 0, 28,
+ 27, 0, 206, 31, 33, 40, 0, 203, 0, 533,
+ 0, 531, 526, 528, 0, 93, 145, 143, 194, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 76, 198, 199, 0,
- 0, 552, 0, 585, 598, 597, 0, 589, 0, 601,
- 599, 0, 0, 0, 582, 602, 551, 81, 82, 84,
- 83, 86, 87, 88, 89, 90, 85, 80, 0, 0,
- 567, 563, 565, 569, 576, 584, 124, 0, 538, 0,
- 128, 0, 106, 4, 0, 24, 21, 32, 205, 0,
- 534, 0, 529, 524, 46, 47, 48, 51, 50, 53,
- 54, 58, 59, 56, 57, 61, 62, 64, 66, 68,
- 70, 72, 74, 0, 200, 613, 0, 611, 554, 0,
- 0, 0, 0, 600, 0, 581, 79, 92, 123, 536,
- 0, 104, 19, 530, 532, 0, 0, 0, 0, 0,
- 573, 0, 0, 0, 0, 592, 591, 594, 560, 577,
- 537, 539, 0, 0, 610, 612, 555, 0, 0, 0,
- 593, 0, 0, 572, 0, 0, 570, 0, 77, 614,
- 0, 557, 586, 556, 0, 595, 0, 560, 559, 561,
- 579, 574, 0, 596, 590, 571, 580, 0, 588, 578
+ 0, 0, 0, 0, 0, 0, 0, 0, 76, 198,
+ 199, 0, 0, 553, 0, 586, 599, 598, 0, 590,
+ 0, 602, 600, 0, 0, 0, 583, 603, 604, 605,
+ 552, 81, 82, 84, 83, 86, 87, 88, 89, 90,
+ 85, 80, 0, 0, 568, 564, 566, 570, 577, 585,
+ 124, 0, 538, 539, 0, 128, 0, 106, 4, 0,
+ 24, 21, 32, 205, 0, 534, 0, 529, 524, 46,
+ 47, 48, 51, 50, 53, 54, 58, 59, 56, 57,
+ 61, 62, 64, 66, 68, 70, 72, 74, 0, 200,
+ 616, 0, 614, 555, 0, 0, 0, 0, 601, 0,
+ 582, 79, 92, 123, 536, 0, 104, 19, 530, 532,
+ 0, 0, 0, 0, 0, 574, 0, 0, 0, 0,
+ 593, 592, 595, 561, 578, 537, 540, 0, 0, 613,
+ 615, 556, 0, 0, 0, 594, 0, 0, 573, 0,
+ 0, 571, 0, 77, 617, 0, 558, 587, 557, 0,
+ 596, 0, 561, 560, 562, 580, 575, 0, 597, 591,
+ 572, 581, 0, 589, 579
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -728, -728, -728, -728, -728, -728, -728, -728, -728, -728,
- -728, -728, 9352, -728, -87, -84, -154, -93, -30, -28,
- -27, -26, -25, -31, -728, -86, -728, -99, -728, -111,
- -126, 2, -728, -728, -728, 4, -728, -728, -728, 177,
- 190, 179, -728, -728, -339, -728, -728, -728, -728, 95,
- -728, -37, -46, -728, 9, -728, 0, -63, -728, -728,
- -728, -728, 265, -728, -728, -728, -479, -149, 10, -74,
- -212, -728, -103, -201, -727, -728, -145, -728, -728, -153,
- -155, -728, -728, 198, -270, -97, -728, 47, -728, -120,
- -728, 50, -728, -728, -728, -728, 51, -728, -728, -728,
- -728, -728, -728, -728, -728, 216, -728, -728, -728, -728,
- -108
+ -733, -733, -733, -733, -733, -733, -733, -733, -733, -733,
+ -733, -733, 9826, -733, -105, -98, -156, -102, -29, -28,
+ -30, -27, -26, -31, -733, -82, -733, -101, -733, -109,
+ -134, 2, -733, -733, -733, 4, -733, -733, -733, 177,
+ 198, 201, -733, -733, -341, -733, -733, -733, -733, 94,
+ -733, -37, -46, -733, 9, -733, 0, -66, -733, -733,
+ -733, -733, 262, -733, -733, -733, -481, -149, 11, -79,
+ -213, -733, -108, -204, -732, -733, -148, -733, -733, -161,
+ -160, -733, -733, 202, -274, -100, -733, 44, -733, -127,
+ -733, 47, -733, -733, -733, -733, 49, -733, -733, -733,
+ -733, -733, -733, -733, -733, 221, -733, -733, -733, -733,
+ -112
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 465, 466, 467, 654, 468, 469, 470, 471, 472,
- 473, 474, 525, 476, 494, 495, 496, 497, 498, 499,
- 500, 501, 502, 503, 504, 526, 683, 527, 638, 528,
- 584, 529, 367, 556, 443, 530, 369, 370, 371, 401,
+ -1, 465, 466, 467, 659, 468, 469, 470, 471, 472,
+ 473, 474, 527, 476, 494, 495, 496, 497, 498, 499,
+ 500, 501, 502, 503, 504, 528, 688, 529, 642, 530,
+ 586, 531, 367, 558, 443, 532, 369, 370, 371, 401,
402, 403, 372, 373, 374, 375, 376, 377, 423, 424,
378, 379, 380, 381, 477, 426, 478, 429, 414, 415,
- 479, 384, 385, 386, 486, 419, 484, 485, 578, 579,
- 554, 649, 533, 534, 535, 536, 537, 612, 709, 742,
- 733, 734, 735, 743, 538, 539, 540, 541, 736, 713,
- 542, 543, 737, 757, 544, 545, 546, 689, 616, 691,
- 717, 731, 732, 547, 387, 388, 389, 398, 548, 686,
- 687
+ 479, 384, 385, 386, 486, 419, 484, 485, 580, 581,
+ 556, 654, 535, 536, 537, 538, 539, 614, 714, 747,
+ 738, 739, 740, 748, 540, 541, 542, 543, 741, 718,
+ 544, 545, 742, 762, 546, 547, 548, 694, 618, 696,
+ 722, 736, 737, 549, 387, 388, 389, 398, 550, 691,
+ 692
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -1591,14 +1596,14 @@
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 383, 741, 366, 574, 368, 427, 506, 582, 749, 382,
- 427, 506, 393, 428, 507, 575, 394, 550, 555, 741,
+ 383, 746, 366, 576, 368, 584, 427, 512, 754, 382,
+ 515, 427, 516, 517, 428, 577, 520, 393, 552, 746,
2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 651, 397, 61,
+ 52, 53, 54, 55, 56, 57, 58, 656, 394, 61,
62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
@@ -1624,672 +1629,145 @@
282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 411, 404, 581, 562, 642, 646, 553,
- 648, 505, 688, 650, 391, 439, 421, 594, 595, 605,
- 711, 480, 399, 488, 406, 563, 564, 407, 411, 489,
- 395, 512, 506, 404, 515, 400, 516, 517, 422, 647,
- 520, 405, 549, 551, 571, -35, 392, 565, 711, 412,
- 382, 566, 482, 596, 597, 606, 396, 383, 382, 366,
- 418, 368, 321, 437, 413, 427, 382, 326, 327, 490,
- 405, 583, 438, 707, 405, 491, 568, 708, 621, 382,
- 623, 440, 569, 382, 441, 690, 653, 442, 718, 483,
- 609, 719, 639, 752, 639, 592, 593, 639, 382, 639,
- 532, 558, 408, 581, 559, 698, 411, 598, 599, 531,
- 671, 672, 673, 674, 590, 639, 591, 482, 640, 482,
- 420, 553, 661, 553, 655, 662, 553, 627, 628, 629,
- 630, 631, 632, 633, 634, 635, 636, 425, 639, 661,
- 657, 693, 703, 317, 318, 319, 699, 637, 700, 430,
- 756, 427, 576, 481, 483, 435, 483, 642, 721, 639,
- 695, 382, 436, 382, 487, 382, 587, 588, 589, 639,
- 722, 557, 581, 667, 668, 675, 676, 692, 669, 670,
- 567, 694, 572, 506, 660, 600, 577, 601, 602, 482,
- 586, 603, 604, 607, 610, 613, 611, 614, 751, 615,
- 617, 618, 622, 619, 624, 652, -36, 625, 532, 696,
- 697, -34, 656, 626, -29, 482, 685, 531, 553, 684,
- 702, 639, 706, 724, 726, 642, 483, 714, 728, 729,
- 727, 739, -558, 740, 746, 382, 745, 759, 509, 750,
- 677, 758, 705, 678, 682, 679, 747, 680, 710, 681,
- 723, 433, 483, 434, 585, 390, 659, 704, 715, 748,
- 432, 382, 755, 754, 716, 643, 431, 730, 644, 645,
- 725, 553, 0, 417, 0, 0, 710, 0, 0, 0,
- 0, 0, 532, 0, 482, 0, 532, 0, 744, 0,
- 583, 531, 0, 738, 0, 531, 0, 0, 0, 0,
- 0, 0, 0, 0, 753, 0, 0, 0, 0, 0,
- 0, 553, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 483, 712, 0, 0, 0, 0, 0, 0, 0,
- 382, 0, 0, 0, 0, 0, 411, 0, 0, 0,
+ 312, 313, 314, 411, 404, 583, 646, 555, 564, 650,
+ 693, 653, 439, 421, 655, 505, 391, 607, 480, 596,
+ 597, 506, 437, 716, 427, 506, 594, 595, 411, 507,
+ 488, 438, 557, 404, 600, 601, 489, 422, 395, 551,
+ 553, 405, 573, 565, 566, 643, 700, 506, 392, 412,
+ 382, 716, 482, 608, 651, 598, 599, 383, 382, 366,
+ 418, 368, 321, -35, 396, 567, 382, 326, 327, 568,
+ 405, 490, 570, 406, 405, 585, 407, 491, 571, 382,
+ 623, 658, 625, 382, 695, 440, 723, 643, 441, 483,
+ 724, 442, 643, 757, 611, 400, 643, 712, 382, 643,
+ 534, 713, 643, 727, 560, 583, 411, 561, 703, 533,
+ 676, 677, 678, 679, 592, 643, 593, 482, 644, 482,
+ 397, 555, 666, 555, 643, 667, 555, 698, 660, 631,
+ 632, 633, 634, 635, 636, 637, 638, 639, 640, 666,
+ 662, 408, 708, 317, 318, 319, 589, 590, 591, 641,
+ 399, 761, 578, 704, 483, 705, 483, 672, 673, 646,
+ 413, 382, 726, 382, 420, 382, 674, 675, 680, 681,
+ 425, 430, 435, 436, 427, 481, 569, 583, 487, 559,
+ 574, 697, 579, 665, 506, 699, 588, 605, 602, 603,
+ 604, 482, 606, 609, 612, 615, 613, 616, 617, 619,
+ 620, 643, 756, 621, 626, 624, 719, 627, 628, -36,
+ 534, 701, 702, 629, -34, 657, 630, 482, -29, 533,
+ 555, 661, 689, 707, 711, 690, 729, 646, 483, 733,
+ 731, 734, 750, -559, 744, 745, 751, 382, 732, 764,
+ 509, 755, 763, 682, 684, 683, 687, 728, 685, 710,
+ 686, 433, 390, 587, 483, 715, 752, 709, 720, 664,
+ 759, 753, 760, 382, 647, 735, 721, 648, 432, 649,
+ 431, 730, 0, 0, 555, 434, 0, 0, 417, 0,
+ 0, 0, 0, 715, 534, 0, 0, 0, 534, 482,
+ 0, 0, 0, 533, 0, 749, 743, 533, 0, 585,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 712, 0, 0, 0, 0, 0, 0, 0, 532, 532,
- 0, 532, 0, 0, 0, 0, 0, 531, 531, 0,
- 531, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 412, 0, 0, 0, 0, 532, 0, 0,
- 0, 382, 0, 0, 0, 0, 531, 0, 532, 0,
- 0, 0, 0, 0, 0, 532, 0, 531, 0, 0,
- 0, 0, 0, 0, 531, 0, 532, 0, 0, 0,
- 532, 0, 0, 0, 0, 531, 532, 0, 0, 531,
- 0, 0, 0, 416, 0, 531, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 0, 758, 0, 0, 555, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 483, 717, 0, 0,
+ 0, 0, 0, 0, 0, 382, 0, 0, 0, 0,
+ 0, 411, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 717, 0, 0, 0, 0,
+ 0, 0, 0, 534, 534, 0, 534, 0, 0, 0,
+ 0, 0, 533, 533, 0, 533, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 412, 0, 0,
+ 0, 0, 534, 0, 0, 0, 382, 0, 0, 0,
+ 0, 533, 0, 534, 0, 0, 0, 0, 0, 0,
+ 534, 0, 533, 0, 0, 0, 0, 0, 0, 533,
+ 0, 534, 0, 0, 0, 534, 0, 0, 0, 0,
+ 533, 534, 0, 0, 533, 0, 0, 0, 416, 0,
+ 533, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
+ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 315, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 320, 0, 0, 0, 0, 0, 0, 0, 0, 321,
- 322, 323, 324, 325, 326, 327, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
- 329, 330, 331, 332, 333, 0, 0, 0, 0, 0,
- 0, 0, 0, 334, 0, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 444, 445, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 446, 447, 0, 508, 0, 509, 510, 0, 0,
- 0, 0, 511, 448, 449, 450, 451, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 320, 0, 0, 0, 452, 453, 454, 455, 456, 321,
- 322, 323, 324, 325, 326, 327, 512, 513, 514, 515,
- 0, 516, 517, 518, 519, 520, 521, 522, 523, 328,
- 329, 330, 331, 332, 333, 457, 458, 459, 460, 461,
- 462, 463, 464, 334, 524, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 444, 445, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 446, 447, 0, 508, 0, 509, 641, 0, 0,
- 0, 0, 511, 448, 449, 450, 451, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 320, 0, 0, 0, 452, 453, 454, 455, 456, 321,
- 322, 323, 324, 325, 326, 327, 512, 513, 514, 515,
- 0, 516, 517, 518, 519, 520, 521, 522, 523, 328,
- 329, 330, 331, 332, 333, 457, 458, 459, 460, 461,
- 462, 463, 464, 334, 524, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 444, 445, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 446, 447, 0, 508, 0, 509, 0, 0, 0,
- 0, 0, 511, 448, 449, 450, 451, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 320, 0, 0, 0, 452, 453, 454, 455, 456, 321,
- 322, 323, 324, 325, 326, 327, 512, 513, 514, 515,
- 0, 516, 517, 518, 519, 520, 521, 522, 523, 328,
- 329, 330, 331, 332, 333, 457, 458, 459, 460, 461,
- 462, 463, 464, 334, 524, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 444, 445, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 446, 447, 0, 508, 0, 430, 0, 0, 0,
- 0, 0, 511, 448, 449, 450, 451, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 320, 0, 0, 0, 452, 453, 454, 455, 456, 321,
- 322, 323, 324, 325, 326, 327, 512, 513, 514, 515,
- 0, 516, 517, 518, 519, 520, 521, 522, 523, 328,
- 329, 330, 331, 332, 333, 457, 458, 459, 460, 461,
- 462, 463, 464, 334, 524, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 444, 445, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 446, 447, 0, 508, 0, 0, 0, 0, 0,
- 0, 0, 511, 448, 449, 450, 451, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 320, 0, 0, 0, 452, 453, 454, 455, 456, 321,
- 322, 323, 324, 325, 326, 327, 512, 513, 514, 515,
- 0, 516, 517, 518, 519, 520, 521, 522, 523, 328,
- 329, 330, 331, 332, 333, 457, 458, 459, 460, 461,
- 462, 463, 464, 334, 524, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 444, 445, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 446, 447, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 511, 448, 449, 450, 451, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 320, 0, 0, 0, 452, 453, 454, 455, 456, 321,
- 322, 323, 324, 325, 326, 327, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
- 329, 330, 331, 332, 333, 457, 458, 459, 460, 461,
- 462, 463, 464, 334, 0, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 444, 445, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 446, 447, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 448, 449, 450, 451, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 0, 0, 0, 0, 452, 453, 454, 455, 456, 321,
- 322, 323, 324, 325, 326, 327, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
- 329, 330, 331, 332, 333, 457, 458, 459, 460, 461,
- 462, 463, 464, 334, 0, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 320, 0, 0, 0, 0, 0, 0, 0, 0, 321,
- 322, 323, 324, 325, 326, 327, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
- 329, 330, 331, 332, 333, 0, 0, 0, 0, 0,
- 0, 0, 0, 334, 0, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 409, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 0, 0, 0, 0, 0, 0, 0, 0, 410, 321,
- 322, 323, 324, 325, 326, 327, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
- 329, 330, 331, 332, 333, 0, 0, 0, 0, 0,
- 0, 0, 0, 334, 0, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 580, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 321,
- 322, 323, 324, 325, 326, 327, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
- 329, 330, 331, 332, 333, 0, 0, 0, 0, 0,
- 0, 0, 0, 334, 0, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 663, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 321,
- 322, 323, 324, 325, 326, 327, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
- 329, 330, 331, 332, 333, 0, 0, 0, 0, 0,
- 0, 0, 0, 334, 0, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 701, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 321,
- 322, 323, 324, 325, 326, 327, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
- 329, 330, 331, 332, 333, 0, 0, 0, 0, 0,
- 0, 0, 0, 334, 0, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 1, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 316, 317, 318, 319,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 321,
- 322, 323, 324, 325, 326, 327, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 328,
- 329, 330, 331, 332, 333, 0, 0, 0, 0, 0,
- 0, 0, 0, 334, 0, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
- 350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 363, 364, 365, 2, 3, 4, 5,
+ 0, 316, 317, 318, 319, 320, 0, 0, 0, 0,
+ 0, 0, 0, 0, 321, 322, 323, 324, 325, 326,
+ 327, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 328, 329, 330, 331,
+ 332, 333, 0, 0, 0, 0, 0, 0, 0, 0,
+ 334, 0, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 349, 350, 351, 352,
+ 353, 354, 355, 356, 357, 358, 359, 360, 361, 362,
+ 363, 364, 365, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+ 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237,
+ 238, 239, 240, 241, 242, 243, 244, 245, 246, 247,
+ 248, 249, 250, 251, 252, 253, 254, 255, 256, 257,
+ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267,
+ 268, 269, 270, 271, 272, 273, 274, 275, 276, 277,
+ 278, 279, 280, 281, 282, 283, 284, 285, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 0, 0, 444,
+ 445, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 446, 447,
+ 0, 508, 0, 509, 510, 0, 0, 0, 0, 511,
+ 448, 449, 450, 451, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 316, 317, 318, 319, 320, 0, 0,
+ 0, 452, 453, 454, 455, 456, 321, 322, 323, 324,
+ 325, 326, 327, 512, 513, 514, 515, 0, 516, 517,
+ 518, 519, 520, 521, 522, 523, 524, 525, 328, 329,
+ 330, 331, 332, 333, 457, 458, 459, 460, 461, 462,
+ 463, 464, 334, 526, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
+ 351, 352, 353, 354, 355, 356, 357, 358, 359, 360,
+ 361, 362, 363, 364, 365, 1, 2, 3, 4, 5,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 0, 0, 61, 62, 63, 64, 65,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
@@ -2317,53 +1795,626 @@
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 444, 445, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 446, 447, 0, 0, 0, 552, 720, 0, 0, 0,
+ 446, 447, 0, 508, 0, 509, 645, 0, 0, 0,
+ 0, 511, 448, 449, 450, 451, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 316, 317, 318, 319, 320,
+ 0, 0, 0, 452, 453, 454, 455, 456, 321, 322,
+ 323, 324, 325, 326, 327, 512, 513, 514, 515, 0,
+ 516, 517, 518, 519, 520, 521, 522, 523, 524, 525,
+ 328, 329, 330, 331, 332, 333, 457, 458, 459, 460,
+ 461, 462, 463, 464, 334, 526, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 349, 350, 351, 352, 353, 354, 355, 356, 357, 358,
+ 359, 360, 361, 362, 363, 364, 365, 1, 2, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+ 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
+ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
+ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
+ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
+ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
+ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303,
+ 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 0, 0, 444, 445, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 446, 447, 0, 508, 0, 509, 0, 0,
+ 0, 0, 0, 511, 448, 449, 450, 451, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 316, 317, 318,
+ 319, 320, 0, 0, 0, 452, 453, 454, 455, 456,
+ 321, 322, 323, 324, 325, 326, 327, 512, 513, 514,
+ 515, 0, 516, 517, 518, 519, 520, 521, 522, 523,
+ 524, 525, 328, 329, 330, 331, 332, 333, 457, 458,
+ 459, 460, 461, 462, 463, 464, 334, 526, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 349, 350, 351, 352, 353, 354, 355, 356,
+ 357, 358, 359, 360, 361, 362, 363, 364, 365, 1,
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+ 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+ 252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
+ 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+ 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
+ 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 0, 0, 444, 445, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 446, 447, 0, 508, 0, 430,
+ 0, 0, 0, 0, 0, 511, 448, 449, 450, 451,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 316,
+ 317, 318, 319, 320, 0, 0, 0, 452, 453, 454,
+ 455, 456, 321, 322, 323, 324, 325, 326, 327, 512,
+ 513, 514, 515, 0, 516, 517, 518, 519, 520, 521,
+ 522, 523, 524, 525, 328, 329, 330, 331, 332, 333,
+ 457, 458, 459, 460, 461, 462, 463, 464, 334, 526,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 349, 350, 351, 352, 353, 354,
+ 355, 356, 357, 358, 359, 360, 361, 362, 363, 364,
+ 365, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
+ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 0, 0, 444, 445, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 446, 447, 0, 508,
+ 0, 0, 0, 0, 0, 0, 0, 511, 448, 449,
+ 450, 451, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 316, 317, 318, 319, 320, 0, 0, 0, 452,
+ 453, 454, 455, 456, 321, 322, 323, 324, 325, 326,
+ 327, 512, 513, 514, 515, 0, 516, 517, 518, 519,
+ 520, 521, 522, 523, 524, 525, 328, 329, 330, 331,
+ 332, 333, 457, 458, 459, 460, 461, 462, 463, 464,
+ 334, 526, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 349, 350, 351, 352,
+ 353, 354, 355, 356, 357, 358, 359, 360, 361, 362,
+ 363, 364, 365, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+ 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237,
+ 238, 239, 240, 241, 242, 243, 244, 245, 246, 247,
+ 248, 249, 250, 251, 252, 253, 254, 255, 256, 257,
+ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267,
+ 268, 269, 270, 271, 272, 273, 274, 275, 276, 277,
+ 278, 279, 280, 281, 282, 283, 284, 285, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 0, 0, 444,
+ 445, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 446, 447,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 511,
+ 448, 449, 450, 451, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 316, 317, 318, 319, 320, 0, 0,
+ 0, 452, 453, 454, 455, 456, 321, 322, 323, 324,
+ 325, 326, 327, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 328, 329,
+ 330, 331, 332, 333, 457, 458, 459, 460, 461, 462,
+ 463, 464, 334, 0, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
+ 351, 352, 353, 354, 355, 356, 357, 358, 359, 360,
+ 361, 362, 363, 364, 365, 1, 2, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
+ 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
+ 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
+ 216, 217, 218, 219, 220, 221, 222, 223, 224, 225,
+ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+ 236, 237, 238, 239, 240, 241, 242, 243, 244, 245,
+ 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+ 256, 257, 258, 259, 260, 261, 262, 263, 264, 265,
+ 266, 267, 268, 269, 270, 271, 272, 273, 274, 275,
+ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 444, 445, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 446, 447, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 448, 449, 450, 451, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 316, 317, 318, 319, 0,
+ 0, 0, 0, 452, 453, 454, 455, 456, 321, 322,
+ 323, 324, 325, 326, 327, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 452, 453, 454, 455, 456, 321, 0,
- 0, 0, 0, 326, 327, 0, 0, 0, 0, 0,
+ 328, 329, 330, 331, 332, 333, 457, 458, 459, 460,
+ 461, 462, 463, 464, 334, 0, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 349, 350, 351, 352, 353, 354, 355, 356, 357, 358,
+ 359, 360, 361, 362, 363, 364, 365, 1, 2, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+ 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
+ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
+ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
+ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
+ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
+ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303,
+ 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 457, 458, 459, 460, 461, 462,
- 463, 464, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 347, 2, 3, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 0, 0, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 444, 445, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 446, 447, 0, 0, 492, 0, 0, 0, 0,
- 0, 0, 0, 448, 449, 450, 451, 0, 0, 0,
+ 0, 0, 0, 315, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 316, 317, 318,
+ 319, 320, 0, 0, 0, 0, 0, 0, 0, 0,
+ 321, 322, 323, 324, 325, 326, 327, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 452, 453, 454, 455, 456, 321,
- 0, 0, 0, 0, 326, 327, 0, 0, 0, 0,
+ 0, 0, 328, 329, 330, 331, 332, 333, 0, 0,
+ 0, 0, 0, 0, 0, 0, 334, 0, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 349, 350, 351, 352, 353, 354, 355, 356,
+ 357, 358, 359, 360, 361, 362, 363, 364, 365, 1,
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+ 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+ 252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
+ 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+ 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
+ 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 409, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 316,
+ 317, 318, 319, 0, 0, 0, 0, 0, 0, 0,
+ 0, 410, 321, 322, 323, 324, 325, 326, 327, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 328, 329, 330, 331, 332, 333,
+ 0, 0, 0, 0, 0, 0, 0, 0, 334, 0,
+ 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 349, 350, 351, 352, 353, 354,
+ 355, 356, 357, 358, 359, 360, 361, 362, 363, 364,
+ 365, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
+ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 582, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 316, 317, 318, 319, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 321, 322, 323, 324, 325, 326,
+ 327, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 328, 329, 330, 331,
+ 332, 333, 0, 0, 0, 0, 0, 0, 0, 0,
+ 334, 0, 335, 336, 337, 338, 339, 340, 341, 342,
+ 343, 344, 345, 346, 347, 348, 349, 350, 351, 352,
+ 353, 354, 355, 356, 357, 358, 359, 360, 361, 362,
+ 363, 364, 365, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+ 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237,
+ 238, 239, 240, 241, 242, 243, 244, 245, 246, 247,
+ 248, 249, 250, 251, 252, 253, 254, 255, 256, 257,
+ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267,
+ 268, 269, 270, 271, 272, 273, 274, 275, 276, 277,
+ 278, 279, 280, 281, 282, 283, 284, 285, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 668, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 316, 317, 318, 319, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 321, 322, 323, 324,
+ 325, 326, 327, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 328, 329,
+ 330, 331, 332, 333, 0, 0, 0, 0, 0, 0,
+ 0, 0, 334, 0, 335, 336, 337, 338, 339, 340,
+ 341, 342, 343, 344, 345, 346, 347, 348, 349, 350,
+ 351, 352, 353, 354, 355, 356, 357, 358, 359, 360,
+ 361, 362, 363, 364, 365, 1, 2, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
+ 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
+ 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
+ 216, 217, 218, 219, 220, 221, 222, 223, 224, 225,
+ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+ 236, 237, 238, 239, 240, 241, 242, 243, 244, 245,
+ 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+ 256, 257, 258, 259, 260, 261, 262, 263, 264, 265,
+ 266, 267, 268, 269, 270, 271, 272, 273, 274, 275,
+ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 706, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 316, 317, 318, 319, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 321, 322,
+ 323, 324, 325, 326, 327, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 328, 329, 330, 331, 332, 333, 0, 0, 0, 0,
+ 0, 0, 0, 0, 334, 0, 335, 336, 337, 338,
+ 339, 340, 341, 342, 343, 344, 345, 346, 347, 348,
+ 349, 350, 351, 352, 353, 354, 355, 356, 357, 358,
+ 359, 360, 361, 362, 363, 364, 365, 1, 2, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+ 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
+ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
+ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
+ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
+ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
+ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303,
+ 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 316, 317, 318,
+ 319, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 321, 322, 323, 324, 325, 326, 327, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 328, 329, 330, 331, 332, 333, 0, 0,
+ 0, 0, 0, 0, 0, 0, 334, 0, 335, 336,
+ 337, 338, 339, 340, 341, 342, 343, 344, 345, 346,
+ 347, 348, 349, 350, 351, 352, 353, 354, 355, 356,
+ 357, 358, 359, 360, 361, 362, 363, 364, 365, 2,
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 0, 0, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
+ 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
+ 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
+ 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+ 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+ 173, 174, 175, 176, 177, 178, 179, 180, 181, 182,
+ 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+ 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
+ 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
+ 213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
+ 223, 224, 225, 226, 227, 228, 229, 230, 231, 232,
+ 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
+ 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,
+ 253, 254, 255, 256, 257, 258, 259, 260, 261, 262,
+ 263, 264, 265, 266, 267, 268, 269, 270, 271, 272,
+ 273, 274, 275, 276, 277, 278, 279, 280, 281, 282,
+ 283, 284, 285, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
+ 303, 304, 305, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 0, 0, 444, 445, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 446, 447, 0, 0, 0, 554, 652,
+ 0, 0, 0, 0, 0, 448, 449, 450, 451, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 452, 453, 454, 455,
+ 456, 321, 0, 0, 0, 0, 326, 327, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 457,
+ 458, 459, 460, 461, 462, 463, 464, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 347, 2, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 0,
+ 0, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
+ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 0, 0, 444, 445, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 446, 447, 0, 0,
+ 0, 554, 725, 0, 0, 0, 0, 0, 448, 449,
+ 450, 451, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 452,
+ 453, 454, 455, 456, 321, 0, 0, 0, 0, 326,
+ 327, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 457, 458, 459, 460, 461, 462, 463, 464,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 347, 2, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 0, 0, 61, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+ 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
+ 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
+ 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
+ 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+ 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
+ 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
+ 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
+ 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
+ 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
+ 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
+ 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
+ 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
+ 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
+ 307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
+ 444, 445, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 446,
+ 447, 0, 0, 492, 0, 0, 0, 0, 0, 0,
+ 0, 448, 449, 450, 451, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 452, 453, 454, 455, 456, 321, 0, 0,
+ 0, 0, 326, 327, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 457, 458, 459, 460, 461,
462, 463, 464, 0, 0, 0, 0, 0, 0, 0,
@@ -2401,96 +2452,12 @@
304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 444, 445, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 446, 447, 0, 0, 0, 552, 0, 0,
+ 0, 0, 446, 447, 0, 0, 0, 554, 0, 0,
0, 0, 0, 0, 448, 449, 450, 451, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 452, 453, 454, 455, 456,
321, 0, 0, 0, 0, 326, 327, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 457, 458, 459, 460,
- 461, 462, 463, 464, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 347, 2,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 54, 55, 56, 57, 58, 0, 0, 61, 62,
- 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
- 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
- 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
- 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
- 173, 174, 175, 176, 177, 178, 179, 180, 181, 182,
- 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
- 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
- 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
- 213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
- 223, 224, 225, 226, 227, 228, 229, 230, 231, 232,
- 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
- 243, 244, 245, 246, 247, 248, 249, 250, 251, 252,
- 253, 254, 255, 256, 257, 258, 259, 260, 261, 262,
- 263, 264, 265, 266, 267, 268, 269, 270, 271, 272,
- 273, 274, 275, 276, 277, 278, 279, 280, 281, 282,
- 283, 284, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 299, 300, 301, 302,
- 303, 304, 305, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 444, 445, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 446, 447, 0, 0, 608, 0, 0,
- 0, 0, 0, 0, 0, 448, 449, 450, 451, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 452, 453, 454, 455,
- 456, 321, 0, 0, 0, 0, 326, 327, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 457, 458, 459,
- 460, 461, 462, 463, 464, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 347,
- 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 0, 0, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
- 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
- 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
- 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
- 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
- 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
- 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 0, 0, 444, 445, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 446, 447, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 620, 448, 449, 450, 451,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 452, 453, 454,
- 455, 456, 321, 0, 0, 0, 0, 326, 327, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 457, 458,
459, 460, 461, 462, 463, 464, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2527,66 +2494,152 @@
301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 444, 445, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 446, 447, 0, 0, 0,
+ 0, 0, 0, 0, 0, 446, 447, 0, 0, 610,
0, 0, 0, 0, 0, 0, 0, 448, 449, 450,
451, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 452, 453,
454, 455, 456, 321, 0, 0, 0, 0, 326, 327,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 457,
- 458, 459, 460, 461, 462, 463, 464, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 347, 2, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 0,
- 0, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
- 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
- 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
- 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
- 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
- 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
- 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
- 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
- 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
- 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
- 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
- 250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
- 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
- 280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
- 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 310, 311, 312, 313, 314, 475, 0, 444, 445, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 493,
- 0, 0, 0, 0, 0, 0, 446, 447, 0, 0,
- 0, 0, 0, 0, 0, 0, 560, 561, 448, 449,
- 450, 451, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 452,
- 453, 454, 455, 456, 321, 0, 0, 0, 573, 326,
- 570, 0, 0, 0, 0, 0, 0, 0, 0, 493,
+ 0, 457, 458, 459, 460, 461, 462, 463, 464, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 457, 458, 459, 460, 461, 462, 463, 464, 493, 0,
+ 0, 0, 0, 347, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 0, 0, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+ 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237,
+ 238, 239, 240, 241, 242, 243, 244, 245, 246, 247,
+ 248, 249, 250, 251, 252, 253, 254, 255, 256, 257,
+ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267,
+ 268, 269, 270, 271, 272, 273, 274, 275, 276, 277,
+ 278, 279, 280, 281, 282, 283, 284, 285, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 0, 0, 444,
+ 445, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 446, 447,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 622,
+ 448, 449, 450, 451, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 452, 453, 454, 455, 456, 321, 0, 0, 0,
+ 0, 326, 327, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 457, 458, 459, 460, 461, 462,
+ 463, 464, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 347, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 0, 0, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
+ 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
+ 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
+ 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
+ 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+ 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+ 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
+ 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+ 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
+ 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
+ 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+ 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
+ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
+ 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
+ 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
+ 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 0, 0, 444, 445, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 446, 447, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 448, 449, 450, 451, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 452, 453, 454, 455, 456, 321,
+ 0, 0, 0, 0, 326, 327, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 457, 458, 459,
+ 460, 461, 462, 463, 464, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 347,
+ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 0, 0, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+ 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+ 252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
+ 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+ 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
+ 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 0, 0, 444, 445, 0, 0, 475,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 493, 446, 447, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 448, 449, 450, 451,
+ 562, 563, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 452, 453, 454,
+ 455, 456, 321, 0, 0, 0, 0, 326, 572, 0,
+ 0, 0, 575, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 493, 0, 0, 0, 0, 0, 0,
+ 457, 458, 459, 460, 461, 462, 463, 464, 0, 0,
+ 0, 0, 493, 0, 0, 0, 0, 0, 0, 0,
0, 0, 347, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 658, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 664,
- 665, 666, 493, 493, 493, 493, 493, 493, 493, 493,
- 493, 493, 493, 493, 493, 493, 493, 493, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 663, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 669, 670, 671, 493, 493,
+ 493, 493, 493, 493, 493, 493, 493, 493, 493, 493,
+ 493, 493, 493, 493, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -2596,19 +2649,19 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 493
+ 0, 0, 0, 0, 0, 0, 0, 493
};
static const yytype_int16 yycheck[] =
{
- 0, 728, 0, 346, 0, 341, 341, 486, 735, 0,
- 341, 341, 339, 349, 349, 358, 339, 348, 348, 746,
+ 0, 733, 0, 346, 0, 486, 341, 383, 740, 0,
+ 386, 341, 388, 389, 349, 358, 392, 339, 348, 751,
4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, 556, 349, 63,
+ 54, 55, 56, 57, 58, 59, 60, 558, 339, 63,
64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
@@ -2634,672 +2687,145 @@
284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
294, 295, 296, 297, 298, 299, 300, 301, 302, 303,
304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 315, 316, 379, 371, 484, 447, 538, 550, 438,
- 552, 427, 612, 555, 343, 408, 375, 321, 322, 326,
- 689, 414, 340, 340, 346, 319, 320, 349, 404, 346,
- 349, 383, 341, 400, 386, 346, 388, 389, 397, 348,
- 392, 371, 435, 436, 473, 339, 375, 341, 717, 379,
- 371, 345, 419, 357, 358, 362, 375, 387, 379, 387,
- 390, 387, 376, 339, 357, 341, 387, 381, 382, 340,
- 400, 487, 348, 342, 404, 346, 340, 346, 519, 400,
- 521, 343, 346, 404, 346, 616, 340, 349, 340, 419,
- 506, 340, 346, 340, 346, 317, 318, 346, 419, 346,
- 430, 346, 375, 582, 349, 647, 482, 323, 324, 430,
- 594, 595, 596, 597, 351, 346, 353, 484, 349, 486,
- 343, 550, 346, 552, 565, 349, 555, 328, 329, 330,
- 331, 332, 333, 334, 335, 336, 337, 375, 346, 346,
- 569, 349, 349, 364, 365, 366, 344, 348, 346, 343,
- 750, 341, 482, 349, 484, 375, 486, 688, 700, 346,
- 347, 482, 375, 484, 348, 486, 354, 355, 356, 346,
- 347, 375, 651, 590, 591, 598, 599, 618, 592, 593,
- 340, 622, 339, 341, 577, 361, 375, 360, 359, 556,
- 375, 325, 327, 342, 341, 339, 344, 349, 740, 349,
- 339, 339, 339, 349, 347, 375, 339, 349, 538, 638,
- 639, 339, 375, 349, 340, 582, 375, 538, 647, 342,
- 342, 346, 339, 342, 344, 756, 556, 383, 340, 339,
- 375, 340, 343, 348, 340, 556, 349, 344, 343, 343,
- 600, 349, 683, 601, 605, 602, 387, 603, 689, 604,
- 706, 404, 582, 404, 489, 320, 576, 661, 691, 734,
- 400, 582, 747, 746, 691, 548, 398, 717, 548, 548,
- 708, 700, -1, 387, -1, -1, 717, -1, -1, -1,
- -1, -1, 612, -1, 651, -1, 616, -1, 729, -1,
- 706, 612, -1, 722, -1, 616, -1, -1, -1, -1,
- -1, -1, -1, -1, 745, -1, -1, -1, -1, -1,
- -1, 740, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 651, 689, -1, -1, -1, -1, -1, -1, -1,
- 651, -1, -1, -1, -1, -1, 712, -1, -1, -1,
+ 314, 315, 316, 379, 371, 484, 540, 438, 447, 552,
+ 614, 554, 408, 375, 557, 427, 343, 326, 414, 321,
+ 322, 341, 339, 694, 341, 341, 317, 318, 404, 349,
+ 340, 348, 348, 400, 323, 324, 346, 399, 349, 435,
+ 436, 371, 473, 319, 320, 346, 347, 341, 375, 379,
+ 371, 722, 419, 362, 348, 357, 358, 387, 379, 387,
+ 390, 387, 376, 339, 375, 341, 387, 381, 382, 345,
+ 400, 340, 340, 346, 404, 487, 349, 346, 346, 400,
+ 519, 340, 521, 404, 618, 343, 340, 346, 346, 419,
+ 340, 349, 346, 340, 506, 346, 346, 342, 419, 346,
+ 430, 346, 346, 347, 346, 584, 482, 349, 651, 430,
+ 596, 597, 598, 599, 351, 346, 353, 484, 349, 486,
+ 349, 552, 346, 554, 346, 349, 557, 349, 567, 328,
+ 329, 330, 331, 332, 333, 334, 335, 336, 337, 346,
+ 571, 375, 349, 364, 365, 366, 354, 355, 356, 348,
+ 340, 755, 482, 344, 484, 346, 486, 592, 593, 693,
+ 357, 482, 705, 484, 343, 486, 594, 595, 600, 601,
+ 375, 343, 375, 375, 341, 349, 340, 656, 348, 375,
+ 339, 620, 375, 579, 341, 624, 375, 325, 361, 360,
+ 359, 558, 327, 342, 341, 339, 344, 349, 349, 339,
+ 339, 346, 745, 349, 347, 339, 383, 349, 349, 339,
+ 540, 642, 643, 349, 339, 375, 349, 584, 340, 540,
+ 651, 375, 342, 342, 339, 375, 342, 761, 558, 340,
+ 344, 339, 349, 343, 340, 348, 340, 558, 375, 344,
+ 343, 343, 349, 602, 604, 603, 607, 711, 605, 688,
+ 606, 404, 320, 489, 584, 694, 387, 666, 696, 578,
+ 751, 739, 752, 584, 550, 722, 696, 550, 400, 550,
+ 398, 713, -1, -1, 705, 404, -1, -1, 387, -1,
+ -1, -1, -1, 722, 614, -1, -1, -1, 618, 656,
+ -1, -1, -1, 614, -1, 734, 727, 618, -1, 711,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 717, -1, -1, -1, -1, -1, -1, -1, 688, 689,
- -1, 691, -1, -1, -1, -1, -1, 688, 689, -1,
- 691, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 712, -1, -1, -1, -1, 717, -1, -1,
- -1, 712, -1, -1, -1, -1, 717, -1, 728, -1,
- -1, -1, -1, -1, -1, 735, -1, 728, -1, -1,
- -1, -1, -1, -1, 735, -1, 746, -1, -1, -1,
- 750, -1, -1, -1, -1, 746, 756, -1, -1, 750,
- -1, -1, -1, 0, -1, 756, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
+ -1, 750, -1, -1, 745, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 656, 694, -1, -1,
+ -1, -1, -1, -1, -1, 656, -1, -1, -1, -1,
+ -1, 717, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 722, -1, -1, -1, -1,
+ -1, -1, -1, 693, 694, -1, 696, -1, -1, -1,
+ -1, -1, 693, 694, -1, 696, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 717, -1, -1,
+ -1, -1, 722, -1, -1, -1, 717, -1, -1, -1,
+ -1, 722, -1, 733, -1, -1, -1, -1, -1, -1,
+ 740, -1, 733, -1, -1, -1, -1, -1, -1, 740,
+ -1, 751, -1, -1, -1, 755, -1, -1, -1, -1,
+ 751, 761, -1, -1, 755, -1, -1, -1, 0, -1,
+ 761, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+ 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+ 252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
+ 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+ 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
+ 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 315, 316, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 349, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 349, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- 367, -1, -1, -1, -1, -1, -1, -1, -1, 376,
- 377, 378, 379, 380, 381, 382, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 396,
- 397, 398, 399, 400, 401, -1, -1, -1, -1, -1,
- -1, -1, -1, 410, -1, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, 319, 320, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 338, 339, -1, 341, -1, 343, 344, -1, -1,
- -1, -1, 349, 350, 351, 352, 353, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- 367, -1, -1, -1, 371, 372, 373, 374, 375, 376,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- -1, 388, 389, 390, 391, 392, 393, 394, 395, 396,
- 397, 398, 399, 400, 401, 402, 403, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, 319, 320, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 338, 339, -1, 341, -1, 343, 344, -1, -1,
- -1, -1, 349, 350, 351, 352, 353, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- 367, -1, -1, -1, 371, 372, 373, 374, 375, 376,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- -1, 388, 389, 390, 391, 392, 393, 394, 395, 396,
- 397, 398, 399, 400, 401, 402, 403, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, 319, 320, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 338, 339, -1, 341, -1, 343, -1, -1, -1,
- -1, -1, 349, 350, 351, 352, 353, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- 367, -1, -1, -1, 371, 372, 373, 374, 375, 376,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- -1, 388, 389, 390, 391, 392, 393, 394, 395, 396,
- 397, 398, 399, 400, 401, 402, 403, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, 319, 320, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 338, 339, -1, 341, -1, 343, -1, -1, -1,
- -1, -1, 349, 350, 351, 352, 353, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- 367, -1, -1, -1, 371, 372, 373, 374, 375, 376,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- -1, 388, 389, 390, 391, 392, 393, 394, 395, 396,
- 397, 398, 399, 400, 401, 402, 403, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, 319, 320, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 338, 339, -1, 341, -1, -1, -1, -1, -1,
- -1, -1, 349, 350, 351, 352, 353, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- 367, -1, -1, -1, 371, 372, 373, 374, 375, 376,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- -1, 388, 389, 390, 391, 392, 393, 394, 395, 396,
- 397, 398, 399, 400, 401, 402, 403, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, 319, 320, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 338, 339, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 349, 350, 351, 352, 353, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- 367, -1, -1, -1, 371, 372, 373, 374, 375, 376,
- 377, 378, 379, 380, 381, 382, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 396,
- 397, 398, 399, 400, 401, 402, 403, 404, 405, 406,
- 407, 408, 409, 410, -1, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, 319, 320, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 338, 339, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 350, 351, 352, 353, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- -1, -1, -1, -1, 371, 372, 373, 374, 375, 376,
- 377, 378, 379, 380, 381, 382, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 396,
- 397, 398, 399, 400, 401, 402, 403, 404, 405, 406,
- 407, 408, 409, 410, -1, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 349, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- 367, -1, -1, -1, -1, -1, -1, -1, -1, 376,
- 377, 378, 379, 380, 381, 382, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 396,
- 397, 398, 399, 400, 401, -1, -1, -1, -1, -1,
- -1, -1, -1, 410, -1, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 349, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- -1, -1, -1, -1, -1, -1, -1, -1, 375, 376,
- 377, 378, 379, 380, 381, 382, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 396,
- 397, 398, 399, 400, 401, -1, -1, -1, -1, -1,
- -1, -1, -1, 410, -1, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 344, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 376,
- 377, 378, 379, 380, 381, 382, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 396,
- 397, 398, 399, 400, 401, -1, -1, -1, -1, -1,
- -1, -1, -1, 410, -1, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 344, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 376,
- 377, 378, 379, 380, 381, 382, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 396,
- 397, 398, 399, 400, 401, -1, -1, -1, -1, -1,
- -1, -1, -1, 410, -1, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 344, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 376,
- 377, 378, 379, 380, 381, 382, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 396,
- 397, 398, 399, 400, 401, -1, -1, -1, -1, -1,
- -1, -1, -1, 410, -1, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 363, 364, 365, 366,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 376,
- 377, 378, 379, 380, 381, 382, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 396,
- 397, 398, 399, 400, 401, -1, -1, -1, -1, -1,
- -1, -1, -1, 410, -1, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 4, 5, 6, 7,
+ -1, 363, 364, 365, 366, 367, -1, -1, -1, -1,
+ -1, -1, -1, -1, 376, 377, 378, 379, 380, 381,
+ 382, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 398, 399, 400, 401,
+ 402, 403, -1, -1, -1, -1, -1, -1, -1, -1,
+ 412, -1, 414, 415, 416, 417, 418, 419, 420, 421,
+ 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+ 432, 433, 434, 435, 436, 437, 438, 439, 440, 441,
+ 442, 443, 444, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
+ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 315, 316, -1, -1, 319,
+ 320, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 338, 339,
+ -1, 341, -1, 343, 344, -1, -1, -1, -1, 349,
+ 350, 351, 352, 353, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 363, 364, 365, 366, 367, -1, -1,
+ -1, 371, 372, 373, 374, 375, 376, 377, 378, 379,
+ 380, 381, 382, 383, 384, 385, 386, -1, 388, 389,
+ 390, 391, 392, 393, 394, 395, 396, 397, 398, 399,
+ 400, 401, 402, 403, 404, 405, 406, 407, 408, 409,
+ 410, 411, 412, 413, 414, 415, 416, 417, 418, 419,
+ 420, 421, 422, 423, 424, 425, 426, 427, 428, 429,
+ 430, 431, 432, 433, 434, 435, 436, 437, 438, 439,
+ 440, 441, 442, 443, 444, 3, 4, 5, 6, 7,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, -1, -1, 63, 64, 65, 66, 67,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
@@ -3327,57 +2853,630 @@
308, 309, 310, 311, 312, 313, 314, 315, 316, -1,
-1, 319, 320, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 338, 339, -1, -1, -1, 343, 344, -1, -1, -1,
+ 338, 339, -1, 341, -1, 343, 344, -1, -1, -1,
+ -1, 349, 350, 351, 352, 353, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 363, 364, 365, 366, 367,
+ -1, -1, -1, 371, 372, 373, 374, 375, 376, 377,
+ 378, 379, 380, 381, 382, 383, 384, 385, 386, -1,
+ 388, 389, 390, 391, 392, 393, 394, 395, 396, 397,
+ 398, 399, 400, 401, 402, 403, 404, 405, 406, 407,
+ 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
+ 418, 419, 420, 421, 422, 423, 424, 425, 426, 427,
+ 428, 429, 430, 431, 432, 433, 434, 435, 436, 437,
+ 438, 439, 440, 441, 442, 443, 444, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
+ 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
+ 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
+ 216, 217, 218, 219, 220, 221, 222, 223, 224, 225,
+ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+ 236, 237, 238, 239, 240, 241, 242, 243, 244, 245,
+ 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+ 256, 257, 258, 259, 260, 261, 262, 263, 264, 265,
+ 266, 267, 268, 269, 270, 271, 272, 273, 274, 275,
+ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
+ 316, -1, -1, 319, 320, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 338, 339, -1, 341, -1, 343, -1, -1,
+ -1, -1, -1, 349, 350, 351, 352, 353, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 363, 364, 365,
+ 366, 367, -1, -1, -1, 371, 372, 373, 374, 375,
+ 376, 377, 378, 379, 380, 381, 382, 383, 384, 385,
+ 386, -1, 388, 389, 390, 391, 392, 393, 394, 395,
+ 396, 397, 398, 399, 400, 401, 402, 403, 404, 405,
+ 406, 407, 408, 409, 410, 411, 412, 413, 414, 415,
+ 416, 417, 418, 419, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 430, 431, 432, 433, 434, 435,
+ 436, 437, 438, 439, 440, 441, 442, 443, 444, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+ 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
+ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
+ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
+ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
+ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
+ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303,
+ 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 315, 316, -1, -1, 319, 320, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 338, 339, -1, 341, -1, 343,
+ -1, -1, -1, -1, -1, 349, 350, 351, 352, 353,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 363,
+ 364, 365, 366, 367, -1, -1, -1, 371, 372, 373,
+ 374, 375, 376, 377, 378, 379, 380, 381, 382, 383,
+ 384, 385, 386, -1, 388, 389, 390, 391, 392, 393,
+ 394, 395, 396, 397, 398, 399, 400, 401, 402, 403,
+ 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
+ 414, 415, 416, 417, 418, 419, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 432, 433,
+ 434, 435, 436, 437, 438, 439, 440, 441, 442, 443,
+ 444, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+ 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+ 252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
+ 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+ 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
+ 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 315, 316, -1, -1, 319, 320, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 338, 339, -1, 341,
+ -1, -1, -1, -1, -1, -1, -1, 349, 350, 351,
+ 352, 353, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 363, 364, 365, 366, 367, -1, -1, -1, 371,
+ 372, 373, 374, 375, 376, 377, 378, 379, 380, 381,
+ 382, 383, 384, 385, 386, -1, 388, 389, 390, 391,
+ 392, 393, 394, 395, 396, 397, 398, 399, 400, 401,
+ 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+ 412, 413, 414, 415, 416, 417, 418, 419, 420, 421,
+ 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+ 432, 433, 434, 435, 436, 437, 438, 439, 440, 441,
+ 442, 443, 444, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
+ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 315, 316, -1, -1, 319,
+ 320, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 338, 339,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 349,
+ 350, 351, 352, 353, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 363, 364, 365, 366, 367, -1, -1,
+ -1, 371, 372, 373, 374, 375, 376, 377, 378, 379,
+ 380, 381, 382, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 398, 399,
+ 400, 401, 402, 403, 404, 405, 406, 407, 408, 409,
+ 410, 411, 412, -1, 414, 415, 416, 417, 418, 419,
+ 420, 421, 422, 423, 424, 425, 426, 427, 428, 429,
+ 430, 431, 432, 433, 434, 435, 436, 437, 438, 439,
+ 440, 441, 442, 443, 444, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+ 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237,
+ 238, 239, 240, 241, 242, 243, 244, 245, 246, 247,
+ 248, 249, 250, 251, 252, 253, 254, 255, 256, 257,
+ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267,
+ 268, 269, 270, 271, 272, 273, 274, 275, 276, 277,
+ 278, 279, 280, 281, 282, 283, 284, 285, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 315, 316, -1,
+ -1, 319, 320, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 338, 339, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 350, 351, 352, 353, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 363, 364, 365, 366, -1,
+ -1, -1, -1, 371, 372, 373, 374, 375, 376, 377,
+ 378, 379, 380, 381, 382, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 371, 372, 373, 374, 375, 376, -1,
- -1, -1, -1, 381, 382, -1, -1, -1, -1, -1,
+ 398, 399, 400, 401, 402, 403, 404, 405, 406, 407,
+ 408, 409, 410, 411, 412, -1, 414, 415, 416, 417,
+ 418, 419, 420, 421, 422, 423, 424, 425, 426, 427,
+ 428, 429, 430, 431, 432, 433, 434, 435, 436, 437,
+ 438, 439, 440, 441, 442, 443, 444, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
+ 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
+ 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
+ 216, 217, 218, 219, 220, 221, 222, 223, 224, 225,
+ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+ 236, 237, 238, 239, 240, 241, 242, 243, 244, 245,
+ 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+ 256, 257, 258, 259, 260, 261, 262, 263, 264, 265,
+ 266, 267, 268, 269, 270, 271, 272, 273, 274, 275,
+ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
+ 316, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 402, 403, 404, 405, 406, 407,
- 408, 409, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 424, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, -1, -1, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
- 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
- 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
- 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- -1, -1, 319, 320, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 338, 339, -1, -1, 342, -1, -1, -1, -1,
- -1, -1, -1, 350, 351, 352, 353, -1, -1, -1,
+ -1, -1, -1, 349, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 363, 364, 365,
+ 366, 367, -1, -1, -1, -1, -1, -1, -1, -1,
+ 376, 377, 378, 379, 380, 381, 382, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 371, 372, 373, 374, 375, 376,
- -1, -1, -1, -1, 381, 382, -1, -1, -1, -1,
+ -1, -1, 398, 399, 400, 401, 402, 403, -1, -1,
+ -1, -1, -1, -1, -1, -1, 412, -1, 414, 415,
+ 416, 417, 418, 419, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 430, 431, 432, 433, 434, 435,
+ 436, 437, 438, 439, 440, 441, 442, 443, 444, 3,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+ 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
+ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
+ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
+ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
+ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
+ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303,
+ 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 315, 316, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 402, 403, 404, 405, 406,
- 407, 408, 409, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 424, 4, 5,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 349, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 363,
+ 364, 365, 366, -1, -1, -1, -1, -1, -1, -1,
+ -1, 375, 376, 377, 378, 379, 380, 381, 382, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 398, 399, 400, 401, 402, 403,
+ -1, -1, -1, -1, -1, -1, -1, -1, 412, -1,
+ 414, 415, 416, 417, 418, 419, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 432, 433,
+ 434, 435, 436, 437, 438, 439, 440, 441, 442, 443,
+ 444, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+ 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+ 252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
+ 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+ 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
+ 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 315, 316, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 344, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 363, 364, 365, 366, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 376, 377, 378, 379, 380, 381,
+ 382, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 398, 399, 400, 401,
+ 402, 403, -1, -1, -1, -1, -1, -1, -1, -1,
+ 412, -1, 414, 415, 416, 417, 418, 419, 420, 421,
+ 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+ 432, 433, 434, 435, 436, 437, 438, 439, 440, 441,
+ 442, 443, 444, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
+ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 315, 316, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 344, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 363, 364, 365, 366, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 376, 377, 378, 379,
+ 380, 381, 382, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 398, 399,
+ 400, 401, 402, 403, -1, -1, -1, -1, -1, -1,
+ -1, -1, 412, -1, 414, 415, 416, 417, 418, 419,
+ 420, 421, 422, 423, 424, 425, 426, 427, 428, 429,
+ 430, 431, 432, 433, 434, 435, 436, 437, 438, 439,
+ 440, 441, 442, 443, 444, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 176, 177,
+ 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237,
+ 238, 239, 240, 241, 242, 243, 244, 245, 246, 247,
+ 248, 249, 250, 251, 252, 253, 254, 255, 256, 257,
+ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267,
+ 268, 269, 270, 271, 272, 273, 274, 275, 276, 277,
+ 278, 279, 280, 281, 282, 283, 284, 285, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 315, 316, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 344, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 363, 364, 365, 366, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 376, 377,
+ 378, 379, 380, 381, 382, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 398, 399, 400, 401, 402, 403, -1, -1, -1, -1,
+ -1, -1, -1, -1, 412, -1, 414, 415, 416, 417,
+ 418, 419, 420, 421, 422, 423, 424, 425, 426, 427,
+ 428, 429, 430, 431, 432, 433, 434, 435, 436, 437,
+ 438, 439, 440, 441, 442, 443, 444, 3, 4, 5,
+ 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
+ 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 200, 201, 202, 203, 204, 205,
+ 206, 207, 208, 209, 210, 211, 212, 213, 214, 215,
+ 216, 217, 218, 219, 220, 221, 222, 223, 224, 225,
+ 226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
+ 236, 237, 238, 239, 240, 241, 242, 243, 244, 245,
+ 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
+ 256, 257, 258, 259, 260, 261, 262, 263, 264, 265,
+ 266, 267, 268, 269, 270, 271, 272, 273, 274, 275,
+ 276, 277, 278, 279, 280, 281, 282, 283, 284, 285,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
+ 316, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 363, 364, 365,
+ 366, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 376, 377, 378, 379, 380, 381, 382, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 398, 399, 400, 401, 402, 403, -1, -1,
+ -1, -1, -1, -1, -1, -1, 412, -1, 414, 415,
+ 416, 417, 418, 419, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 430, 431, 432, 433, 434, 435,
+ 436, 437, 438, 439, 440, 441, 442, 443, 444, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, -1, -1, 63, 64,
+ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
+ 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
+ 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
+ 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
+ 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+ 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+ 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
+ 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+ 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
+ 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
+ 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+ 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
+ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
+ 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
+ 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
+ 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 315, 316, -1, -1, 319, 320, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 338, 339, -1, -1, -1, 343, 344,
+ -1, -1, -1, -1, -1, 350, 351, 352, 353, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 371, 372, 373, 374,
+ 375, 376, -1, -1, -1, -1, 381, 382, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 404,
+ 405, 406, 407, 408, 409, 410, 411, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 426, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, -1,
+ -1, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+ 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
+ 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+ 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+ 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
+ 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+ 252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
+ 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+ 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
+ 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
+ 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 315, 316, -1, -1, 319, 320, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 338, 339, -1, -1,
+ -1, 343, 344, -1, -1, -1, -1, -1, 350, 351,
+ 352, 353, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 371,
+ 372, 373, 374, 375, 376, -1, -1, -1, -1, 381,
+ 382, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 404, 405, 406, 407, 408, 409, 410, 411,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 426, 4, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, -1, -1, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
+ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
+ 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
+ 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
+ 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
+ 169, 170, 171, 172, 173, 174, 175, 176, 177, 178,
+ 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
+ 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+ 209, 210, 211, 212, 213, 214, 215, 216, 217, 218,
+ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
+ 229, 230, 231, 232, 233, 234, 235, 236, 237, 238,
+ 239, 240, 241, 242, 243, 244, 245, 246, 247, 248,
+ 249, 250, 251, 252, 253, 254, 255, 256, 257, 258,
+ 259, 260, 261, 262, 263, 264, 265, 266, 267, 268,
+ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278,
+ 279, 280, 281, 282, 283, 284, 285, 286, 287, 288,
+ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
+ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308,
+ 309, 310, 311, 312, 313, 314, 315, 316, -1, -1,
+ 319, 320, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 338,
+ 339, -1, -1, 342, -1, -1, -1, -1, -1, -1,
+ -1, 350, 351, 352, 353, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 371, 372, 373, 374, 375, 376, -1, -1,
+ -1, -1, 381, 382, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 404, 405, 406, 407, 408,
+ 409, 410, 411, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 426, 4, 5,
6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
@@ -3417,94 +3516,10 @@
-1, -1, -1, -1, -1, 371, 372, 373, 374, 375,
376, -1, -1, -1, -1, 381, 382, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 402, 403, 404, 405,
- 406, 407, 408, 409, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 424, 4,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, -1, -1, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
- 175, 176, 177, 178, 179, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
- 195, 196, 197, 198, 199, 200, 201, 202, 203, 204,
- 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 233, 234,
- 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 257, 258, 259, 260, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
- 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 315, 316, -1, -1, 319, 320, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 404, 405,
+ 406, 407, 408, 409, 410, 411, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 338, 339, -1, -1, 342, -1, -1,
- -1, -1, -1, -1, -1, 350, 351, 352, 353, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 371, 372, 373, 374,
- 375, 376, -1, -1, -1, -1, 381, 382, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 402, 403, 404,
- 405, 406, 407, 408, 409, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 424,
- 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, -1, -1, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
- 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
- 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
- 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
- 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
- 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
- 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
- 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
- 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
- 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
- 254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
- 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
- 274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
- 284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 299, 300, 301, 302, 303,
- 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 315, 316, -1, -1, 319, 320, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 338, 339, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 349, 350, 351, 352, 353,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 371, 372, 373,
- 374, 375, 376, -1, -1, -1, -1, 381, 382, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 402, 403,
- 404, 405, 406, 407, 408, 409, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 424, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+ 426, 4, 5, 6, 7, 8, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
@@ -3537,66 +3552,152 @@
303, 304, 305, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, -1, -1, 319, 320, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 338, 339, -1, -1, -1,
+ -1, -1, -1, -1, -1, 338, 339, -1, -1, 342,
-1, -1, -1, -1, -1, -1, -1, 350, 351, 352,
353, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 371, 372,
373, 374, 375, 376, -1, -1, -1, -1, 381, 382,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 402,
- 403, 404, 405, 406, 407, 408, 409, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 424, 4, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, -1,
- -1, 63, 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
- 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
- 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
- 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
- 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
- 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
- 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
- 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
- 272, 273, 274, 275, 276, 277, 278, 279, 280, 281,
- 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 315, 316, 413, -1, 319, 320, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 427,
- -1, -1, -1, -1, -1, -1, 338, 339, -1, -1,
- -1, -1, -1, -1, -1, -1, 444, 445, 350, 351,
- 352, 353, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 371,
- 372, 373, 374, 375, 376, -1, -1, -1, 476, 381,
- 382, -1, -1, -1, -1, -1, -1, -1, -1, 487,
+ -1, 404, 405, 406, 407, 408, 409, 410, 411, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 402, 403, 404, 405, 406, 407, 408, 409, 506, -1,
+ -1, -1, -1, 426, 4, 5, 6, 7, 8, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, -1, -1, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+ 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+ 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+ 250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
+ 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+ 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 315, 316, -1, -1, 319,
+ 320, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 338, 339,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 349,
+ 350, 351, 352, 353, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 424, -1, -1, -1, -1, -1, -1, -1,
+ -1, 371, 372, 373, 374, 375, 376, -1, -1, -1,
+ -1, 381, 382, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 404, 405, 406, 407, 408, 409,
+ 410, 411, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 426, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, -1, -1, 63, 64, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
+ 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+ 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+ 177, 178, 179, 180, 181, 182, 183, 184, 185, 186,
+ 187, 188, 189, 190, 191, 192, 193, 194, 195, 196,
+ 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
+ 207, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+ 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
+ 227, 228, 229, 230, 231, 232, 233, 234, 235, 236,
+ 237, 238, 239, 240, 241, 242, 243, 244, 245, 246,
+ 247, 248, 249, 250, 251, 252, 253, 254, 255, 256,
+ 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
+ 267, 268, 269, 270, 271, 272, 273, 274, 275, 276,
+ 277, 278, 279, 280, 281, 282, 283, 284, 285, 286,
+ 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
+ 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
+ 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
+ -1, -1, 319, 320, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 338, 339, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 350, 351, 352, 353, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 371, 372, 373, 374, 375, 376,
+ -1, -1, -1, -1, 381, 382, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 404, 405, 406,
+ 407, 408, 409, 410, 411, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 426,
+ 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, -1, -1, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 171, 172, 173,
+ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 201, 202, 203,
+ 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
+ 234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
+ 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
+ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
+ 264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
+ 274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
+ 284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303,
+ 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 315, 316, -1, -1, 319, 320, -1, -1, 413,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 427, 338, 339, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 350, 351, 352, 353,
+ 444, 445, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 371, 372, 373,
+ 374, 375, 376, -1, -1, -1, -1, 381, 382, -1,
+ -1, -1, 476, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 487, -1, -1, -1, -1, -1, -1,
+ 404, 405, 406, 407, 408, 409, 410, 411, -1, -1,
+ -1, -1, 506, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 426, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 574, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 587,
- 588, 589, 590, 591, 592, 593, 594, 595, 596, 597,
- 598, 599, 600, 601, 602, 603, 604, 605, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 576, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 589, 590, 591, 592, 593,
+ 594, 595, 596, 597, 598, 599, 600, 601, 602, 603,
+ 604, 605, 606, 607, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -3606,7 +3707,7 @@
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 706
+ -1, -1, -1, -1, -1, -1, -1, 711
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -3645,117 +3746,118 @@
292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
312, 313, 314, 315, 316, 349, 363, 364, 365, 366,
- 367, 376, 377, 378, 379, 380, 381, 382, 396, 397,
- 398, 399, 400, 401, 410, 412, 413, 414, 415, 416,
- 417, 418, 419, 420, 421, 422, 423, 424, 425, 426,
- 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
- 437, 438, 439, 440, 441, 442, 474, 475, 478, 479,
- 480, 481, 485, 486, 487, 488, 489, 490, 493, 494,
- 495, 496, 497, 499, 504, 505, 506, 547, 548, 549,
- 505, 343, 375, 339, 339, 349, 375, 349, 550, 340,
- 346, 482, 483, 484, 494, 499, 346, 349, 375, 349,
- 375, 495, 499, 357, 501, 502, 0, 548, 499, 508,
- 343, 375, 397, 491, 492, 375, 498, 341, 349, 500,
- 343, 526, 483, 482, 484, 375, 375, 339, 348, 500,
- 343, 346, 349, 477, 319, 320, 338, 339, 350, 351,
- 352, 353, 371, 372, 373, 374, 375, 402, 403, 404,
- 405, 406, 407, 408, 409, 444, 445, 446, 448, 449,
- 450, 451, 452, 453, 454, 455, 456, 497, 499, 503,
- 500, 349, 494, 499, 509, 510, 507, 348, 340, 346,
- 340, 346, 342, 455, 457, 458, 459, 460, 461, 462,
- 463, 464, 465, 466, 467, 468, 341, 349, 341, 343,
+ 367, 376, 377, 378, 379, 380, 381, 382, 398, 399,
+ 400, 401, 402, 403, 412, 414, 415, 416, 417, 418,
+ 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 430, 431, 432, 433, 434, 435, 436, 437, 438,
+ 439, 440, 441, 442, 443, 444, 476, 477, 480, 481,
+ 482, 483, 487, 488, 489, 490, 491, 492, 495, 496,
+ 497, 498, 499, 501, 506, 507, 508, 549, 550, 551,
+ 507, 343, 375, 339, 339, 349, 375, 349, 552, 340,
+ 346, 484, 485, 486, 496, 501, 346, 349, 375, 349,
+ 375, 497, 501, 357, 503, 504, 0, 550, 501, 510,
+ 343, 375, 399, 493, 494, 375, 500, 341, 349, 502,
+ 343, 528, 485, 484, 486, 375, 375, 339, 348, 502,
+ 343, 346, 349, 479, 319, 320, 338, 339, 350, 351,
+ 352, 353, 371, 372, 373, 374, 375, 404, 405, 406,
+ 407, 408, 409, 410, 411, 446, 447, 448, 450, 451,
+ 452, 453, 454, 455, 456, 457, 458, 499, 501, 505,
+ 502, 349, 496, 501, 511, 512, 509, 348, 340, 346,
+ 340, 346, 342, 457, 459, 460, 461, 462, 463, 464,
+ 465, 466, 467, 468, 469, 470, 341, 349, 341, 343,
344, 349, 383, 384, 385, 386, 388, 389, 390, 391,
- 392, 393, 394, 395, 411, 455, 468, 470, 472, 474,
- 478, 497, 499, 515, 516, 517, 518, 519, 527, 528,
- 529, 530, 533, 534, 537, 538, 539, 546, 551, 500,
- 348, 500, 343, 470, 513, 348, 476, 375, 346, 349,
- 455, 455, 472, 319, 320, 341, 345, 340, 340, 346,
- 382, 470, 339, 455, 346, 358, 499, 375, 511, 512,
- 344, 510, 509, 468, 473, 492, 375, 354, 355, 356,
- 351, 353, 317, 318, 321, 322, 357, 358, 323, 324,
- 361, 360, 359, 325, 327, 326, 362, 342, 342, 468,
- 341, 344, 520, 339, 349, 349, 541, 339, 339, 349,
- 349, 472, 339, 472, 347, 349, 349, 328, 329, 330,
- 331, 332, 333, 334, 335, 336, 337, 348, 471, 346,
- 349, 344, 516, 530, 534, 539, 513, 348, 513, 514,
- 513, 509, 375, 340, 447, 472, 375, 470, 455, 511,
- 500, 346, 349, 344, 455, 455, 455, 457, 457, 458,
- 458, 459, 459, 459, 459, 460, 460, 461, 462, 463,
- 464, 465, 466, 469, 342, 375, 552, 553, 527, 540,
- 516, 542, 472, 349, 472, 347, 470, 470, 513, 344,
- 346, 344, 342, 349, 512, 472, 339, 342, 346, 521,
- 472, 487, 494, 532, 383, 515, 528, 543, 340, 340,
- 344, 513, 347, 473, 342, 553, 344, 375, 340, 339,
- 532, 544, 545, 523, 524, 525, 531, 535, 470, 340,
- 348, 517, 522, 526, 472, 349, 340, 387, 519, 517,
- 343, 513, 340, 472, 522, 523, 527, 536, 349, 344
+ 392, 393, 394, 395, 396, 397, 413, 457, 470, 472,
+ 474, 476, 480, 499, 501, 517, 518, 519, 520, 521,
+ 529, 530, 531, 532, 535, 536, 539, 540, 541, 548,
+ 553, 502, 348, 502, 343, 472, 515, 348, 478, 375,
+ 346, 349, 457, 457, 474, 319, 320, 341, 345, 340,
+ 340, 346, 382, 472, 339, 457, 346, 358, 501, 375,
+ 513, 514, 344, 512, 511, 470, 475, 494, 375, 354,
+ 355, 356, 351, 353, 317, 318, 321, 322, 357, 358,
+ 323, 324, 361, 360, 359, 325, 327, 326, 362, 342,
+ 342, 470, 341, 344, 522, 339, 349, 349, 543, 339,
+ 339, 349, 349, 474, 339, 474, 347, 349, 349, 349,
+ 349, 328, 329, 330, 331, 332, 333, 334, 335, 336,
+ 337, 348, 473, 346, 349, 344, 518, 532, 536, 541,
+ 515, 348, 344, 515, 516, 515, 511, 375, 340, 449,
+ 474, 375, 472, 457, 513, 502, 346, 349, 344, 457,
+ 457, 457, 459, 459, 460, 460, 461, 461, 461, 461,
+ 462, 462, 463, 464, 465, 466, 467, 468, 471, 342,
+ 375, 554, 555, 529, 542, 518, 544, 474, 349, 474,
+ 347, 472, 472, 515, 344, 346, 344, 342, 349, 514,
+ 474, 339, 342, 346, 523, 474, 489, 496, 534, 383,
+ 517, 530, 545, 340, 340, 344, 515, 347, 475, 342,
+ 555, 344, 375, 340, 339, 534, 546, 547, 525, 526,
+ 527, 533, 537, 472, 340, 348, 519, 524, 528, 474,
+ 349, 340, 387, 521, 519, 343, 515, 340, 474, 524,
+ 525, 529, 538, 349, 344
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_int16 yyr1[] =
{
- 0, 443, 444, 445, 445, 445, 445, 445, 445, 445,
- 445, 445, 445, 445, 445, 445, 445, 445, 446, 446,
- 446, 446, 446, 446, 447, 448, 449, 450, 450, 451,
- 451, 452, 452, 453, 454, 454, 454, 455, 455, 455,
- 455, 456, 456, 456, 456, 457, 457, 457, 457, 458,
- 458, 458, 459, 459, 459, 460, 460, 460, 460, 460,
- 461, 461, 461, 462, 462, 463, 463, 464, 464, 465,
- 465, 466, 466, 467, 467, 468, 469, 468, 470, 470,
- 471, 471, 471, 471, 471, 471, 471, 471, 471, 471,
- 471, 472, 472, 473, 474, 474, 474, 474, 474, 474,
- 474, 474, 474, 476, 475, 477, 477, 478, 479, 479,
- 480, 480, 481, 482, 482, 483, 483, 483, 483, 484,
- 485, 485, 485, 485, 485, 486, 486, 486, 486, 486,
- 487, 487, 488, 489, 489, 489, 489, 489, 489, 489,
- 489, 490, 491, 491, 492, 492, 492, 493, 494, 494,
- 495, 495, 495, 495, 495, 495, 495, 496, 496, 496,
- 496, 496, 496, 496, 496, 496, 496, 496, 496, 496,
- 496, 496, 496, 496, 496, 496, 496, 496, 496, 496,
- 496, 496, 496, 496, 496, 496, 496, 496, 496, 496,
- 496, 496, 497, 498, 498, 499, 499, 500, 500, 500,
- 500, 501, 501, 502, 503, 503, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 504, 504, 504, 504, 504, 504, 504, 504, 504, 504,
- 505, 505, 505, 507, 506, 508, 506, 509, 509, 510,
- 510, 511, 511, 512, 512, 513, 513, 513, 514, 514,
- 515, 516, 516, 517, 517, 517, 517, 517, 517, 517,
- 517, 518, 519, 520, 521, 519, 522, 522, 524, 523,
- 525, 523, 526, 526, 527, 527, 528, 528, 529, 529,
- 530, 531, 531, 532, 532, 533, 533, 535, 534, 536,
- 536, 537, 537, 538, 538, 540, 539, 541, 539, 542,
- 539, 543, 543, 544, 544, 545, 545, 546, 546, 546,
- 546, 546, 546, 547, 547, 548, 548, 548, 550, 549,
- 551, 552, 552, 553, 553
+ 0, 445, 446, 447, 447, 447, 447, 447, 447, 447,
+ 447, 447, 447, 447, 447, 447, 447, 447, 448, 448,
+ 448, 448, 448, 448, 449, 450, 451, 452, 452, 453,
+ 453, 454, 454, 455, 456, 456, 456, 457, 457, 457,
+ 457, 458, 458, 458, 458, 459, 459, 459, 459, 460,
+ 460, 460, 461, 461, 461, 462, 462, 462, 462, 462,
+ 463, 463, 463, 464, 464, 465, 465, 466, 466, 467,
+ 467, 468, 468, 469, 469, 470, 471, 470, 472, 472,
+ 473, 473, 473, 473, 473, 473, 473, 473, 473, 473,
+ 473, 474, 474, 475, 476, 476, 476, 476, 476, 476,
+ 476, 476, 476, 478, 477, 479, 479, 480, 481, 481,
+ 482, 482, 483, 484, 484, 485, 485, 485, 485, 486,
+ 487, 487, 487, 487, 487, 488, 488, 488, 488, 488,
+ 489, 489, 490, 491, 491, 491, 491, 491, 491, 491,
+ 491, 492, 493, 493, 494, 494, 494, 495, 496, 496,
+ 497, 497, 497, 497, 497, 497, 497, 498, 498, 498,
+ 498, 498, 498, 498, 498, 498, 498, 498, 498, 498,
+ 498, 498, 498, 498, 498, 498, 498, 498, 498, 498,
+ 498, 498, 498, 498, 498, 498, 498, 498, 498, 498,
+ 498, 498, 499, 500, 500, 501, 501, 502, 502, 502,
+ 502, 503, 503, 504, 505, 505, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 506, 506, 506, 506, 506, 506, 506, 506, 506, 506,
+ 507, 507, 507, 509, 508, 510, 508, 511, 511, 512,
+ 512, 513, 513, 514, 514, 515, 515, 515, 515, 516,
+ 516, 517, 518, 518, 519, 519, 519, 519, 519, 519,
+ 519, 519, 520, 521, 522, 523, 521, 524, 524, 526,
+ 525, 527, 525, 528, 528, 529, 529, 530, 530, 531,
+ 531, 532, 533, 533, 534, 534, 535, 535, 537, 536,
+ 538, 538, 539, 539, 540, 540, 542, 541, 543, 541,
+ 544, 541, 545, 545, 546, 546, 547, 547, 548, 548,
+ 548, 548, 548, 548, 548, 548, 549, 549, 550, 550,
+ 550, 552, 551, 553, 554, 554, 555, 555
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -3814,15 +3916,15 @@
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 0, 6, 0, 5, 1, 2, 3,
- 4, 1, 3, 1, 2, 1, 3, 4, 1, 3,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 0, 0, 5, 1, 1, 0, 2,
- 0, 2, 2, 3, 1, 2, 1, 2, 1, 2,
- 5, 3, 1, 1, 4, 1, 2, 0, 8, 0,
- 1, 3, 2, 1, 2, 0, 6, 0, 8, 0,
- 7, 1, 1, 1, 0, 2, 3, 2, 2, 2,
- 3, 2, 2, 1, 2, 1, 1, 1, 0, 3,
- 5, 1, 3, 1, 4
+ 4, 1, 3, 1, 2, 1, 3, 4, 2, 1,
+ 3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 2, 2, 0, 0, 5, 1, 1, 0,
+ 2, 0, 2, 2, 3, 1, 2, 1, 2, 1,
+ 2, 5, 3, 1, 1, 4, 1, 2, 0, 8,
+ 0, 1, 3, 2, 1, 2, 0, 6, 0, 8,
+ 0, 7, 1, 1, 1, 0, 2, 3, 2, 2,
+ 2, 3, 2, 2, 2, 2, 1, 2, 1, 1,
+ 1, 0, 3, 5, 1, 3, 1, 4
};
@@ -4568,260 +4670,260 @@
switch (yyn)
{
case 2: /* variable_identifier: IDENTIFIER */
-#line 370 "glslang/MachineIndependent/glslang.y"
+#line 371 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleVariable((yyvsp[0].lex).loc, (yyvsp[0].lex).symbol, (yyvsp[0].lex).string);
}
-#line 4576 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4678 "MachineIndependent/glslang_tab.cpp"
break;
case 3: /* primary_expression: variable_identifier */
-#line 376 "glslang/MachineIndependent/glslang.y"
+#line 377 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 4584 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4686 "MachineIndependent/glslang_tab.cpp"
break;
case 4: /* primary_expression: LEFT_PAREN expression RIGHT_PAREN */
-#line 379 "glslang/MachineIndependent/glslang.y"
+#line 380 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = (yyvsp[-1].interm.intermTypedNode);
if ((yyval.interm.intermTypedNode)->getAsConstantUnion())
(yyval.interm.intermTypedNode)->getAsConstantUnion()->setExpression();
}
-#line 4594 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4696 "MachineIndependent/glslang_tab.cpp"
break;
case 5: /* primary_expression: FLOATCONSTANT */
-#line 384 "glslang/MachineIndependent/glslang.y"
+#line 385 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtFloat, (yyvsp[0].lex).loc, true);
}
-#line 4602 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4704 "MachineIndependent/glslang_tab.cpp"
break;
case 6: /* primary_expression: INTCONSTANT */
-#line 387 "glslang/MachineIndependent/glslang.y"
+#line 388 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
}
-#line 4610 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4712 "MachineIndependent/glslang_tab.cpp"
break;
case 7: /* primary_expression: UINTCONSTANT */
-#line 390 "glslang/MachineIndependent/glslang.y"
+#line 391 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
}
-#line 4619 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4721 "MachineIndependent/glslang_tab.cpp"
break;
case 8: /* primary_expression: BOOLCONSTANT */
-#line 394 "glslang/MachineIndependent/glslang.y"
+#line 395 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).b, (yyvsp[0].lex).loc, true);
}
-#line 4627 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4729 "MachineIndependent/glslang_tab.cpp"
break;
case 9: /* primary_expression: STRING_LITERAL */
-#line 398 "glslang/MachineIndependent/glslang.y"
+#line 399 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).string, (yyvsp[0].lex).loc, true);
}
-#line 4635 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4737 "MachineIndependent/glslang_tab.cpp"
break;
case 10: /* primary_expression: INT32CONSTANT */
-#line 401 "glslang/MachineIndependent/glslang.y"
+#line 402 "MachineIndependent/glslang.y"
{
parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
}
-#line 4644 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4746 "MachineIndependent/glslang_tab.cpp"
break;
case 11: /* primary_expression: UINT32CONSTANT */
-#line 405 "glslang/MachineIndependent/glslang.y"
+#line 406 "MachineIndependent/glslang.y"
{
parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
}
-#line 4653 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4755 "MachineIndependent/glslang_tab.cpp"
break;
case 12: /* primary_expression: INT64CONSTANT */
-#line 409 "glslang/MachineIndependent/glslang.y"
+#line 410 "MachineIndependent/glslang.y"
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).i64, (yyvsp[0].lex).loc, true);
}
-#line 4662 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4764 "MachineIndependent/glslang_tab.cpp"
break;
case 13: /* primary_expression: UINT64CONSTANT */
-#line 413 "glslang/MachineIndependent/glslang.y"
+#line 414 "MachineIndependent/glslang.y"
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).u64, (yyvsp[0].lex).loc, true);
}
-#line 4671 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4773 "MachineIndependent/glslang_tab.cpp"
break;
case 14: /* primary_expression: INT16CONSTANT */
-#line 417 "glslang/MachineIndependent/glslang.y"
+#line 418 "MachineIndependent/glslang.y"
{
parseContext.explicitInt16Check((yyvsp[0].lex).loc, "16-bit integer literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((short)(yyvsp[0].lex).i, (yyvsp[0].lex).loc, true);
}
-#line 4680 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4782 "MachineIndependent/glslang_tab.cpp"
break;
case 15: /* primary_expression: UINT16CONSTANT */
-#line 421 "glslang/MachineIndependent/glslang.y"
+#line 422 "MachineIndependent/glslang.y"
{
parseContext.explicitInt16Check((yyvsp[0].lex).loc, "16-bit unsigned integer literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((unsigned short)(yyvsp[0].lex).u, (yyvsp[0].lex).loc, true);
}
-#line 4689 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4791 "MachineIndependent/glslang_tab.cpp"
break;
case 16: /* primary_expression: DOUBLECONSTANT */
-#line 425 "glslang/MachineIndependent/glslang.y"
+#line 426 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double literal");
if (! parseContext.symbolTable.atBuiltInLevel())
parseContext.doubleCheck((yyvsp[0].lex).loc, "double literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtDouble, (yyvsp[0].lex).loc, true);
}
-#line 4700 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4802 "MachineIndependent/glslang_tab.cpp"
break;
case 17: /* primary_expression: FLOAT16CONSTANT */
-#line 431 "glslang/MachineIndependent/glslang.y"
+#line 432 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float literal");
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion((yyvsp[0].lex).d, EbtFloat16, (yyvsp[0].lex).loc, true);
}
-#line 4709 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4811 "MachineIndependent/glslang_tab.cpp"
break;
case 18: /* postfix_expression: primary_expression */
-#line 439 "glslang/MachineIndependent/glslang.y"
+#line 440 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 4717 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4819 "MachineIndependent/glslang_tab.cpp"
break;
case 19: /* postfix_expression: postfix_expression LEFT_BRACKET integer_expression RIGHT_BRACKET */
-#line 442 "glslang/MachineIndependent/glslang.y"
+#line 443 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBracketDereference((yyvsp[-2].lex).loc, (yyvsp[-3].interm.intermTypedNode), (yyvsp[-1].interm.intermTypedNode));
}
-#line 4725 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4827 "MachineIndependent/glslang_tab.cpp"
break;
case 20: /* postfix_expression: function_call */
-#line 445 "glslang/MachineIndependent/glslang.y"
+#line 446 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 4733 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4835 "MachineIndependent/glslang_tab.cpp"
break;
case 21: /* postfix_expression: postfix_expression DOT IDENTIFIER */
-#line 448 "glslang/MachineIndependent/glslang.y"
+#line 449 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleDotDereference((yyvsp[0].lex).loc, (yyvsp[-2].interm.intermTypedNode), *(yyvsp[0].lex).string);
}
-#line 4741 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4843 "MachineIndependent/glslang_tab.cpp"
break;
case 22: /* postfix_expression: postfix_expression INC_OP */
-#line 451 "glslang/MachineIndependent/glslang.y"
+#line 452 "MachineIndependent/glslang.y"
{
parseContext.variableCheck((yyvsp[-1].interm.intermTypedNode));
parseContext.lValueErrorCheck((yyvsp[0].lex).loc, "++", (yyvsp[-1].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[0].lex).loc, "++", EOpPostIncrement, (yyvsp[-1].interm.intermTypedNode));
}
-#line 4751 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4853 "MachineIndependent/glslang_tab.cpp"
break;
case 23: /* postfix_expression: postfix_expression DEC_OP */
-#line 456 "glslang/MachineIndependent/glslang.y"
+#line 457 "MachineIndependent/glslang.y"
{
parseContext.variableCheck((yyvsp[-1].interm.intermTypedNode));
parseContext.lValueErrorCheck((yyvsp[0].lex).loc, "--", (yyvsp[-1].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[0].lex).loc, "--", EOpPostDecrement, (yyvsp[-1].interm.intermTypedNode));
}
-#line 4761 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4863 "MachineIndependent/glslang_tab.cpp"
break;
case 24: /* integer_expression: expression */
-#line 464 "glslang/MachineIndependent/glslang.y"
+#line 465 "MachineIndependent/glslang.y"
{
parseContext.integerCheck((yyvsp[0].interm.intermTypedNode), "[]");
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 4770 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4872 "MachineIndependent/glslang_tab.cpp"
break;
case 25: /* function_call: function_call_or_method */
-#line 471 "glslang/MachineIndependent/glslang.y"
+#line 472 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleFunctionCall((yyvsp[0].interm).loc, (yyvsp[0].interm).function, (yyvsp[0].interm).intermNode);
delete (yyvsp[0].interm).function;
}
-#line 4779 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4881 "MachineIndependent/glslang_tab.cpp"
break;
case 26: /* function_call_or_method: function_call_generic */
-#line 478 "glslang/MachineIndependent/glslang.y"
+#line 479 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[0].interm);
}
-#line 4787 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4889 "MachineIndependent/glslang_tab.cpp"
break;
case 27: /* function_call_generic: function_call_header_with_parameters RIGHT_PAREN */
-#line 484 "glslang/MachineIndependent/glslang.y"
+#line 485 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[-1].interm);
(yyval.interm).loc = (yyvsp[0].lex).loc;
}
-#line 4796 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4898 "MachineIndependent/glslang_tab.cpp"
break;
case 28: /* function_call_generic: function_call_header_no_parameters RIGHT_PAREN */
-#line 488 "glslang/MachineIndependent/glslang.y"
+#line 489 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[-1].interm);
(yyval.interm).loc = (yyvsp[0].lex).loc;
}
-#line 4805 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4907 "MachineIndependent/glslang_tab.cpp"
break;
case 29: /* function_call_header_no_parameters: function_call_header VOID */
-#line 495 "glslang/MachineIndependent/glslang.y"
+#line 496 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[-1].interm);
}
-#line 4813 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4915 "MachineIndependent/glslang_tab.cpp"
break;
case 30: /* function_call_header_no_parameters: function_call_header */
-#line 498 "glslang/MachineIndependent/glslang.y"
+#line 499 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[0].interm);
}
-#line 4821 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4923 "MachineIndependent/glslang_tab.cpp"
break;
case 31: /* function_call_header_with_parameters: function_call_header assignment_expression */
-#line 504 "glslang/MachineIndependent/glslang.y"
+#line 505 "MachineIndependent/glslang.y"
{
TParameter param = { 0, new TType };
param.type->shallowCopy((yyvsp[0].interm.intermTypedNode)->getType());
@@ -4829,11 +4931,11 @@
(yyval.interm).function = (yyvsp[-1].interm).function;
(yyval.interm).intermNode = (yyvsp[0].interm.intermTypedNode);
}
-#line 4833 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4935 "MachineIndependent/glslang_tab.cpp"
break;
case 32: /* function_call_header_with_parameters: function_call_header_with_parameters COMMA assignment_expression */
-#line 511 "glslang/MachineIndependent/glslang.y"
+#line 512 "MachineIndependent/glslang.y"
{
TParameter param = { 0, new TType };
param.type->shallowCopy((yyvsp[0].interm.intermTypedNode)->getType());
@@ -4841,29 +4943,29 @@
(yyval.interm).function = (yyvsp[-2].interm).function;
(yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-2].interm).intermNode, (yyvsp[0].interm.intermTypedNode), (yyvsp[-1].lex).loc);
}
-#line 4845 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4947 "MachineIndependent/glslang_tab.cpp"
break;
case 33: /* function_call_header: function_identifier LEFT_PAREN */
-#line 521 "glslang/MachineIndependent/glslang.y"
+#line 522 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[-1].interm);
}
-#line 4853 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4955 "MachineIndependent/glslang_tab.cpp"
break;
case 34: /* function_identifier: type_specifier */
-#line 529 "glslang/MachineIndependent/glslang.y"
+#line 530 "MachineIndependent/glslang.y"
{
// Constructor
(yyval.interm).intermNode = 0;
(yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type));
}
-#line 4863 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4965 "MachineIndependent/glslang_tab.cpp"
break;
case 35: /* function_identifier: postfix_expression */
-#line 534 "glslang/MachineIndependent/glslang.y"
+#line 535 "MachineIndependent/glslang.y"
{
//
// Should be a method or subroutine call, but we haven't recognized the arguments yet.
@@ -4891,50 +4993,50 @@
(yyval.interm).function = new TFunction(empty, TType(EbtVoid), EOpNull);
}
}
-#line 4895 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 4997 "MachineIndependent/glslang_tab.cpp"
break;
case 36: /* function_identifier: non_uniform_qualifier */
-#line 562 "glslang/MachineIndependent/glslang.y"
+#line 563 "MachineIndependent/glslang.y"
{
// Constructor
(yyval.interm).intermNode = 0;
(yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type));
}
-#line 4905 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5007 "MachineIndependent/glslang_tab.cpp"
break;
case 37: /* unary_expression: postfix_expression */
-#line 571 "glslang/MachineIndependent/glslang.y"
+#line 572 "MachineIndependent/glslang.y"
{
parseContext.variableCheck((yyvsp[0].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
if (TIntermMethod* method = (yyvsp[0].interm.intermTypedNode)->getAsMethodNode())
parseContext.error((yyvsp[0].interm.intermTypedNode)->getLoc(), "incomplete method syntax", method->getMethodName().c_str(), "");
}
-#line 4916 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5018 "MachineIndependent/glslang_tab.cpp"
break;
case 38: /* unary_expression: INC_OP unary_expression */
-#line 577 "glslang/MachineIndependent/glslang.y"
+#line 578 "MachineIndependent/glslang.y"
{
parseContext.lValueErrorCheck((yyvsp[-1].lex).loc, "++", (yyvsp[0].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[-1].lex).loc, "++", EOpPreIncrement, (yyvsp[0].interm.intermTypedNode));
}
-#line 4925 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5027 "MachineIndependent/glslang_tab.cpp"
break;
case 39: /* unary_expression: DEC_OP unary_expression */
-#line 581 "glslang/MachineIndependent/glslang.y"
+#line 582 "MachineIndependent/glslang.y"
{
parseContext.lValueErrorCheck((yyvsp[-1].lex).loc, "--", (yyvsp[0].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.handleUnaryMath((yyvsp[-1].lex).loc, "--", EOpPreDecrement, (yyvsp[0].interm.intermTypedNode));
}
-#line 4934 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5036 "MachineIndependent/glslang_tab.cpp"
break;
case 40: /* unary_expression: unary_operator unary_expression */
-#line 585 "glslang/MachineIndependent/glslang.y"
+#line 586 "MachineIndependent/glslang.y"
{
if ((yyvsp[-1].interm).op != EOpNull) {
char errorOp[2] = {0, 0};
@@ -4951,179 +5053,179 @@
(yyval.interm.intermTypedNode)->getAsConstantUnion()->setExpression();
}
}
-#line 4955 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5057 "MachineIndependent/glslang_tab.cpp"
break;
case 41: /* unary_operator: PLUS */
-#line 605 "glslang/MachineIndependent/glslang.y"
+#line 606 "MachineIndependent/glslang.y"
{ (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpNull; }
-#line 4961 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5063 "MachineIndependent/glslang_tab.cpp"
break;
case 42: /* unary_operator: DASH */
-#line 606 "glslang/MachineIndependent/glslang.y"
+#line 607 "MachineIndependent/glslang.y"
{ (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpNegative; }
-#line 4967 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5069 "MachineIndependent/glslang_tab.cpp"
break;
case 43: /* unary_operator: BANG */
-#line 607 "glslang/MachineIndependent/glslang.y"
+#line 608 "MachineIndependent/glslang.y"
{ (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpLogicalNot; }
-#line 4973 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5075 "MachineIndependent/glslang_tab.cpp"
break;
case 44: /* unary_operator: TILDE */
-#line 608 "glslang/MachineIndependent/glslang.y"
+#line 609 "MachineIndependent/glslang.y"
{ (yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpBitwiseNot;
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise not"); }
-#line 4980 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5082 "MachineIndependent/glslang_tab.cpp"
break;
case 45: /* multiplicative_expression: unary_expression */
-#line 614 "glslang/MachineIndependent/glslang.y"
+#line 615 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 4986 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5088 "MachineIndependent/glslang_tab.cpp"
break;
case 46: /* multiplicative_expression: multiplicative_expression STAR unary_expression */
-#line 615 "glslang/MachineIndependent/glslang.y"
+#line 616 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "*", EOpMul, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 4996 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5098 "MachineIndependent/glslang_tab.cpp"
break;
case 47: /* multiplicative_expression: multiplicative_expression SLASH unary_expression */
-#line 620 "glslang/MachineIndependent/glslang.y"
+#line 621 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "/", EOpDiv, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 5006 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5108 "MachineIndependent/glslang_tab.cpp"
break;
case 48: /* multiplicative_expression: multiplicative_expression PERCENT unary_expression */
-#line 625 "glslang/MachineIndependent/glslang.y"
+#line 626 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "%");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "%", EOpMod, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 5017 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5119 "MachineIndependent/glslang_tab.cpp"
break;
case 49: /* additive_expression: multiplicative_expression */
-#line 634 "glslang/MachineIndependent/glslang.y"
+#line 635 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5023 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5125 "MachineIndependent/glslang_tab.cpp"
break;
case 50: /* additive_expression: additive_expression PLUS multiplicative_expression */
-#line 635 "glslang/MachineIndependent/glslang.y"
+#line 636 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "+", EOpAdd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 5033 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5135 "MachineIndependent/glslang_tab.cpp"
break;
case 51: /* additive_expression: additive_expression DASH multiplicative_expression */
-#line 640 "glslang/MachineIndependent/glslang.y"
+#line 641 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "-", EOpSub, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 5043 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5145 "MachineIndependent/glslang_tab.cpp"
break;
case 52: /* shift_expression: additive_expression */
-#line 648 "glslang/MachineIndependent/glslang.y"
+#line 649 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5049 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5151 "MachineIndependent/glslang_tab.cpp"
break;
case 53: /* shift_expression: shift_expression LEFT_OP additive_expression */
-#line 649 "glslang/MachineIndependent/glslang.y"
+#line 650 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bit shift left");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<<", EOpLeftShift, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 5060 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5162 "MachineIndependent/glslang_tab.cpp"
break;
case 54: /* shift_expression: shift_expression RIGHT_OP additive_expression */
-#line 655 "glslang/MachineIndependent/glslang.y"
+#line 656 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bit shift right");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">>", EOpRightShift, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 5071 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5173 "MachineIndependent/glslang_tab.cpp"
break;
case 55: /* relational_expression: shift_expression */
-#line 664 "glslang/MachineIndependent/glslang.y"
+#line 665 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5077 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5179 "MachineIndependent/glslang_tab.cpp"
break;
case 56: /* relational_expression: relational_expression LEFT_ANGLE shift_expression */
-#line 665 "glslang/MachineIndependent/glslang.y"
+#line 666 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<", EOpLessThan, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 5087 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5189 "MachineIndependent/glslang_tab.cpp"
break;
case 57: /* relational_expression: relational_expression RIGHT_ANGLE shift_expression */
-#line 670 "glslang/MachineIndependent/glslang.y"
+#line 671 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">", EOpGreaterThan, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 5097 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5199 "MachineIndependent/glslang_tab.cpp"
break;
case 58: /* relational_expression: relational_expression LE_OP shift_expression */
-#line 675 "glslang/MachineIndependent/glslang.y"
+#line 676 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<=", EOpLessThanEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 5107 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5209 "MachineIndependent/glslang_tab.cpp"
break;
case 59: /* relational_expression: relational_expression GE_OP shift_expression */
-#line 680 "glslang/MachineIndependent/glslang.y"
+#line 681 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">=", EOpGreaterThanEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 5117 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5219 "MachineIndependent/glslang_tab.cpp"
break;
case 60: /* equality_expression: relational_expression */
-#line 688 "glslang/MachineIndependent/glslang.y"
+#line 689 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5123 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5225 "MachineIndependent/glslang_tab.cpp"
break;
case 61: /* equality_expression: equality_expression EQ_OP relational_expression */
-#line 689 "glslang/MachineIndependent/glslang.y"
+#line 690 "MachineIndependent/glslang.y"
{
parseContext.arrayObjectCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "array comparison");
parseContext.opaqueCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "==");
@@ -5133,11 +5235,11 @@
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 5137 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5239 "MachineIndependent/glslang_tab.cpp"
break;
case 62: /* equality_expression: equality_expression NE_OP relational_expression */
-#line 698 "glslang/MachineIndependent/glslang.y"
+#line 699 "MachineIndependent/glslang.y"
{
parseContext.arrayObjectCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "array comparison");
parseContext.opaqueCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "!=");
@@ -5147,124 +5249,124 @@
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 5151 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5253 "MachineIndependent/glslang_tab.cpp"
break;
case 63: /* and_expression: equality_expression */
-#line 710 "glslang/MachineIndependent/glslang.y"
+#line 711 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5157 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5259 "MachineIndependent/glslang_tab.cpp"
break;
case 64: /* and_expression: and_expression AMPERSAND equality_expression */
-#line 711 "glslang/MachineIndependent/glslang.y"
+#line 712 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise and");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "&", EOpAnd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 5168 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5270 "MachineIndependent/glslang_tab.cpp"
break;
case 65: /* exclusive_or_expression: and_expression */
-#line 720 "glslang/MachineIndependent/glslang.y"
+#line 721 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5174 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5276 "MachineIndependent/glslang_tab.cpp"
break;
case 66: /* exclusive_or_expression: exclusive_or_expression CARET and_expression */
-#line 721 "glslang/MachineIndependent/glslang.y"
+#line 722 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise exclusive or");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "^", EOpExclusiveOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 5185 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5287 "MachineIndependent/glslang_tab.cpp"
break;
case 67: /* inclusive_or_expression: exclusive_or_expression */
-#line 730 "glslang/MachineIndependent/glslang.y"
+#line 731 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5191 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5293 "MachineIndependent/glslang_tab.cpp"
break;
case 68: /* inclusive_or_expression: inclusive_or_expression VERTICAL_BAR exclusive_or_expression */
-#line 731 "glslang/MachineIndependent/glslang.y"
+#line 732 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise inclusive or");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "|", EOpInclusiveOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 5202 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5304 "MachineIndependent/glslang_tab.cpp"
break;
case 69: /* logical_and_expression: inclusive_or_expression */
-#line 740 "glslang/MachineIndependent/glslang.y"
+#line 741 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5208 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5310 "MachineIndependent/glslang_tab.cpp"
break;
case 70: /* logical_and_expression: logical_and_expression AND_OP inclusive_or_expression */
-#line 741 "glslang/MachineIndependent/glslang.y"
+#line 742 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "&&", EOpLogicalAnd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 5218 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5320 "MachineIndependent/glslang_tab.cpp"
break;
case 71: /* logical_xor_expression: logical_and_expression */
-#line 749 "glslang/MachineIndependent/glslang.y"
+#line 750 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5224 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5326 "MachineIndependent/glslang_tab.cpp"
break;
case 72: /* logical_xor_expression: logical_xor_expression XOR_OP logical_and_expression */
-#line 750 "glslang/MachineIndependent/glslang.y"
+#line 751 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "^^", EOpLogicalXor, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 5234 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5336 "MachineIndependent/glslang_tab.cpp"
break;
case 73: /* logical_or_expression: logical_xor_expression */
-#line 758 "glslang/MachineIndependent/glslang.y"
+#line 759 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5240 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5342 "MachineIndependent/glslang_tab.cpp"
break;
case 74: /* logical_or_expression: logical_or_expression OR_OP logical_xor_expression */
-#line 759 "glslang/MachineIndependent/glslang.y"
+#line 760 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "||", EOpLogicalOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
}
-#line 5250 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5352 "MachineIndependent/glslang_tab.cpp"
break;
case 75: /* conditional_expression: logical_or_expression */
-#line 767 "glslang/MachineIndependent/glslang.y"
+#line 768 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5256 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5358 "MachineIndependent/glslang_tab.cpp"
break;
case 76: /* $@1: %empty */
-#line 768 "glslang/MachineIndependent/glslang.y"
+#line 769 "MachineIndependent/glslang.y"
{
++parseContext.controlFlowNestingLevel;
}
-#line 5264 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5366 "MachineIndependent/glslang_tab.cpp"
break;
case 77: /* conditional_expression: logical_or_expression QUESTION $@1 expression COLON assignment_expression */
-#line 771 "glslang/MachineIndependent/glslang.y"
+#line 772 "MachineIndependent/glslang.y"
{
--parseContext.controlFlowNestingLevel;
parseContext.boolCheck((yyvsp[-4].lex).loc, (yyvsp[-5].interm.intermTypedNode));
@@ -5277,17 +5379,17 @@
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
}
-#line 5281 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5383 "MachineIndependent/glslang_tab.cpp"
break;
case 78: /* assignment_expression: conditional_expression */
-#line 786 "glslang/MachineIndependent/glslang.y"
+#line 787 "MachineIndependent/glslang.y"
{ (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); }
-#line 5287 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5389 "MachineIndependent/glslang_tab.cpp"
break;
case 79: /* assignment_expression: unary_expression assignment_operator assignment_expression */
-#line 787 "glslang/MachineIndependent/glslang.y"
+#line 788 "MachineIndependent/glslang.y"
{
parseContext.arrayObjectCheck((yyvsp[-1].interm).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "array assignment");
parseContext.opaqueCheck((yyvsp[-1].interm).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "=");
@@ -5301,119 +5403,119 @@
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
}
-#line 5305 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5407 "MachineIndependent/glslang_tab.cpp"
break;
case 80: /* assignment_operator: EQUAL */
-#line 803 "glslang/MachineIndependent/glslang.y"
+#line 804 "MachineIndependent/glslang.y"
{
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpAssign;
}
-#line 5314 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5416 "MachineIndependent/glslang_tab.cpp"
break;
case 81: /* assignment_operator: MUL_ASSIGN */
-#line 807 "glslang/MachineIndependent/glslang.y"
+#line 808 "MachineIndependent/glslang.y"
{
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpMulAssign;
}
-#line 5323 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5425 "MachineIndependent/glslang_tab.cpp"
break;
case 82: /* assignment_operator: DIV_ASSIGN */
-#line 811 "glslang/MachineIndependent/glslang.y"
+#line 812 "MachineIndependent/glslang.y"
{
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpDivAssign;
}
-#line 5332 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5434 "MachineIndependent/glslang_tab.cpp"
break;
case 83: /* assignment_operator: MOD_ASSIGN */
-#line 815 "glslang/MachineIndependent/glslang.y"
+#line 816 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "%=");
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpModAssign;
}
-#line 5342 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5444 "MachineIndependent/glslang_tab.cpp"
break;
case 84: /* assignment_operator: ADD_ASSIGN */
-#line 820 "glslang/MachineIndependent/glslang.y"
+#line 821 "MachineIndependent/glslang.y"
{
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpAddAssign;
}
-#line 5351 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5453 "MachineIndependent/glslang_tab.cpp"
break;
case 85: /* assignment_operator: SUB_ASSIGN */
-#line 824 "glslang/MachineIndependent/glslang.y"
+#line 825 "MachineIndependent/glslang.y"
{
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).op = EOpSubAssign;
}
-#line 5360 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5462 "MachineIndependent/glslang_tab.cpp"
break;
case 86: /* assignment_operator: LEFT_ASSIGN */
-#line 828 "glslang/MachineIndependent/glslang.y"
+#line 829 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bit-shift left assign");
(yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpLeftShiftAssign;
}
-#line 5369 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5471 "MachineIndependent/glslang_tab.cpp"
break;
case 87: /* assignment_operator: RIGHT_ASSIGN */
-#line 832 "glslang/MachineIndependent/glslang.y"
+#line 833 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bit-shift right assign");
(yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpRightShiftAssign;
}
-#line 5378 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5480 "MachineIndependent/glslang_tab.cpp"
break;
case 88: /* assignment_operator: AND_ASSIGN */
-#line 836 "glslang/MachineIndependent/glslang.y"
+#line 837 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise-and assign");
(yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpAndAssign;
}
-#line 5387 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5489 "MachineIndependent/glslang_tab.cpp"
break;
case 89: /* assignment_operator: XOR_ASSIGN */
-#line 840 "glslang/MachineIndependent/glslang.y"
+#line 841 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise-xor assign");
(yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpExclusiveOrAssign;
}
-#line 5396 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5498 "MachineIndependent/glslang_tab.cpp"
break;
case 90: /* assignment_operator: OR_ASSIGN */
-#line 844 "glslang/MachineIndependent/glslang.y"
+#line 845 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "bitwise-or assign");
(yyval.interm).loc = (yyvsp[0].lex).loc; (yyval.interm).op = EOpInclusiveOrAssign;
}
-#line 5405 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5507 "MachineIndependent/glslang_tab.cpp"
break;
case 91: /* expression: assignment_expression */
-#line 851 "glslang/MachineIndependent/glslang.y"
+#line 852 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 5413 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5515 "MachineIndependent/glslang_tab.cpp"
break;
case 92: /* expression: expression COMMA assignment_expression */
-#line 854 "glslang/MachineIndependent/glslang.y"
+#line 855 "MachineIndependent/glslang.y"
{
parseContext.samplerConstructorLocationCheck((yyvsp[-1].lex).loc, ",", (yyvsp[0].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.intermediate.addComma((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode), (yyvsp[-1].lex).loc);
@@ -5422,40 +5524,40 @@
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
}
-#line 5426 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5528 "MachineIndependent/glslang_tab.cpp"
break;
case 93: /* constant_expression: conditional_expression */
-#line 865 "glslang/MachineIndependent/glslang.y"
+#line 866 "MachineIndependent/glslang.y"
{
parseContext.constantValueCheck((yyvsp[0].interm.intermTypedNode), "");
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 5435 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5537 "MachineIndependent/glslang_tab.cpp"
break;
case 94: /* declaration: function_prototype SEMICOLON */
-#line 872 "glslang/MachineIndependent/glslang.y"
+#line 873 "MachineIndependent/glslang.y"
{
parseContext.handleFunctionDeclarator((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).function, true /* prototype */);
(yyval.interm.intermNode) = 0;
// TODO: 4.0 functionality: subroutines: make the identifier a user type for this signature
}
-#line 5445 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5547 "MachineIndependent/glslang_tab.cpp"
break;
case 95: /* declaration: init_declarator_list SEMICOLON */
-#line 877 "glslang/MachineIndependent/glslang.y"
+#line 878 "MachineIndependent/glslang.y"
{
if ((yyvsp[-1].interm).intermNode && (yyvsp[-1].interm).intermNode->getAsAggregate())
(yyvsp[-1].interm).intermNode->getAsAggregate()->setOperator(EOpSequence);
(yyval.interm.intermNode) = (yyvsp[-1].interm).intermNode;
}
-#line 5455 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5557 "MachineIndependent/glslang_tab.cpp"
break;
case 96: /* declaration: PRECISION precision_qualifier type_specifier SEMICOLON */
-#line 882 "glslang/MachineIndependent/glslang.y"
+#line 883 "MachineIndependent/glslang.y"
{
parseContext.profileRequires((yyvsp[-3].lex).loc, ENoProfile, 130, 0, "precision statement");
// lazy setting of the previous scope's defaults, has effect only the first time it is called in a particular scope
@@ -5463,75 +5565,75 @@
parseContext.setDefaultPrecision((yyvsp[-3].lex).loc, (yyvsp[-1].interm.type), (yyvsp[-2].interm.type).qualifier.precision);
(yyval.interm.intermNode) = 0;
}
-#line 5467 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5569 "MachineIndependent/glslang_tab.cpp"
break;
case 97: /* declaration: block_structure SEMICOLON */
-#line 889 "glslang/MachineIndependent/glslang.y"
+#line 890 "MachineIndependent/glslang.y"
{
parseContext.declareBlock((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).typeList);
(yyval.interm.intermNode) = 0;
}
-#line 5476 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5578 "MachineIndependent/glslang_tab.cpp"
break;
case 98: /* declaration: block_structure IDENTIFIER SEMICOLON */
-#line 893 "glslang/MachineIndependent/glslang.y"
+#line 894 "MachineIndependent/glslang.y"
{
parseContext.declareBlock((yyvsp[-2].interm).loc, *(yyvsp[-2].interm).typeList, (yyvsp[-1].lex).string);
(yyval.interm.intermNode) = 0;
}
-#line 5485 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5587 "MachineIndependent/glslang_tab.cpp"
break;
case 99: /* declaration: block_structure IDENTIFIER array_specifier SEMICOLON */
-#line 897 "glslang/MachineIndependent/glslang.y"
+#line 898 "MachineIndependent/glslang.y"
{
parseContext.declareBlock((yyvsp[-3].interm).loc, *(yyvsp[-3].interm).typeList, (yyvsp[-2].lex).string, (yyvsp[-1].interm).arraySizes);
(yyval.interm.intermNode) = 0;
}
-#line 5494 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5596 "MachineIndependent/glslang_tab.cpp"
break;
case 100: /* declaration: type_qualifier SEMICOLON */
-#line 901 "glslang/MachineIndependent/glslang.y"
+#line 902 "MachineIndependent/glslang.y"
{
parseContext.globalQualifierFixCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier);
parseContext.updateStandaloneQualifierDefaults((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type));
(yyval.interm.intermNode) = 0;
}
-#line 5504 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5606 "MachineIndependent/glslang_tab.cpp"
break;
case 101: /* declaration: type_qualifier IDENTIFIER SEMICOLON */
-#line 906 "glslang/MachineIndependent/glslang.y"
+#line 907 "MachineIndependent/glslang.y"
{
parseContext.checkNoShaderLayouts((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).shaderQualifiers);
parseContext.addQualifierToExisting((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).qualifier, *(yyvsp[-1].lex).string);
(yyval.interm.intermNode) = 0;
}
-#line 5514 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5616 "MachineIndependent/glslang_tab.cpp"
break;
case 102: /* declaration: type_qualifier IDENTIFIER identifier_list SEMICOLON */
-#line 911 "glslang/MachineIndependent/glslang.y"
+#line 912 "MachineIndependent/glslang.y"
{
parseContext.checkNoShaderLayouts((yyvsp[-3].interm.type).loc, (yyvsp[-3].interm.type).shaderQualifiers);
(yyvsp[-1].interm.identifierList)->push_back((yyvsp[-2].lex).string);
parseContext.addQualifierToExisting((yyvsp[-3].interm.type).loc, (yyvsp[-3].interm.type).qualifier, *(yyvsp[-1].interm.identifierList));
(yyval.interm.intermNode) = 0;
}
-#line 5525 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5627 "MachineIndependent/glslang_tab.cpp"
break;
case 103: /* $@2: %empty */
-#line 920 "glslang/MachineIndependent/glslang.y"
+#line 921 "MachineIndependent/glslang.y"
{ parseContext.nestedBlockCheck((yyvsp[-2].interm.type).loc); }
-#line 5531 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5633 "MachineIndependent/glslang_tab.cpp"
break;
case 104: /* block_structure: type_qualifier IDENTIFIER LEFT_BRACE $@2 struct_declaration_list RIGHT_BRACE */
-#line 920 "glslang/MachineIndependent/glslang.y"
+#line 921 "MachineIndependent/glslang.y"
{
--parseContext.blockNestingLevel;
parseContext.blockName = (yyvsp[-4].lex).string;
@@ -5541,54 +5643,54 @@
(yyval.interm).loc = (yyvsp[-5].interm.type).loc;
(yyval.interm).typeList = (yyvsp[-1].interm.typeList);
}
-#line 5545 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5647 "MachineIndependent/glslang_tab.cpp"
break;
case 105: /* identifier_list: COMMA IDENTIFIER */
-#line 931 "glslang/MachineIndependent/glslang.y"
+#line 932 "MachineIndependent/glslang.y"
{
(yyval.interm.identifierList) = new TIdentifierList;
(yyval.interm.identifierList)->push_back((yyvsp[0].lex).string);
}
-#line 5554 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5656 "MachineIndependent/glslang_tab.cpp"
break;
case 106: /* identifier_list: identifier_list COMMA IDENTIFIER */
-#line 935 "glslang/MachineIndependent/glslang.y"
+#line 936 "MachineIndependent/glslang.y"
{
(yyval.interm.identifierList) = (yyvsp[-2].interm.identifierList);
(yyval.interm.identifierList)->push_back((yyvsp[0].lex).string);
}
-#line 5563 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5665 "MachineIndependent/glslang_tab.cpp"
break;
case 107: /* function_prototype: function_declarator RIGHT_PAREN */
-#line 942 "glslang/MachineIndependent/glslang.y"
+#line 943 "MachineIndependent/glslang.y"
{
(yyval.interm).function = (yyvsp[-1].interm.function);
(yyval.interm).loc = (yyvsp[0].lex).loc;
}
-#line 5572 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5674 "MachineIndependent/glslang_tab.cpp"
break;
case 108: /* function_declarator: function_header */
-#line 949 "glslang/MachineIndependent/glslang.y"
+#line 950 "MachineIndependent/glslang.y"
{
(yyval.interm.function) = (yyvsp[0].interm.function);
}
-#line 5580 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5682 "MachineIndependent/glslang_tab.cpp"
break;
case 109: /* function_declarator: function_header_with_parameters */
-#line 952 "glslang/MachineIndependent/glslang.y"
+#line 953 "MachineIndependent/glslang.y"
{
(yyval.interm.function) = (yyvsp[0].interm.function);
}
-#line 5588 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5690 "MachineIndependent/glslang_tab.cpp"
break;
case 110: /* function_header_with_parameters: function_header parameter_declaration */
-#line 959 "glslang/MachineIndependent/glslang.y"
+#line 960 "MachineIndependent/glslang.y"
{
// Add the parameter
(yyval.interm.function) = (yyvsp[-1].interm.function);
@@ -5597,11 +5699,11 @@
else
delete (yyvsp[0].interm).param.type;
}
-#line 5601 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5703 "MachineIndependent/glslang_tab.cpp"
break;
case 111: /* function_header_with_parameters: function_header_with_parameters COMMA parameter_declaration */
-#line 967 "glslang/MachineIndependent/glslang.y"
+#line 968 "MachineIndependent/glslang.y"
{
//
// Only first parameter of one-parameter functions can be void
@@ -5619,11 +5721,11 @@
(yyvsp[-2].interm.function)->addParameter((yyvsp[0].interm).param);
}
}
-#line 5623 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5725 "MachineIndependent/glslang_tab.cpp"
break;
case 112: /* function_header: fully_specified_type IDENTIFIER LEFT_PAREN */
-#line 987 "glslang/MachineIndependent/glslang.y"
+#line 988 "MachineIndependent/glslang.y"
{
if ((yyvsp[-2].interm.type).qualifier.storage != EvqGlobal && (yyvsp[-2].interm.type).qualifier.storage != EvqTemporary) {
parseContext.error((yyvsp[-1].lex).loc, "no qualifiers allowed for function return",
@@ -5643,11 +5745,11 @@
function = new TFunction((yyvsp[-1].lex).string, type);
(yyval.interm.function) = function;
}
-#line 5647 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5749 "MachineIndependent/glslang_tab.cpp"
break;
case 113: /* parameter_declarator: type_specifier IDENTIFIER */
-#line 1010 "glslang/MachineIndependent/glslang.y"
+#line 1011 "MachineIndependent/glslang.y"
{
if ((yyvsp[-1].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-1].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -5663,11 +5765,11 @@
(yyval.interm).loc = (yyvsp[0].lex).loc;
(yyval.interm).param = param;
}
-#line 5667 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5769 "MachineIndependent/glslang_tab.cpp"
break;
case 114: /* parameter_declarator: type_specifier IDENTIFIER array_specifier */
-#line 1025 "glslang/MachineIndependent/glslang.y"
+#line 1026 "MachineIndependent/glslang.y"
{
if ((yyvsp[-2].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -5687,11 +5789,11 @@
(yyval.interm).loc = (yyvsp[-1].lex).loc;
(yyval.interm).param = param;
}
-#line 5691 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5793 "MachineIndependent/glslang_tab.cpp"
break;
case 115: /* parameter_declaration: type_qualifier parameter_declarator */
-#line 1050 "glslang/MachineIndependent/glslang.y"
+#line 1051 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[0].interm);
if ((yyvsp[-1].interm.type).qualifier.precision != EpqNone)
@@ -5703,11 +5805,11 @@
parseContext.paramCheckFix((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier, *(yyval.interm).param.type);
}
-#line 5707 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5809 "MachineIndependent/glslang_tab.cpp"
break;
case 116: /* parameter_declaration: parameter_declarator */
-#line 1061 "glslang/MachineIndependent/glslang.y"
+#line 1062 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[0].interm);
@@ -5715,11 +5817,11 @@
parseContext.paramCheckFixStorage((yyvsp[0].interm).loc, EvqTemporary, *(yyval.interm).param.type);
parseContext.precisionQualifierCheck((yyval.interm).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier());
}
-#line 5719 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5821 "MachineIndependent/glslang_tab.cpp"
break;
case 117: /* parameter_declaration: type_qualifier parameter_type_specifier */
-#line 1071 "glslang/MachineIndependent/glslang.y"
+#line 1072 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[0].interm);
if ((yyvsp[-1].interm.type).qualifier.precision != EpqNone)
@@ -5730,11 +5832,11 @@
parseContext.parameterTypeCheck((yyvsp[0].interm).loc, (yyvsp[-1].interm.type).qualifier.storage, *(yyval.interm).param.type);
parseContext.paramCheckFix((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier, *(yyval.interm).param.type);
}
-#line 5734 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5836 "MachineIndependent/glslang_tab.cpp"
break;
case 118: /* parameter_declaration: parameter_type_specifier */
-#line 1081 "glslang/MachineIndependent/glslang.y"
+#line 1082 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[0].interm);
@@ -5742,68 +5844,68 @@
parseContext.paramCheckFixStorage((yyvsp[0].interm).loc, EvqTemporary, *(yyval.interm).param.type);
parseContext.precisionQualifierCheck((yyval.interm).loc, (yyval.interm).param.type->getBasicType(), (yyval.interm).param.type->getQualifier());
}
-#line 5746 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5848 "MachineIndependent/glslang_tab.cpp"
break;
case 119: /* parameter_type_specifier: type_specifier */
-#line 1091 "glslang/MachineIndependent/glslang.y"
+#line 1092 "MachineIndependent/glslang.y"
{
TParameter param = { 0, new TType((yyvsp[0].interm.type)) };
(yyval.interm).param = param;
if ((yyvsp[0].interm.type).arraySizes)
parseContext.arraySizeRequiredCheck((yyvsp[0].interm.type).loc, *(yyvsp[0].interm.type).arraySizes);
}
-#line 5757 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5859 "MachineIndependent/glslang_tab.cpp"
break;
case 120: /* init_declarator_list: single_declaration */
-#line 1100 "glslang/MachineIndependent/glslang.y"
+#line 1101 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[0].interm);
}
-#line 5765 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5867 "MachineIndependent/glslang_tab.cpp"
break;
case 121: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER */
-#line 1103 "glslang/MachineIndependent/glslang.y"
+#line 1104 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[-2].interm);
parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-2].interm).type);
}
-#line 5774 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5876 "MachineIndependent/glslang_tab.cpp"
break;
case 122: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER array_specifier */
-#line 1107 "glslang/MachineIndependent/glslang.y"
+#line 1108 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[-3].interm);
parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-3].interm).type, (yyvsp[0].interm).arraySizes);
}
-#line 5783 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5885 "MachineIndependent/glslang_tab.cpp"
break;
case 123: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER array_specifier EQUAL initializer */
-#line 1111 "glslang/MachineIndependent/glslang.y"
+#line 1112 "MachineIndependent/glslang.y"
{
(yyval.interm).type = (yyvsp[-5].interm).type;
TIntermNode* initNode = parseContext.declareVariable((yyvsp[-3].lex).loc, *(yyvsp[-3].lex).string, (yyvsp[-5].interm).type, (yyvsp[-2].interm).arraySizes, (yyvsp[0].interm.intermTypedNode));
(yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-5].interm).intermNode, initNode, (yyvsp[-1].lex).loc);
}
-#line 5793 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5895 "MachineIndependent/glslang_tab.cpp"
break;
case 124: /* init_declarator_list: init_declarator_list COMMA IDENTIFIER EQUAL initializer */
-#line 1116 "glslang/MachineIndependent/glslang.y"
+#line 1117 "MachineIndependent/glslang.y"
{
(yyval.interm).type = (yyvsp[-4].interm).type;
TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-4].interm).type, 0, (yyvsp[0].interm.intermTypedNode));
(yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-4].interm).intermNode, initNode, (yyvsp[-1].lex).loc);
}
-#line 5803 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5905 "MachineIndependent/glslang_tab.cpp"
break;
case 125: /* single_declaration: fully_specified_type */
-#line 1124 "glslang/MachineIndependent/glslang.y"
+#line 1125 "MachineIndependent/glslang.y"
{
(yyval.interm).type = (yyvsp[0].interm.type);
(yyval.interm).intermNode = 0;
@@ -5811,51 +5913,51 @@
parseContext.declareTypeDefaults((yyval.interm).loc, (yyval.interm).type);
}
-#line 5815 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5917 "MachineIndependent/glslang_tab.cpp"
break;
case 126: /* single_declaration: fully_specified_type IDENTIFIER */
-#line 1131 "glslang/MachineIndependent/glslang.y"
+#line 1132 "MachineIndependent/glslang.y"
{
(yyval.interm).type = (yyvsp[-1].interm.type);
(yyval.interm).intermNode = 0;
parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-1].interm.type));
}
-#line 5825 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5927 "MachineIndependent/glslang_tab.cpp"
break;
case 127: /* single_declaration: fully_specified_type IDENTIFIER array_specifier */
-#line 1136 "glslang/MachineIndependent/glslang.y"
+#line 1137 "MachineIndependent/glslang.y"
{
(yyval.interm).type = (yyvsp[-2].interm.type);
(yyval.interm).intermNode = 0;
parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-2].interm.type), (yyvsp[0].interm).arraySizes);
}
-#line 5835 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5937 "MachineIndependent/glslang_tab.cpp"
break;
case 128: /* single_declaration: fully_specified_type IDENTIFIER array_specifier EQUAL initializer */
-#line 1141 "glslang/MachineIndependent/glslang.y"
+#line 1142 "MachineIndependent/glslang.y"
{
(yyval.interm).type = (yyvsp[-4].interm.type);
TIntermNode* initNode = parseContext.declareVariable((yyvsp[-3].lex).loc, *(yyvsp[-3].lex).string, (yyvsp[-4].interm.type), (yyvsp[-2].interm).arraySizes, (yyvsp[0].interm.intermTypedNode));
(yyval.interm).intermNode = parseContext.intermediate.growAggregate(0, initNode, (yyvsp[-1].lex).loc);
}
-#line 5845 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5947 "MachineIndependent/glslang_tab.cpp"
break;
case 129: /* single_declaration: fully_specified_type IDENTIFIER EQUAL initializer */
-#line 1146 "glslang/MachineIndependent/glslang.y"
+#line 1147 "MachineIndependent/glslang.y"
{
(yyval.interm).type = (yyvsp[-3].interm.type);
TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-3].interm.type), 0, (yyvsp[0].interm.intermTypedNode));
(yyval.interm).intermNode = parseContext.intermediate.growAggregate(0, initNode, (yyvsp[-1].lex).loc);
}
-#line 5855 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5957 "MachineIndependent/glslang_tab.cpp"
break;
case 130: /* fully_specified_type: type_specifier */
-#line 1155 "glslang/MachineIndependent/glslang.y"
+#line 1156 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[0].interm.type);
@@ -5866,11 +5968,11 @@
}
parseContext.precisionQualifierCheck((yyval.interm.type).loc, (yyval.interm.type).basicType, (yyval.interm.type).qualifier);
}
-#line 5870 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 5972 "MachineIndependent/glslang_tab.cpp"
break;
case 131: /* fully_specified_type: type_qualifier type_specifier */
-#line 1165 "glslang/MachineIndependent/glslang.y"
+#line 1166 "MachineIndependent/glslang.y"
{
parseContext.globalQualifierFixCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier);
parseContext.globalQualifierTypeCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier, (yyvsp[0].interm.type));
@@ -5895,22 +5997,22 @@
(parseContext.language == EShLangFragment && (yyval.interm.type).qualifier.storage == EvqVaryingIn)))
(yyval.interm.type).qualifier.smooth = true;
}
-#line 5899 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6001 "MachineIndependent/glslang_tab.cpp"
break;
case 132: /* invariant_qualifier: INVARIANT */
-#line 1192 "glslang/MachineIndependent/glslang.y"
+#line 1193 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "invariant");
parseContext.profileRequires((yyval.interm.type).loc, ENoProfile, 120, 0, "invariant");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.invariant = true;
}
-#line 5910 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6012 "MachineIndependent/glslang_tab.cpp"
break;
case 133: /* interpolation_qualifier: SMOOTH */
-#line 1201 "glslang/MachineIndependent/glslang.y"
+#line 1202 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "smooth");
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "smooth");
@@ -5918,11 +6020,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.smooth = true;
}
-#line 5922 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6024 "MachineIndependent/glslang_tab.cpp"
break;
case 134: /* interpolation_qualifier: FLAT */
-#line 1208 "glslang/MachineIndependent/glslang.y"
+#line 1209 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "flat");
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "flat");
@@ -5930,11 +6032,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.flat = true;
}
-#line 5934 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6036 "MachineIndependent/glslang_tab.cpp"
break;
case 135: /* interpolation_qualifier: NOPERSPECTIVE */
-#line 1216 "glslang/MachineIndependent/glslang.y"
+#line 1217 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "noperspective");
parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 0, E_GL_NV_shader_noperspective_interpolation, "noperspective");
@@ -5942,11 +6044,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.nopersp = true;
}
-#line 5946 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6048 "MachineIndependent/glslang_tab.cpp"
break;
case 136: /* interpolation_qualifier: EXPLICITINTERPAMD */
-#line 1223 "glslang/MachineIndependent/glslang.y"
+#line 1224 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "__explicitInterpAMD");
parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile, 450, E_GL_AMD_shader_explicit_vertex_parameter, "explicit interpolation");
@@ -5954,11 +6056,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.explicitInterp = true;
}
-#line 5958 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6060 "MachineIndependent/glslang_tab.cpp"
break;
case 137: /* interpolation_qualifier: PERVERTEXNV */
-#line 1230 "glslang/MachineIndependent/glslang.y"
+#line 1231 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "pervertexNV");
parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile, 0, E_GL_NV_fragment_shader_barycentric, "fragment shader barycentric");
@@ -5967,11 +6069,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.pervertexNV = true;
}
-#line 5971 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6073 "MachineIndependent/glslang_tab.cpp"
break;
case 138: /* interpolation_qualifier: PERPRIMITIVENV */
-#line 1238 "glslang/MachineIndependent/glslang.y"
+#line 1239 "MachineIndependent/glslang.y"
{
// No need for profile version or extension check. Shader stage already checks both.
parseContext.globalCheck((yyvsp[0].lex).loc, "perprimitiveNV");
@@ -5982,11 +6084,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.perPrimitiveNV = true;
}
-#line 5986 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6088 "MachineIndependent/glslang_tab.cpp"
break;
case 139: /* interpolation_qualifier: PERVIEWNV */
-#line 1248 "glslang/MachineIndependent/glslang.y"
+#line 1249 "MachineIndependent/glslang.y"
{
// No need for profile version or extension check. Shader stage already checks both.
parseContext.globalCheck((yyvsp[0].lex).loc, "perviewNV");
@@ -5994,11 +6096,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.perViewNV = true;
}
-#line 5998 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6100 "MachineIndependent/glslang_tab.cpp"
break;
case 140: /* interpolation_qualifier: PERTASKNV */
-#line 1255 "glslang/MachineIndependent/glslang.y"
+#line 1256 "MachineIndependent/glslang.y"
{
// No need for profile version or extension check. Shader stage already checks both.
parseContext.globalCheck((yyvsp[0].lex).loc, "taskNV");
@@ -6006,84 +6108,84 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.perTaskNV = true;
}
-#line 6010 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6112 "MachineIndependent/glslang_tab.cpp"
break;
case 141: /* layout_qualifier: LAYOUT LEFT_PAREN layout_qualifier_id_list RIGHT_PAREN */
-#line 1266 "glslang/MachineIndependent/glslang.y"
+#line 1267 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[-1].interm.type);
}
-#line 6018 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6120 "MachineIndependent/glslang_tab.cpp"
break;
case 142: /* layout_qualifier_id_list: layout_qualifier_id */
-#line 1272 "glslang/MachineIndependent/glslang.y"
+#line 1273 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 6026 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6128 "MachineIndependent/glslang_tab.cpp"
break;
case 143: /* layout_qualifier_id_list: layout_qualifier_id_list COMMA layout_qualifier_id */
-#line 1275 "glslang/MachineIndependent/glslang.y"
+#line 1276 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[-2].interm.type);
(yyval.interm.type).shaderQualifiers.merge((yyvsp[0].interm.type).shaderQualifiers);
parseContext.mergeObjectLayoutQualifiers((yyval.interm.type).qualifier, (yyvsp[0].interm.type).qualifier, false);
}
-#line 6036 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6138 "MachineIndependent/glslang_tab.cpp"
break;
case 144: /* layout_qualifier_id: IDENTIFIER */
-#line 1282 "glslang/MachineIndependent/glslang.y"
+#line 1283 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
parseContext.setLayoutQualifier((yyvsp[0].lex).loc, (yyval.interm.type), *(yyvsp[0].lex).string);
}
-#line 6045 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6147 "MachineIndependent/glslang_tab.cpp"
break;
case 145: /* layout_qualifier_id: IDENTIFIER EQUAL constant_expression */
-#line 1286 "glslang/MachineIndependent/glslang.y"
+#line 1287 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[-2].lex).loc);
parseContext.setLayoutQualifier((yyvsp[-2].lex).loc, (yyval.interm.type), *(yyvsp[-2].lex).string, (yyvsp[0].interm.intermTypedNode));
}
-#line 6054 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6156 "MachineIndependent/glslang_tab.cpp"
break;
case 146: /* layout_qualifier_id: SHARED */
-#line 1290 "glslang/MachineIndependent/glslang.y"
+#line 1291 "MachineIndependent/glslang.y"
{ // because "shared" is both an identifier and a keyword
(yyval.interm.type).init((yyvsp[0].lex).loc);
TString strShared("shared");
parseContext.setLayoutQualifier((yyvsp[0].lex).loc, (yyval.interm.type), strShared);
}
-#line 6064 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6166 "MachineIndependent/glslang_tab.cpp"
break;
case 147: /* precise_qualifier: PRECISE */
-#line 1299 "glslang/MachineIndependent/glslang.y"
+#line 1300 "MachineIndependent/glslang.y"
{
parseContext.profileRequires((yyval.interm.type).loc, ECoreProfile | ECompatibilityProfile, 400, E_GL_ARB_gpu_shader5, "precise");
parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 320, Num_AEP_gpu_shader5, AEP_gpu_shader5, "precise");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.noContraction = true;
}
-#line 6075 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6177 "MachineIndependent/glslang_tab.cpp"
break;
case 148: /* type_qualifier: single_type_qualifier */
-#line 1309 "glslang/MachineIndependent/glslang.y"
+#line 1310 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 6083 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6185 "MachineIndependent/glslang_tab.cpp"
break;
case 149: /* type_qualifier: type_qualifier single_type_qualifier */
-#line 1312 "glslang/MachineIndependent/glslang.y"
+#line 1313 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[-1].interm.type);
if ((yyval.interm.type).basicType == EbtVoid)
@@ -6092,112 +6194,112 @@
(yyval.interm.type).shaderQualifiers.merge((yyvsp[0].interm.type).shaderQualifiers);
parseContext.mergeQualifiers((yyval.interm.type).loc, (yyval.interm.type).qualifier, (yyvsp[0].interm.type).qualifier, false);
}
-#line 6096 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6198 "MachineIndependent/glslang_tab.cpp"
break;
case 150: /* single_type_qualifier: storage_qualifier */
-#line 1323 "glslang/MachineIndependent/glslang.y"
+#line 1324 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 6104 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6206 "MachineIndependent/glslang_tab.cpp"
break;
case 151: /* single_type_qualifier: layout_qualifier */
-#line 1326 "glslang/MachineIndependent/glslang.y"
+#line 1327 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 6112 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6214 "MachineIndependent/glslang_tab.cpp"
break;
case 152: /* single_type_qualifier: precision_qualifier */
-#line 1329 "glslang/MachineIndependent/glslang.y"
+#line 1330 "MachineIndependent/glslang.y"
{
parseContext.checkPrecisionQualifier((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type).qualifier.precision);
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 6121 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6223 "MachineIndependent/glslang_tab.cpp"
break;
case 153: /* single_type_qualifier: interpolation_qualifier */
-#line 1333 "glslang/MachineIndependent/glslang.y"
+#line 1334 "MachineIndependent/glslang.y"
{
// allow inheritance of storage qualifier from block declaration
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 6130 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6232 "MachineIndependent/glslang_tab.cpp"
break;
case 154: /* single_type_qualifier: invariant_qualifier */
-#line 1337 "glslang/MachineIndependent/glslang.y"
+#line 1338 "MachineIndependent/glslang.y"
{
// allow inheritance of storage qualifier from block declaration
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 6139 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6241 "MachineIndependent/glslang_tab.cpp"
break;
case 155: /* single_type_qualifier: precise_qualifier */
-#line 1342 "glslang/MachineIndependent/glslang.y"
+#line 1343 "MachineIndependent/glslang.y"
{
// allow inheritance of storage qualifier from block declaration
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 6148 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6250 "MachineIndependent/glslang_tab.cpp"
break;
case 156: /* single_type_qualifier: non_uniform_qualifier */
-#line 1346 "glslang/MachineIndependent/glslang.y"
+#line 1347 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[0].interm.type);
}
-#line 6156 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6258 "MachineIndependent/glslang_tab.cpp"
break;
case 157: /* storage_qualifier: CONST */
-#line 1353 "glslang/MachineIndependent/glslang.y"
+#line 1354 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqConst; // will later turn into EvqConstReadOnly, if the initializer is not constant
}
-#line 6165 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6267 "MachineIndependent/glslang_tab.cpp"
break;
case 158: /* storage_qualifier: INOUT */
-#line 1357 "glslang/MachineIndependent/glslang.y"
+#line 1358 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "inout");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqInOut;
}
-#line 6175 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6277 "MachineIndependent/glslang_tab.cpp"
break;
case 159: /* storage_qualifier: IN */
-#line 1362 "glslang/MachineIndependent/glslang.y"
+#line 1363 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "in");
(yyval.interm.type).init((yyvsp[0].lex).loc);
// whether this is a parameter "in" or a pipeline "in" will get sorted out a bit later
(yyval.interm.type).qualifier.storage = EvqIn;
}
-#line 6186 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6288 "MachineIndependent/glslang_tab.cpp"
break;
case 160: /* storage_qualifier: OUT */
-#line 1368 "glslang/MachineIndependent/glslang.y"
+#line 1369 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "out");
(yyval.interm.type).init((yyvsp[0].lex).loc);
// whether this is a parameter "out" or a pipeline "out" will get sorted out a bit later
(yyval.interm.type).qualifier.storage = EvqOut;
}
-#line 6197 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6299 "MachineIndependent/glslang_tab.cpp"
break;
case 161: /* storage_qualifier: CENTROID */
-#line 1374 "glslang/MachineIndependent/glslang.y"
+#line 1375 "MachineIndependent/glslang.y"
{
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 120, 0, "centroid");
parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, 0, "centroid");
@@ -6205,21 +6307,21 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.centroid = true;
}
-#line 6209 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6311 "MachineIndependent/glslang_tab.cpp"
break;
case 162: /* storage_qualifier: UNIFORM */
-#line 1381 "glslang/MachineIndependent/glslang.y"
+#line 1382 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "uniform");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqUniform;
}
-#line 6219 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6321 "MachineIndependent/glslang_tab.cpp"
break;
case 163: /* storage_qualifier: SHARED */
-#line 1386 "glslang/MachineIndependent/glslang.y"
+#line 1387 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "shared");
parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, 430, E_GL_ARB_compute_shader, "shared");
@@ -6228,21 +6330,21 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqShared;
}
-#line 6232 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6334 "MachineIndependent/glslang_tab.cpp"
break;
case 164: /* storage_qualifier: BUFFER */
-#line 1394 "glslang/MachineIndependent/glslang.y"
+#line 1395 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "buffer");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqBuffer;
}
-#line 6242 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6344 "MachineIndependent/glslang_tab.cpp"
break;
case 165: /* storage_qualifier: ATTRIBUTE */
-#line 1400 "glslang/MachineIndependent/glslang.y"
+#line 1401 "MachineIndependent/glslang.y"
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangVertex, "attribute");
parseContext.checkDeprecated((yyvsp[0].lex).loc, ECoreProfile, 130, "attribute");
@@ -6255,11 +6357,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqVaryingIn;
}
-#line 6259 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6361 "MachineIndependent/glslang_tab.cpp"
break;
case 166: /* storage_qualifier: VARYING */
-#line 1412 "glslang/MachineIndependent/glslang.y"
+#line 1413 "MachineIndependent/glslang.y"
{
parseContext.checkDeprecated((yyvsp[0].lex).loc, ENoProfile, 130, "varying");
parseContext.checkDeprecated((yyvsp[0].lex).loc, ECoreProfile, 130, "varying");
@@ -6274,32 +6376,32 @@
else
(yyval.interm.type).qualifier.storage = EvqVaryingIn;
}
-#line 6278 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6380 "MachineIndependent/glslang_tab.cpp"
break;
case 167: /* storage_qualifier: PATCH */
-#line 1426 "glslang/MachineIndependent/glslang.y"
+#line 1427 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "patch");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangTessControlMask | EShLangTessEvaluationMask), "patch");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.patch = true;
}
-#line 6289 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6391 "MachineIndependent/glslang_tab.cpp"
break;
case 168: /* storage_qualifier: SAMPLE */
-#line 1432 "glslang/MachineIndependent/glslang.y"
+#line 1433 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "sample");
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.sample = true;
}
-#line 6299 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6401 "MachineIndependent/glslang_tab.cpp"
break;
case 169: /* storage_qualifier: HITATTRNV */
-#line 1437 "glslang/MachineIndependent/glslang.y"
+#line 1438 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "hitAttributeNV");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangIntersectMask | EShLangClosestHitMask
@@ -6308,11 +6410,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqHitAttr;
}
-#line 6312 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6414 "MachineIndependent/glslang_tab.cpp"
break;
case 170: /* storage_qualifier: HITATTREXT */
-#line 1445 "glslang/MachineIndependent/glslang.y"
+#line 1446 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "hitAttributeEXT");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangIntersectMask | EShLangClosestHitMask
@@ -6321,11 +6423,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqHitAttr;
}
-#line 6325 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6427 "MachineIndependent/glslang_tab.cpp"
break;
case 171: /* storage_qualifier: PAYLOADNV */
-#line 1453 "glslang/MachineIndependent/glslang.y"
+#line 1454 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "rayPayloadNV");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangRayGenMask | EShLangClosestHitMask |
@@ -6334,11 +6436,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqPayload;
}
-#line 6338 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6440 "MachineIndependent/glslang_tab.cpp"
break;
case 172: /* storage_qualifier: PAYLOADEXT */
-#line 1461 "glslang/MachineIndependent/glslang.y"
+#line 1462 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "rayPayloadEXT");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangRayGenMask | EShLangClosestHitMask |
@@ -6347,11 +6449,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqPayload;
}
-#line 6351 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6453 "MachineIndependent/glslang_tab.cpp"
break;
case 173: /* storage_qualifier: PAYLOADINNV */
-#line 1469 "glslang/MachineIndependent/glslang.y"
+#line 1470 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "rayPayloadInNV");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangClosestHitMask |
@@ -6360,11 +6462,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqPayloadIn;
}
-#line 6364 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6466 "MachineIndependent/glslang_tab.cpp"
break;
case 174: /* storage_qualifier: PAYLOADINEXT */
-#line 1477 "glslang/MachineIndependent/glslang.y"
+#line 1478 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "rayPayloadInEXT");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangClosestHitMask |
@@ -6373,11 +6475,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqPayloadIn;
}
-#line 6377 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6479 "MachineIndependent/glslang_tab.cpp"
break;
case 175: /* storage_qualifier: CALLDATANV */
-#line 1485 "glslang/MachineIndependent/glslang.y"
+#line 1486 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "callableDataNV");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangRayGenMask |
@@ -6386,11 +6488,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqCallableData;
}
-#line 6390 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6492 "MachineIndependent/glslang_tab.cpp"
break;
case 176: /* storage_qualifier: CALLDATAEXT */
-#line 1493 "glslang/MachineIndependent/glslang.y"
+#line 1494 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "callableDataEXT");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangRayGenMask |
@@ -6399,11 +6501,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqCallableData;
}
-#line 6403 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6505 "MachineIndependent/glslang_tab.cpp"
break;
case 177: /* storage_qualifier: CALLDATAINNV */
-#line 1501 "glslang/MachineIndependent/glslang.y"
+#line 1502 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "callableDataInNV");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangCallableMask), "callableDataInNV");
@@ -6411,11 +6513,11 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqCallableDataIn;
}
-#line 6415 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6517 "MachineIndependent/glslang_tab.cpp"
break;
case 178: /* storage_qualifier: CALLDATAINEXT */
-#line 1508 "glslang/MachineIndependent/glslang.y"
+#line 1509 "MachineIndependent/glslang.y"
{
parseContext.globalCheck((yyvsp[0].lex).loc, "callableDataInEXT");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangCallableMask), "callableDataInEXT");
@@ -6423,175 +6525,175 @@
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqCallableDataIn;
}
-#line 6427 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6529 "MachineIndependent/glslang_tab.cpp"
break;
case 179: /* storage_qualifier: COHERENT */
-#line 1515 "glslang/MachineIndependent/glslang.y"
+#line 1516 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.coherent = true;
}
-#line 6436 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6538 "MachineIndependent/glslang_tab.cpp"
break;
case 180: /* storage_qualifier: DEVICECOHERENT */
-#line 1519 "glslang/MachineIndependent/glslang.y"
+#line 1520 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_KHR_memory_scope_semantics, "devicecoherent");
(yyval.interm.type).qualifier.devicecoherent = true;
}
-#line 6446 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6548 "MachineIndependent/glslang_tab.cpp"
break;
case 181: /* storage_qualifier: QUEUEFAMILYCOHERENT */
-#line 1524 "glslang/MachineIndependent/glslang.y"
+#line 1525 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_KHR_memory_scope_semantics, "queuefamilycoherent");
(yyval.interm.type).qualifier.queuefamilycoherent = true;
}
-#line 6456 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6558 "MachineIndependent/glslang_tab.cpp"
break;
case 182: /* storage_qualifier: WORKGROUPCOHERENT */
-#line 1529 "glslang/MachineIndependent/glslang.y"
+#line 1530 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_KHR_memory_scope_semantics, "workgroupcoherent");
(yyval.interm.type).qualifier.workgroupcoherent = true;
}
-#line 6466 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6568 "MachineIndependent/glslang_tab.cpp"
break;
case 183: /* storage_qualifier: SUBGROUPCOHERENT */
-#line 1534 "glslang/MachineIndependent/glslang.y"
+#line 1535 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_KHR_memory_scope_semantics, "subgroupcoherent");
(yyval.interm.type).qualifier.subgroupcoherent = true;
}
-#line 6476 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6578 "MachineIndependent/glslang_tab.cpp"
break;
case 184: /* storage_qualifier: NONPRIVATE */
-#line 1539 "glslang/MachineIndependent/glslang.y"
+#line 1540 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_KHR_memory_scope_semantics, "nonprivate");
(yyval.interm.type).qualifier.nonprivate = true;
}
-#line 6486 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6588 "MachineIndependent/glslang_tab.cpp"
break;
case 185: /* storage_qualifier: SHADERCALLCOHERENT */
-#line 1544 "glslang/MachineIndependent/glslang.y"
+#line 1545 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_EXT_ray_tracing, "shadercallcoherent");
(yyval.interm.type).qualifier.shadercallcoherent = true;
}
-#line 6496 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6598 "MachineIndependent/glslang_tab.cpp"
break;
case 186: /* storage_qualifier: VOLATILE */
-#line 1549 "glslang/MachineIndependent/glslang.y"
+#line 1550 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.volatil = true;
}
-#line 6505 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6607 "MachineIndependent/glslang_tab.cpp"
break;
case 187: /* storage_qualifier: RESTRICT */
-#line 1553 "glslang/MachineIndependent/glslang.y"
+#line 1554 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.restrict = true;
}
-#line 6514 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6616 "MachineIndependent/glslang_tab.cpp"
break;
case 188: /* storage_qualifier: READONLY */
-#line 1557 "glslang/MachineIndependent/glslang.y"
+#line 1558 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.readonly = true;
}
-#line 6523 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6625 "MachineIndependent/glslang_tab.cpp"
break;
case 189: /* storage_qualifier: WRITEONLY */
-#line 1561 "glslang/MachineIndependent/glslang.y"
+#line 1562 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.writeonly = true;
}
-#line 6532 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6634 "MachineIndependent/glslang_tab.cpp"
break;
case 190: /* storage_qualifier: SUBROUTINE */
-#line 1565 "glslang/MachineIndependent/glslang.y"
+#line 1566 "MachineIndependent/glslang.y"
{
parseContext.spvRemoved((yyvsp[0].lex).loc, "subroutine");
parseContext.globalCheck((yyvsp[0].lex).loc, "subroutine");
parseContext.unimplemented((yyvsp[0].lex).loc, "subroutine");
(yyval.interm.type).init((yyvsp[0].lex).loc);
}
-#line 6543 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6645 "MachineIndependent/glslang_tab.cpp"
break;
case 191: /* storage_qualifier: SUBROUTINE LEFT_PAREN type_name_list RIGHT_PAREN */
-#line 1571 "glslang/MachineIndependent/glslang.y"
+#line 1572 "MachineIndependent/glslang.y"
{
parseContext.spvRemoved((yyvsp[-3].lex).loc, "subroutine");
parseContext.globalCheck((yyvsp[-3].lex).loc, "subroutine");
parseContext.unimplemented((yyvsp[-3].lex).loc, "subroutine");
(yyval.interm.type).init((yyvsp[-3].lex).loc);
}
-#line 6554 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6656 "MachineIndependent/glslang_tab.cpp"
break;
case 192: /* non_uniform_qualifier: NONUNIFORM */
-#line 1582 "glslang/MachineIndependent/glslang.y"
+#line 1583 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.nonUniform = true;
}
-#line 6563 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6665 "MachineIndependent/glslang_tab.cpp"
break;
case 193: /* type_name_list: IDENTIFIER */
-#line 1589 "glslang/MachineIndependent/glslang.y"
+#line 1590 "MachineIndependent/glslang.y"
{
// TODO
}
-#line 6571 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6673 "MachineIndependent/glslang_tab.cpp"
break;
case 194: /* type_name_list: type_name_list COMMA IDENTIFIER */
-#line 1592 "glslang/MachineIndependent/glslang.y"
+#line 1593 "MachineIndependent/glslang.y"
{
// TODO: 4.0 semantics: subroutines
// 1) make sure each identifier is a type declared earlier with SUBROUTINE
// 2) save all of the identifiers for future comparison with the declared function
}
-#line 6581 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6683 "MachineIndependent/glslang_tab.cpp"
break;
case 195: /* type_specifier: type_specifier_nonarray type_parameter_specifier_opt */
-#line 1601 "glslang/MachineIndependent/glslang.y"
+#line 1602 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[-1].interm.type);
(yyval.interm.type).qualifier.precision = parseContext.getDefaultPrecision((yyval.interm.type));
(yyval.interm.type).typeParameters = (yyvsp[0].interm.typeParameters);
}
-#line 6591 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6693 "MachineIndependent/glslang_tab.cpp"
break;
case 196: /* type_specifier: type_specifier_nonarray type_parameter_specifier_opt array_specifier */
-#line 1606 "glslang/MachineIndependent/glslang.y"
+#line 1607 "MachineIndependent/glslang.y"
{
parseContext.arrayOfArrayVersionCheck((yyvsp[0].interm).loc, (yyvsp[0].interm).arraySizes);
(yyval.interm.type) = (yyvsp[-2].interm.type);
@@ -6599,21 +6701,21 @@
(yyval.interm.type).typeParameters = (yyvsp[-1].interm.typeParameters);
(yyval.interm.type).arraySizes = (yyvsp[0].interm).arraySizes;
}
-#line 6603 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6705 "MachineIndependent/glslang_tab.cpp"
break;
case 197: /* array_specifier: LEFT_BRACKET RIGHT_BRACKET */
-#line 1616 "glslang/MachineIndependent/glslang.y"
+#line 1617 "MachineIndependent/glslang.y"
{
(yyval.interm).loc = (yyvsp[-1].lex).loc;
(yyval.interm).arraySizes = new TArraySizes;
(yyval.interm).arraySizes->addInnerSize();
}
-#line 6613 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6715 "MachineIndependent/glslang_tab.cpp"
break;
case 198: /* array_specifier: LEFT_BRACKET conditional_expression RIGHT_BRACKET */
-#line 1621 "glslang/MachineIndependent/glslang.y"
+#line 1622 "MachineIndependent/glslang.y"
{
(yyval.interm).loc = (yyvsp[-2].lex).loc;
(yyval.interm).arraySizes = new TArraySizes;
@@ -6622,20 +6724,20 @@
parseContext.arraySizeCheck((yyvsp[-1].interm.intermTypedNode)->getLoc(), (yyvsp[-1].interm.intermTypedNode), size, "array size");
(yyval.interm).arraySizes->addInnerSize(size);
}
-#line 6626 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6728 "MachineIndependent/glslang_tab.cpp"
break;
case 199: /* array_specifier: array_specifier LEFT_BRACKET RIGHT_BRACKET */
-#line 1629 "glslang/MachineIndependent/glslang.y"
+#line 1630 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[-2].interm);
(yyval.interm).arraySizes->addInnerSize();
}
-#line 6635 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6737 "MachineIndependent/glslang_tab.cpp"
break;
case 200: /* array_specifier: array_specifier LEFT_BRACKET conditional_expression RIGHT_BRACKET */
-#line 1633 "glslang/MachineIndependent/glslang.y"
+#line 1634 "MachineIndependent/glslang.y"
{
(yyval.interm) = (yyvsp[-3].interm);
@@ -6643,35 +6745,35 @@
parseContext.arraySizeCheck((yyvsp[-1].interm.intermTypedNode)->getLoc(), (yyvsp[-1].interm.intermTypedNode), size, "array size");
(yyval.interm).arraySizes->addInnerSize(size);
}
-#line 6647 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6749 "MachineIndependent/glslang_tab.cpp"
break;
case 201: /* type_parameter_specifier_opt: type_parameter_specifier */
-#line 1643 "glslang/MachineIndependent/glslang.y"
+#line 1644 "MachineIndependent/glslang.y"
{
(yyval.interm.typeParameters) = (yyvsp[0].interm.typeParameters);
}
-#line 6655 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6757 "MachineIndependent/glslang_tab.cpp"
break;
case 202: /* type_parameter_specifier_opt: %empty */
-#line 1646 "glslang/MachineIndependent/glslang.y"
+#line 1647 "MachineIndependent/glslang.y"
{
(yyval.interm.typeParameters) = 0;
}
-#line 6663 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6765 "MachineIndependent/glslang_tab.cpp"
break;
case 203: /* type_parameter_specifier: LEFT_ANGLE type_parameter_specifier_list RIGHT_ANGLE */
-#line 1652 "glslang/MachineIndependent/glslang.y"
+#line 1653 "MachineIndependent/glslang.y"
{
(yyval.interm.typeParameters) = (yyvsp[-1].interm.typeParameters);
}
-#line 6671 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6773 "MachineIndependent/glslang_tab.cpp"
break;
case 204: /* type_parameter_specifier_list: unary_expression */
-#line 1658 "glslang/MachineIndependent/glslang.y"
+#line 1659 "MachineIndependent/glslang.y"
{
(yyval.interm.typeParameters) = new TArraySizes;
@@ -6679,11 +6781,11 @@
parseContext.arraySizeCheck((yyvsp[0].interm.intermTypedNode)->getLoc(), (yyvsp[0].interm.intermTypedNode), size, "type parameter");
(yyval.interm.typeParameters)->addInnerSize(size);
}
-#line 6683 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6785 "MachineIndependent/glslang_tab.cpp"
break;
case 205: /* type_parameter_specifier_list: type_parameter_specifier_list COMMA unary_expression */
-#line 1665 "glslang/MachineIndependent/glslang.y"
+#line 1666 "MachineIndependent/glslang.y"
{
(yyval.interm.typeParameters) = (yyvsp[-2].interm.typeParameters);
@@ -6691,300 +6793,300 @@
parseContext.arraySizeCheck((yyvsp[0].interm.intermTypedNode)->getLoc(), (yyvsp[0].interm.intermTypedNode), size, "type parameter");
(yyval.interm.typeParameters)->addInnerSize(size);
}
-#line 6695 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6797 "MachineIndependent/glslang_tab.cpp"
break;
case 206: /* type_specifier_nonarray: VOID */
-#line 1675 "glslang/MachineIndependent/glslang.y"
+#line 1676 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtVoid;
}
-#line 6704 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6806 "MachineIndependent/glslang_tab.cpp"
break;
case 207: /* type_specifier_nonarray: FLOAT */
-#line 1679 "glslang/MachineIndependent/glslang.y"
+#line 1680 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
}
-#line 6713 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6815 "MachineIndependent/glslang_tab.cpp"
break;
case 208: /* type_specifier_nonarray: INT */
-#line 1683 "glslang/MachineIndependent/glslang.y"
+#line 1684 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
}
-#line 6722 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6824 "MachineIndependent/glslang_tab.cpp"
break;
case 209: /* type_specifier_nonarray: UINT */
-#line 1687 "glslang/MachineIndependent/glslang.y"
+#line 1688 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
}
-#line 6732 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6834 "MachineIndependent/glslang_tab.cpp"
break;
case 210: /* type_specifier_nonarray: BOOL */
-#line 1692 "glslang/MachineIndependent/glslang.y"
+#line 1693 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtBool;
}
-#line 6741 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6843 "MachineIndependent/glslang_tab.cpp"
break;
case 211: /* type_specifier_nonarray: VEC2 */
-#line 1696 "glslang/MachineIndependent/glslang.y"
+#line 1697 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(2);
}
-#line 6751 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6853 "MachineIndependent/glslang_tab.cpp"
break;
case 212: /* type_specifier_nonarray: VEC3 */
-#line 1701 "glslang/MachineIndependent/glslang.y"
+#line 1702 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(3);
}
-#line 6761 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6863 "MachineIndependent/glslang_tab.cpp"
break;
case 213: /* type_specifier_nonarray: VEC4 */
-#line 1706 "glslang/MachineIndependent/glslang.y"
+#line 1707 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(4);
}
-#line 6771 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6873 "MachineIndependent/glslang_tab.cpp"
break;
case 214: /* type_specifier_nonarray: BVEC2 */
-#line 1711 "glslang/MachineIndependent/glslang.y"
+#line 1712 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtBool;
(yyval.interm.type).setVector(2);
}
-#line 6781 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6883 "MachineIndependent/glslang_tab.cpp"
break;
case 215: /* type_specifier_nonarray: BVEC3 */
-#line 1716 "glslang/MachineIndependent/glslang.y"
+#line 1717 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtBool;
(yyval.interm.type).setVector(3);
}
-#line 6791 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6893 "MachineIndependent/glslang_tab.cpp"
break;
case 216: /* type_specifier_nonarray: BVEC4 */
-#line 1721 "glslang/MachineIndependent/glslang.y"
+#line 1722 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtBool;
(yyval.interm.type).setVector(4);
}
-#line 6801 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6903 "MachineIndependent/glslang_tab.cpp"
break;
case 217: /* type_specifier_nonarray: IVEC2 */
-#line 1726 "glslang/MachineIndependent/glslang.y"
+#line 1727 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
(yyval.interm.type).setVector(2);
}
-#line 6811 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6913 "MachineIndependent/glslang_tab.cpp"
break;
case 218: /* type_specifier_nonarray: IVEC3 */
-#line 1731 "glslang/MachineIndependent/glslang.y"
+#line 1732 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
(yyval.interm.type).setVector(3);
}
-#line 6821 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6923 "MachineIndependent/glslang_tab.cpp"
break;
case 219: /* type_specifier_nonarray: IVEC4 */
-#line 1736 "glslang/MachineIndependent/glslang.y"
+#line 1737 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
(yyval.interm.type).setVector(4);
}
-#line 6831 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6933 "MachineIndependent/glslang_tab.cpp"
break;
case 220: /* type_specifier_nonarray: UVEC2 */
-#line 1741 "glslang/MachineIndependent/glslang.y"
+#line 1742 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
(yyval.interm.type).setVector(2);
}
-#line 6842 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6944 "MachineIndependent/glslang_tab.cpp"
break;
case 221: /* type_specifier_nonarray: UVEC3 */
-#line 1747 "glslang/MachineIndependent/glslang.y"
+#line 1748 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
(yyval.interm.type).setVector(3);
}
-#line 6853 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6955 "MachineIndependent/glslang_tab.cpp"
break;
case 222: /* type_specifier_nonarray: UVEC4 */
-#line 1753 "glslang/MachineIndependent/glslang.y"
+#line 1754 "MachineIndependent/glslang.y"
{
parseContext.fullIntegerCheck((yyvsp[0].lex).loc, "unsigned integer vector");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
(yyval.interm.type).setVector(4);
}
-#line 6864 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6966 "MachineIndependent/glslang_tab.cpp"
break;
case 223: /* type_specifier_nonarray: MAT2 */
-#line 1759 "glslang/MachineIndependent/glslang.y"
+#line 1760 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 6874 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6976 "MachineIndependent/glslang_tab.cpp"
break;
case 224: /* type_specifier_nonarray: MAT3 */
-#line 1764 "glslang/MachineIndependent/glslang.y"
+#line 1765 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 6884 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6986 "MachineIndependent/glslang_tab.cpp"
break;
case 225: /* type_specifier_nonarray: MAT4 */
-#line 1769 "glslang/MachineIndependent/glslang.y"
+#line 1770 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 6894 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 6996 "MachineIndependent/glslang_tab.cpp"
break;
case 226: /* type_specifier_nonarray: MAT2X2 */
-#line 1774 "glslang/MachineIndependent/glslang.y"
+#line 1775 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 6904 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7006 "MachineIndependent/glslang_tab.cpp"
break;
case 227: /* type_specifier_nonarray: MAT2X3 */
-#line 1779 "glslang/MachineIndependent/glslang.y"
+#line 1780 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 3);
}
-#line 6914 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7016 "MachineIndependent/glslang_tab.cpp"
break;
case 228: /* type_specifier_nonarray: MAT2X4 */
-#line 1784 "glslang/MachineIndependent/glslang.y"
+#line 1785 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 4);
}
-#line 6924 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7026 "MachineIndependent/glslang_tab.cpp"
break;
case 229: /* type_specifier_nonarray: MAT3X2 */
-#line 1789 "glslang/MachineIndependent/glslang.y"
+#line 1790 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 2);
}
-#line 6934 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7036 "MachineIndependent/glslang_tab.cpp"
break;
case 230: /* type_specifier_nonarray: MAT3X3 */
-#line 1794 "glslang/MachineIndependent/glslang.y"
+#line 1795 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 6944 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7046 "MachineIndependent/glslang_tab.cpp"
break;
case 231: /* type_specifier_nonarray: MAT3X4 */
-#line 1799 "glslang/MachineIndependent/glslang.y"
+#line 1800 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 4);
}
-#line 6954 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7056 "MachineIndependent/glslang_tab.cpp"
break;
case 232: /* type_specifier_nonarray: MAT4X2 */
-#line 1804 "glslang/MachineIndependent/glslang.y"
+#line 1805 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 2);
}
-#line 6964 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7066 "MachineIndependent/glslang_tab.cpp"
break;
case 233: /* type_specifier_nonarray: MAT4X3 */
-#line 1809 "glslang/MachineIndependent/glslang.y"
+#line 1810 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 3);
}
-#line 6974 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7076 "MachineIndependent/glslang_tab.cpp"
break;
case 234: /* type_specifier_nonarray: MAT4X4 */
-#line 1814 "glslang/MachineIndependent/glslang.y"
+#line 1815 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 6984 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7086 "MachineIndependent/glslang_tab.cpp"
break;
case 235: /* type_specifier_nonarray: DOUBLE */
-#line 1820 "glslang/MachineIndependent/glslang.y"
+#line 1821 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -6992,121 +7094,121 @@
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
}
-#line 6996 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7098 "MachineIndependent/glslang_tab.cpp"
break;
case 236: /* type_specifier_nonarray: FLOAT16_T */
-#line 1827 "glslang/MachineIndependent/glslang.y"
+#line 1828 "MachineIndependent/glslang.y"
{
parseContext.float16ScalarVectorCheck((yyvsp[0].lex).loc, "float16_t", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
}
-#line 7006 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7108 "MachineIndependent/glslang_tab.cpp"
break;
case 237: /* type_specifier_nonarray: FLOAT32_T */
-#line 1832 "glslang/MachineIndependent/glslang.y"
+#line 1833 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
}
-#line 7016 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7118 "MachineIndependent/glslang_tab.cpp"
break;
case 238: /* type_specifier_nonarray: FLOAT64_T */
-#line 1837 "glslang/MachineIndependent/glslang.y"
+#line 1838 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
}
-#line 7026 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7128 "MachineIndependent/glslang_tab.cpp"
break;
case 239: /* type_specifier_nonarray: INT8_T */
-#line 1842 "glslang/MachineIndependent/glslang.y"
+#line 1843 "MachineIndependent/glslang.y"
{
parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt8;
}
-#line 7036 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7138 "MachineIndependent/glslang_tab.cpp"
break;
case 240: /* type_specifier_nonarray: UINT8_T */
-#line 1847 "glslang/MachineIndependent/glslang.y"
+#line 1848 "MachineIndependent/glslang.y"
{
parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint8;
}
-#line 7046 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7148 "MachineIndependent/glslang_tab.cpp"
break;
case 241: /* type_specifier_nonarray: INT16_T */
-#line 1852 "glslang/MachineIndependent/glslang.y"
+#line 1853 "MachineIndependent/glslang.y"
{
parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt16;
}
-#line 7056 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7158 "MachineIndependent/glslang_tab.cpp"
break;
case 242: /* type_specifier_nonarray: UINT16_T */
-#line 1857 "glslang/MachineIndependent/glslang.y"
+#line 1858 "MachineIndependent/glslang.y"
{
parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint16;
}
-#line 7066 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7168 "MachineIndependent/glslang_tab.cpp"
break;
case 243: /* type_specifier_nonarray: INT32_T */
-#line 1862 "glslang/MachineIndependent/glslang.y"
+#line 1863 "MachineIndependent/glslang.y"
{
parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
}
-#line 7076 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7178 "MachineIndependent/glslang_tab.cpp"
break;
case 244: /* type_specifier_nonarray: UINT32_T */
-#line 1867 "glslang/MachineIndependent/glslang.y"
+#line 1868 "MachineIndependent/glslang.y"
{
parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
}
-#line 7086 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7188 "MachineIndependent/glslang_tab.cpp"
break;
case 245: /* type_specifier_nonarray: INT64_T */
-#line 1872 "glslang/MachineIndependent/glslang.y"
+#line 1873 "MachineIndependent/glslang.y"
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt64;
}
-#line 7096 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7198 "MachineIndependent/glslang_tab.cpp"
break;
case 246: /* type_specifier_nonarray: UINT64_T */
-#line 1877 "glslang/MachineIndependent/glslang.y"
+#line 1878 "MachineIndependent/glslang.y"
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint64;
}
-#line 7106 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7208 "MachineIndependent/glslang_tab.cpp"
break;
case 247: /* type_specifier_nonarray: DVEC2 */
-#line 1882 "glslang/MachineIndependent/glslang.y"
+#line 1883 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double vector");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7115,11 +7217,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(2);
}
-#line 7119 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7221 "MachineIndependent/glslang_tab.cpp"
break;
case 248: /* type_specifier_nonarray: DVEC3 */
-#line 1890 "glslang/MachineIndependent/glslang.y"
+#line 1891 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double vector");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7128,11 +7230,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(3);
}
-#line 7132 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7234 "MachineIndependent/glslang_tab.cpp"
break;
case 249: /* type_specifier_nonarray: DVEC4 */
-#line 1898 "glslang/MachineIndependent/glslang.y"
+#line 1899 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double vector");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7141,374 +7243,374 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(4);
}
-#line 7145 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7247 "MachineIndependent/glslang_tab.cpp"
break;
case 250: /* type_specifier_nonarray: F16VEC2 */
-#line 1906 "glslang/MachineIndependent/glslang.y"
+#line 1907 "MachineIndependent/glslang.y"
{
parseContext.float16ScalarVectorCheck((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setVector(2);
}
-#line 7156 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7258 "MachineIndependent/glslang_tab.cpp"
break;
case 251: /* type_specifier_nonarray: F16VEC3 */
-#line 1912 "glslang/MachineIndependent/glslang.y"
+#line 1913 "MachineIndependent/glslang.y"
{
parseContext.float16ScalarVectorCheck((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setVector(3);
}
-#line 7167 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7269 "MachineIndependent/glslang_tab.cpp"
break;
case 252: /* type_specifier_nonarray: F16VEC4 */
-#line 1918 "glslang/MachineIndependent/glslang.y"
+#line 1919 "MachineIndependent/glslang.y"
{
parseContext.float16ScalarVectorCheck((yyvsp[0].lex).loc, "half float vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setVector(4);
}
-#line 7178 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7280 "MachineIndependent/glslang_tab.cpp"
break;
case 253: /* type_specifier_nonarray: F32VEC2 */
-#line 1924 "glslang/MachineIndependent/glslang.y"
+#line 1925 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(2);
}
-#line 7189 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7291 "MachineIndependent/glslang_tab.cpp"
break;
case 254: /* type_specifier_nonarray: F32VEC3 */
-#line 1930 "glslang/MachineIndependent/glslang.y"
+#line 1931 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(3);
}
-#line 7200 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7302 "MachineIndependent/glslang_tab.cpp"
break;
case 255: /* type_specifier_nonarray: F32VEC4 */
-#line 1936 "glslang/MachineIndependent/glslang.y"
+#line 1937 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(4);
}
-#line 7211 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7313 "MachineIndependent/glslang_tab.cpp"
break;
case 256: /* type_specifier_nonarray: F64VEC2 */
-#line 1942 "glslang/MachineIndependent/glslang.y"
+#line 1943 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(2);
}
-#line 7222 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7324 "MachineIndependent/glslang_tab.cpp"
break;
case 257: /* type_specifier_nonarray: F64VEC3 */
-#line 1948 "glslang/MachineIndependent/glslang.y"
+#line 1949 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(3);
}
-#line 7233 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7335 "MachineIndependent/glslang_tab.cpp"
break;
case 258: /* type_specifier_nonarray: F64VEC4 */
-#line 1954 "glslang/MachineIndependent/glslang.y"
+#line 1955 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(4);
}
-#line 7244 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7346 "MachineIndependent/glslang_tab.cpp"
break;
case 259: /* type_specifier_nonarray: I8VEC2 */
-#line 1960 "glslang/MachineIndependent/glslang.y"
+#line 1961 "MachineIndependent/glslang.y"
{
parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt8;
(yyval.interm.type).setVector(2);
}
-#line 7255 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7357 "MachineIndependent/glslang_tab.cpp"
break;
case 260: /* type_specifier_nonarray: I8VEC3 */
-#line 1966 "glslang/MachineIndependent/glslang.y"
+#line 1967 "MachineIndependent/glslang.y"
{
parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt8;
(yyval.interm.type).setVector(3);
}
-#line 7266 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7368 "MachineIndependent/glslang_tab.cpp"
break;
case 261: /* type_specifier_nonarray: I8VEC4 */
-#line 1972 "glslang/MachineIndependent/glslang.y"
+#line 1973 "MachineIndependent/glslang.y"
{
parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt8;
(yyval.interm.type).setVector(4);
}
-#line 7277 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7379 "MachineIndependent/glslang_tab.cpp"
break;
case 262: /* type_specifier_nonarray: I16VEC2 */
-#line 1978 "glslang/MachineIndependent/glslang.y"
+#line 1979 "MachineIndependent/glslang.y"
{
parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt16;
(yyval.interm.type).setVector(2);
}
-#line 7288 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7390 "MachineIndependent/glslang_tab.cpp"
break;
case 263: /* type_specifier_nonarray: I16VEC3 */
-#line 1984 "glslang/MachineIndependent/glslang.y"
+#line 1985 "MachineIndependent/glslang.y"
{
parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt16;
(yyval.interm.type).setVector(3);
}
-#line 7299 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7401 "MachineIndependent/glslang_tab.cpp"
break;
case 264: /* type_specifier_nonarray: I16VEC4 */
-#line 1990 "glslang/MachineIndependent/glslang.y"
+#line 1991 "MachineIndependent/glslang.y"
{
parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt16;
(yyval.interm.type).setVector(4);
}
-#line 7310 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7412 "MachineIndependent/glslang_tab.cpp"
break;
case 265: /* type_specifier_nonarray: I32VEC2 */
-#line 1996 "glslang/MachineIndependent/glslang.y"
+#line 1997 "MachineIndependent/glslang.y"
{
parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
(yyval.interm.type).setVector(2);
}
-#line 7321 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7423 "MachineIndependent/glslang_tab.cpp"
break;
case 266: /* type_specifier_nonarray: I32VEC3 */
-#line 2002 "glslang/MachineIndependent/glslang.y"
+#line 2003 "MachineIndependent/glslang.y"
{
parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
(yyval.interm.type).setVector(3);
}
-#line 7332 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7434 "MachineIndependent/glslang_tab.cpp"
break;
case 267: /* type_specifier_nonarray: I32VEC4 */
-#line 2008 "glslang/MachineIndependent/glslang.y"
+#line 2009 "MachineIndependent/glslang.y"
{
parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
(yyval.interm.type).setVector(4);
}
-#line 7343 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7445 "MachineIndependent/glslang_tab.cpp"
break;
case 268: /* type_specifier_nonarray: I64VEC2 */
-#line 2014 "glslang/MachineIndependent/glslang.y"
+#line 2015 "MachineIndependent/glslang.y"
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt64;
(yyval.interm.type).setVector(2);
}
-#line 7354 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7456 "MachineIndependent/glslang_tab.cpp"
break;
case 269: /* type_specifier_nonarray: I64VEC3 */
-#line 2020 "glslang/MachineIndependent/glslang.y"
+#line 2021 "MachineIndependent/glslang.y"
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt64;
(yyval.interm.type).setVector(3);
}
-#line 7365 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7467 "MachineIndependent/glslang_tab.cpp"
break;
case 270: /* type_specifier_nonarray: I64VEC4 */
-#line 2026 "glslang/MachineIndependent/glslang.y"
+#line 2027 "MachineIndependent/glslang.y"
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt64;
(yyval.interm.type).setVector(4);
}
-#line 7376 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7478 "MachineIndependent/glslang_tab.cpp"
break;
case 271: /* type_specifier_nonarray: U8VEC2 */
-#line 2032 "glslang/MachineIndependent/glslang.y"
+#line 2033 "MachineIndependent/glslang.y"
{
parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint8;
(yyval.interm.type).setVector(2);
}
-#line 7387 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7489 "MachineIndependent/glslang_tab.cpp"
break;
case 272: /* type_specifier_nonarray: U8VEC3 */
-#line 2038 "glslang/MachineIndependent/glslang.y"
+#line 2039 "MachineIndependent/glslang.y"
{
parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint8;
(yyval.interm.type).setVector(3);
}
-#line 7398 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7500 "MachineIndependent/glslang_tab.cpp"
break;
case 273: /* type_specifier_nonarray: U8VEC4 */
-#line 2044 "glslang/MachineIndependent/glslang.y"
+#line 2045 "MachineIndependent/glslang.y"
{
parseContext.int8ScalarVectorCheck((yyvsp[0].lex).loc, "8-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint8;
(yyval.interm.type).setVector(4);
}
-#line 7409 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7511 "MachineIndependent/glslang_tab.cpp"
break;
case 274: /* type_specifier_nonarray: U16VEC2 */
-#line 2050 "glslang/MachineIndependent/glslang.y"
+#line 2051 "MachineIndependent/glslang.y"
{
parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint16;
(yyval.interm.type).setVector(2);
}
-#line 7420 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7522 "MachineIndependent/glslang_tab.cpp"
break;
case 275: /* type_specifier_nonarray: U16VEC3 */
-#line 2056 "glslang/MachineIndependent/glslang.y"
+#line 2057 "MachineIndependent/glslang.y"
{
parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint16;
(yyval.interm.type).setVector(3);
}
-#line 7431 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7533 "MachineIndependent/glslang_tab.cpp"
break;
case 276: /* type_specifier_nonarray: U16VEC4 */
-#line 2062 "glslang/MachineIndependent/glslang.y"
+#line 2063 "MachineIndependent/glslang.y"
{
parseContext.int16ScalarVectorCheck((yyvsp[0].lex).loc, "16-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint16;
(yyval.interm.type).setVector(4);
}
-#line 7442 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7544 "MachineIndependent/glslang_tab.cpp"
break;
case 277: /* type_specifier_nonarray: U32VEC2 */
-#line 2068 "glslang/MachineIndependent/glslang.y"
+#line 2069 "MachineIndependent/glslang.y"
{
parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
(yyval.interm.type).setVector(2);
}
-#line 7453 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7555 "MachineIndependent/glslang_tab.cpp"
break;
case 278: /* type_specifier_nonarray: U32VEC3 */
-#line 2074 "glslang/MachineIndependent/glslang.y"
+#line 2075 "MachineIndependent/glslang.y"
{
parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
(yyval.interm.type).setVector(3);
}
-#line 7464 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7566 "MachineIndependent/glslang_tab.cpp"
break;
case 279: /* type_specifier_nonarray: U32VEC4 */
-#line 2080 "glslang/MachineIndependent/glslang.y"
+#line 2081 "MachineIndependent/glslang.y"
{
parseContext.explicitInt32Check((yyvsp[0].lex).loc, "32-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
(yyval.interm.type).setVector(4);
}
-#line 7475 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7577 "MachineIndependent/glslang_tab.cpp"
break;
case 280: /* type_specifier_nonarray: U64VEC2 */
-#line 2086 "glslang/MachineIndependent/glslang.y"
+#line 2087 "MachineIndependent/glslang.y"
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint64;
(yyval.interm.type).setVector(2);
}
-#line 7486 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7588 "MachineIndependent/glslang_tab.cpp"
break;
case 281: /* type_specifier_nonarray: U64VEC3 */
-#line 2092 "glslang/MachineIndependent/glslang.y"
+#line 2093 "MachineIndependent/glslang.y"
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint64;
(yyval.interm.type).setVector(3);
}
-#line 7497 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7599 "MachineIndependent/glslang_tab.cpp"
break;
case 282: /* type_specifier_nonarray: U64VEC4 */
-#line 2098 "glslang/MachineIndependent/glslang.y"
+#line 2099 "MachineIndependent/glslang.y"
{
parseContext.int64Check((yyvsp[0].lex).loc, "64-bit unsigned integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint64;
(yyval.interm.type).setVector(4);
}
-#line 7508 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7610 "MachineIndependent/glslang_tab.cpp"
break;
case 283: /* type_specifier_nonarray: DMAT2 */
-#line 2104 "glslang/MachineIndependent/glslang.y"
+#line 2105 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7517,11 +7619,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 7521 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7623 "MachineIndependent/glslang_tab.cpp"
break;
case 284: /* type_specifier_nonarray: DMAT3 */
-#line 2112 "glslang/MachineIndependent/glslang.y"
+#line 2113 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7530,11 +7632,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 7534 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7636 "MachineIndependent/glslang_tab.cpp"
break;
case 285: /* type_specifier_nonarray: DMAT4 */
-#line 2120 "glslang/MachineIndependent/glslang.y"
+#line 2121 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7543,11 +7645,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 7547 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7649 "MachineIndependent/glslang_tab.cpp"
break;
case 286: /* type_specifier_nonarray: DMAT2X2 */
-#line 2128 "glslang/MachineIndependent/glslang.y"
+#line 2129 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7556,11 +7658,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 7560 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7662 "MachineIndependent/glslang_tab.cpp"
break;
case 287: /* type_specifier_nonarray: DMAT2X3 */
-#line 2136 "glslang/MachineIndependent/glslang.y"
+#line 2137 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7569,11 +7671,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 3);
}
-#line 7573 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7675 "MachineIndependent/glslang_tab.cpp"
break;
case 288: /* type_specifier_nonarray: DMAT2X4 */
-#line 2144 "glslang/MachineIndependent/glslang.y"
+#line 2145 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7582,11 +7684,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 4);
}
-#line 7586 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7688 "MachineIndependent/glslang_tab.cpp"
break;
case 289: /* type_specifier_nonarray: DMAT3X2 */
-#line 2152 "glslang/MachineIndependent/glslang.y"
+#line 2153 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7595,11 +7697,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 2);
}
-#line 7599 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7701 "MachineIndependent/glslang_tab.cpp"
break;
case 290: /* type_specifier_nonarray: DMAT3X3 */
-#line 2160 "glslang/MachineIndependent/glslang.y"
+#line 2161 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7608,11 +7710,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 7612 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7714 "MachineIndependent/glslang_tab.cpp"
break;
case 291: /* type_specifier_nonarray: DMAT3X4 */
-#line 2168 "glslang/MachineIndependent/glslang.y"
+#line 2169 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7621,11 +7723,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 4);
}
-#line 7625 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7727 "MachineIndependent/glslang_tab.cpp"
break;
case 292: /* type_specifier_nonarray: DMAT4X2 */
-#line 2176 "glslang/MachineIndependent/glslang.y"
+#line 2177 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7634,11 +7736,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 2);
}
-#line 7638 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7740 "MachineIndependent/glslang_tab.cpp"
break;
case 293: /* type_specifier_nonarray: DMAT4X3 */
-#line 2184 "glslang/MachineIndependent/glslang.y"
+#line 2185 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7647,11 +7749,11 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 3);
}
-#line 7651 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7753 "MachineIndependent/glslang_tab.cpp"
break;
case 294: /* type_specifier_nonarray: DMAT4X4 */
-#line 2192 "glslang/MachineIndependent/glslang.y"
+#line 2193 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, "double matrix");
if (! parseContext.symbolTable.atBuiltInLevel())
@@ -7660,2228 +7762,2228 @@
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 7664 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7766 "MachineIndependent/glslang_tab.cpp"
break;
case 295: /* type_specifier_nonarray: F16MAT2 */
-#line 2200 "glslang/MachineIndependent/glslang.y"
+#line 2201 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 7675 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7777 "MachineIndependent/glslang_tab.cpp"
break;
case 296: /* type_specifier_nonarray: F16MAT3 */
-#line 2206 "glslang/MachineIndependent/glslang.y"
+#line 2207 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 7686 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7788 "MachineIndependent/glslang_tab.cpp"
break;
case 297: /* type_specifier_nonarray: F16MAT4 */
-#line 2212 "glslang/MachineIndependent/glslang.y"
+#line 2213 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 7697 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7799 "MachineIndependent/glslang_tab.cpp"
break;
case 298: /* type_specifier_nonarray: F16MAT2X2 */
-#line 2218 "glslang/MachineIndependent/glslang.y"
+#line 2219 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 7708 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7810 "MachineIndependent/glslang_tab.cpp"
break;
case 299: /* type_specifier_nonarray: F16MAT2X3 */
-#line 2224 "glslang/MachineIndependent/glslang.y"
+#line 2225 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(2, 3);
}
-#line 7719 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7821 "MachineIndependent/glslang_tab.cpp"
break;
case 300: /* type_specifier_nonarray: F16MAT2X4 */
-#line 2230 "glslang/MachineIndependent/glslang.y"
+#line 2231 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(2, 4);
}
-#line 7730 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7832 "MachineIndependent/glslang_tab.cpp"
break;
case 301: /* type_specifier_nonarray: F16MAT3X2 */
-#line 2236 "glslang/MachineIndependent/glslang.y"
+#line 2237 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(3, 2);
}
-#line 7741 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7843 "MachineIndependent/glslang_tab.cpp"
break;
case 302: /* type_specifier_nonarray: F16MAT3X3 */
-#line 2242 "glslang/MachineIndependent/glslang.y"
+#line 2243 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 7752 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7854 "MachineIndependent/glslang_tab.cpp"
break;
case 303: /* type_specifier_nonarray: F16MAT3X4 */
-#line 2248 "glslang/MachineIndependent/glslang.y"
+#line 2249 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(3, 4);
}
-#line 7763 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7865 "MachineIndependent/glslang_tab.cpp"
break;
case 304: /* type_specifier_nonarray: F16MAT4X2 */
-#line 2254 "glslang/MachineIndependent/glslang.y"
+#line 2255 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(4, 2);
}
-#line 7774 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7876 "MachineIndependent/glslang_tab.cpp"
break;
case 305: /* type_specifier_nonarray: F16MAT4X3 */
-#line 2260 "glslang/MachineIndependent/glslang.y"
+#line 2261 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(4, 3);
}
-#line 7785 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7887 "MachineIndependent/glslang_tab.cpp"
break;
case 306: /* type_specifier_nonarray: F16MAT4X4 */
-#line 2266 "glslang/MachineIndependent/glslang.y"
+#line 2267 "MachineIndependent/glslang.y"
{
parseContext.float16Check((yyvsp[0].lex).loc, "half float matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat16;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 7796 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7898 "MachineIndependent/glslang_tab.cpp"
break;
case 307: /* type_specifier_nonarray: F32MAT2 */
-#line 2272 "glslang/MachineIndependent/glslang.y"
+#line 2273 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 7807 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7909 "MachineIndependent/glslang_tab.cpp"
break;
case 308: /* type_specifier_nonarray: F32MAT3 */
-#line 2278 "glslang/MachineIndependent/glslang.y"
+#line 2279 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 7818 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7920 "MachineIndependent/glslang_tab.cpp"
break;
case 309: /* type_specifier_nonarray: F32MAT4 */
-#line 2284 "glslang/MachineIndependent/glslang.y"
+#line 2285 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 7829 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7931 "MachineIndependent/glslang_tab.cpp"
break;
case 310: /* type_specifier_nonarray: F32MAT2X2 */
-#line 2290 "glslang/MachineIndependent/glslang.y"
+#line 2291 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 7840 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7942 "MachineIndependent/glslang_tab.cpp"
break;
case 311: /* type_specifier_nonarray: F32MAT2X3 */
-#line 2296 "glslang/MachineIndependent/glslang.y"
+#line 2297 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 3);
}
-#line 7851 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7953 "MachineIndependent/glslang_tab.cpp"
break;
case 312: /* type_specifier_nonarray: F32MAT2X4 */
-#line 2302 "glslang/MachineIndependent/glslang.y"
+#line 2303 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 4);
}
-#line 7862 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7964 "MachineIndependent/glslang_tab.cpp"
break;
case 313: /* type_specifier_nonarray: F32MAT3X2 */
-#line 2308 "glslang/MachineIndependent/glslang.y"
+#line 2309 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 2);
}
-#line 7873 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7975 "MachineIndependent/glslang_tab.cpp"
break;
case 314: /* type_specifier_nonarray: F32MAT3X3 */
-#line 2314 "glslang/MachineIndependent/glslang.y"
+#line 2315 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 7884 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7986 "MachineIndependent/glslang_tab.cpp"
break;
case 315: /* type_specifier_nonarray: F32MAT3X4 */
-#line 2320 "glslang/MachineIndependent/glslang.y"
+#line 2321 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 4);
}
-#line 7895 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 7997 "MachineIndependent/glslang_tab.cpp"
break;
case 316: /* type_specifier_nonarray: F32MAT4X2 */
-#line 2326 "glslang/MachineIndependent/glslang.y"
+#line 2327 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 2);
}
-#line 7906 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8008 "MachineIndependent/glslang_tab.cpp"
break;
case 317: /* type_specifier_nonarray: F32MAT4X3 */
-#line 2332 "glslang/MachineIndependent/glslang.y"
+#line 2333 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 3);
}
-#line 7917 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8019 "MachineIndependent/glslang_tab.cpp"
break;
case 318: /* type_specifier_nonarray: F32MAT4X4 */
-#line 2338 "glslang/MachineIndependent/glslang.y"
+#line 2339 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 7928 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8030 "MachineIndependent/glslang_tab.cpp"
break;
case 319: /* type_specifier_nonarray: F64MAT2 */
-#line 2344 "glslang/MachineIndependent/glslang.y"
+#line 2345 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 7939 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8041 "MachineIndependent/glslang_tab.cpp"
break;
case 320: /* type_specifier_nonarray: F64MAT3 */
-#line 2350 "glslang/MachineIndependent/glslang.y"
+#line 2351 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 7950 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8052 "MachineIndependent/glslang_tab.cpp"
break;
case 321: /* type_specifier_nonarray: F64MAT4 */
-#line 2356 "glslang/MachineIndependent/glslang.y"
+#line 2357 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 7961 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8063 "MachineIndependent/glslang_tab.cpp"
break;
case 322: /* type_specifier_nonarray: F64MAT2X2 */
-#line 2362 "glslang/MachineIndependent/glslang.y"
+#line 2363 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 2);
}
-#line 7972 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8074 "MachineIndependent/glslang_tab.cpp"
break;
case 323: /* type_specifier_nonarray: F64MAT2X3 */
-#line 2368 "glslang/MachineIndependent/glslang.y"
+#line 2369 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 3);
}
-#line 7983 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8085 "MachineIndependent/glslang_tab.cpp"
break;
case 324: /* type_specifier_nonarray: F64MAT2X4 */
-#line 2374 "glslang/MachineIndependent/glslang.y"
+#line 2375 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 4);
}
-#line 7994 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8096 "MachineIndependent/glslang_tab.cpp"
break;
case 325: /* type_specifier_nonarray: F64MAT3X2 */
-#line 2380 "glslang/MachineIndependent/glslang.y"
+#line 2381 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 2);
}
-#line 8005 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8107 "MachineIndependent/glslang_tab.cpp"
break;
case 326: /* type_specifier_nonarray: F64MAT3X3 */
-#line 2386 "glslang/MachineIndependent/glslang.y"
+#line 2387 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 3);
}
-#line 8016 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8118 "MachineIndependent/glslang_tab.cpp"
break;
case 327: /* type_specifier_nonarray: F64MAT3X4 */
-#line 2392 "glslang/MachineIndependent/glslang.y"
+#line 2393 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 4);
}
-#line 8027 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8129 "MachineIndependent/glslang_tab.cpp"
break;
case 328: /* type_specifier_nonarray: F64MAT4X2 */
-#line 2398 "glslang/MachineIndependent/glslang.y"
+#line 2399 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 2);
}
-#line 8038 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8140 "MachineIndependent/glslang_tab.cpp"
break;
case 329: /* type_specifier_nonarray: F64MAT4X3 */
-#line 2404 "glslang/MachineIndependent/glslang.y"
+#line 2405 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 3);
}
-#line 8049 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8151 "MachineIndependent/glslang_tab.cpp"
break;
case 330: /* type_specifier_nonarray: F64MAT4X4 */
-#line 2410 "glslang/MachineIndependent/glslang.y"
+#line 2411 "MachineIndependent/glslang.y"
{
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 4);
}
-#line 8060 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8162 "MachineIndependent/glslang_tab.cpp"
break;
case 331: /* type_specifier_nonarray: ACCSTRUCTNV */
-#line 2416 "glslang/MachineIndependent/glslang.y"
+#line 2417 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtAccStruct;
}
-#line 8069 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8171 "MachineIndependent/glslang_tab.cpp"
break;
case 332: /* type_specifier_nonarray: ACCSTRUCTEXT */
-#line 2420 "glslang/MachineIndependent/glslang.y"
+#line 2421 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtAccStruct;
}
-#line 8078 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8180 "MachineIndependent/glslang_tab.cpp"
break;
case 333: /* type_specifier_nonarray: RAYQUERYEXT */
-#line 2424 "glslang/MachineIndependent/glslang.y"
+#line 2425 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtRayQuery;
}
-#line 8087 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8189 "MachineIndependent/glslang_tab.cpp"
break;
case 334: /* type_specifier_nonarray: ATOMIC_UINT */
-#line 2428 "glslang/MachineIndependent/glslang.y"
+#line 2429 "MachineIndependent/glslang.y"
{
parseContext.vulkanRemoved((yyvsp[0].lex).loc, "atomic counter types");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtAtomicUint;
}
-#line 8097 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8199 "MachineIndependent/glslang_tab.cpp"
break;
case 335: /* type_specifier_nonarray: SAMPLER1D */
-#line 2433 "glslang/MachineIndependent/glslang.y"
+#line 2434 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd1D);
}
-#line 8107 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8209 "MachineIndependent/glslang_tab.cpp"
break;
case 336: /* type_specifier_nonarray: SAMPLER2D */
-#line 2439 "glslang/MachineIndependent/glslang.y"
+#line 2440 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D);
}
-#line 8117 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8219 "MachineIndependent/glslang_tab.cpp"
break;
case 337: /* type_specifier_nonarray: SAMPLER3D */
-#line 2444 "glslang/MachineIndependent/glslang.y"
+#line 2445 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd3D);
}
-#line 8127 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8229 "MachineIndependent/glslang_tab.cpp"
break;
case 338: /* type_specifier_nonarray: SAMPLERCUBE */
-#line 2449 "glslang/MachineIndependent/glslang.y"
+#line 2450 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdCube);
}
-#line 8137 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8239 "MachineIndependent/glslang_tab.cpp"
break;
case 339: /* type_specifier_nonarray: SAMPLER2DSHADOW */
-#line 2454 "glslang/MachineIndependent/glslang.y"
+#line 2455 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D, false, true);
}
-#line 8147 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8249 "MachineIndependent/glslang_tab.cpp"
break;
case 340: /* type_specifier_nonarray: SAMPLERCUBESHADOW */
-#line 2459 "glslang/MachineIndependent/glslang.y"
+#line 2460 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdCube, false, true);
}
-#line 8157 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8259 "MachineIndependent/glslang_tab.cpp"
break;
case 341: /* type_specifier_nonarray: SAMPLER2DARRAY */
-#line 2464 "glslang/MachineIndependent/glslang.y"
+#line 2465 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D, true);
}
-#line 8167 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8269 "MachineIndependent/glslang_tab.cpp"
break;
case 342: /* type_specifier_nonarray: SAMPLER2DARRAYSHADOW */
-#line 2469 "glslang/MachineIndependent/glslang.y"
+#line 2470 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D, true, true);
}
-#line 8177 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8279 "MachineIndependent/glslang_tab.cpp"
break;
case 343: /* type_specifier_nonarray: SAMPLER1DSHADOW */
-#line 2475 "glslang/MachineIndependent/glslang.y"
+#line 2476 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd1D, false, true);
}
-#line 8187 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8289 "MachineIndependent/glslang_tab.cpp"
break;
case 344: /* type_specifier_nonarray: SAMPLER1DARRAY */
-#line 2480 "glslang/MachineIndependent/glslang.y"
+#line 2481 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd1D, true);
}
-#line 8197 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8299 "MachineIndependent/glslang_tab.cpp"
break;
case 345: /* type_specifier_nonarray: SAMPLER1DARRAYSHADOW */
-#line 2485 "glslang/MachineIndependent/glslang.y"
+#line 2486 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd1D, true, true);
}
-#line 8207 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8309 "MachineIndependent/glslang_tab.cpp"
break;
case 346: /* type_specifier_nonarray: SAMPLERCUBEARRAY */
-#line 2490 "glslang/MachineIndependent/glslang.y"
+#line 2491 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdCube, true);
}
-#line 8217 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8319 "MachineIndependent/glslang_tab.cpp"
break;
case 347: /* type_specifier_nonarray: SAMPLERCUBEARRAYSHADOW */
-#line 2495 "glslang/MachineIndependent/glslang.y"
+#line 2496 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdCube, true, true);
}
-#line 8227 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8329 "MachineIndependent/glslang_tab.cpp"
break;
case 348: /* type_specifier_nonarray: F16SAMPLER1D */
-#line 2500 "glslang/MachineIndependent/glslang.y"
+#line 2501 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd1D);
}
-#line 8238 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8340 "MachineIndependent/glslang_tab.cpp"
break;
case 349: /* type_specifier_nonarray: F16SAMPLER2D */
-#line 2506 "glslang/MachineIndependent/glslang.y"
+#line 2507 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd2D);
}
-#line 8249 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8351 "MachineIndependent/glslang_tab.cpp"
break;
case 350: /* type_specifier_nonarray: F16SAMPLER3D */
-#line 2512 "glslang/MachineIndependent/glslang.y"
+#line 2513 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd3D);
}
-#line 8260 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8362 "MachineIndependent/glslang_tab.cpp"
break;
case 351: /* type_specifier_nonarray: F16SAMPLERCUBE */
-#line 2518 "glslang/MachineIndependent/glslang.y"
+#line 2519 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, EsdCube);
}
-#line 8271 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8373 "MachineIndependent/glslang_tab.cpp"
break;
case 352: /* type_specifier_nonarray: F16SAMPLER1DSHADOW */
-#line 2524 "glslang/MachineIndependent/glslang.y"
+#line 2525 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd1D, false, true);
}
-#line 8282 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8384 "MachineIndependent/glslang_tab.cpp"
break;
case 353: /* type_specifier_nonarray: F16SAMPLER2DSHADOW */
-#line 2530 "glslang/MachineIndependent/glslang.y"
+#line 2531 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd2D, false, true);
}
-#line 8293 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8395 "MachineIndependent/glslang_tab.cpp"
break;
case 354: /* type_specifier_nonarray: F16SAMPLERCUBESHADOW */
-#line 2536 "glslang/MachineIndependent/glslang.y"
+#line 2537 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, EsdCube, false, true);
}
-#line 8304 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8406 "MachineIndependent/glslang_tab.cpp"
break;
case 355: /* type_specifier_nonarray: F16SAMPLER1DARRAY */
-#line 2542 "glslang/MachineIndependent/glslang.y"
+#line 2543 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd1D, true);
}
-#line 8315 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8417 "MachineIndependent/glslang_tab.cpp"
break;
case 356: /* type_specifier_nonarray: F16SAMPLER2DARRAY */
-#line 2548 "glslang/MachineIndependent/glslang.y"
+#line 2549 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd2D, true);
}
-#line 8326 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8428 "MachineIndependent/glslang_tab.cpp"
break;
case 357: /* type_specifier_nonarray: F16SAMPLER1DARRAYSHADOW */
-#line 2554 "glslang/MachineIndependent/glslang.y"
+#line 2555 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd1D, true, true);
}
-#line 8337 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8439 "MachineIndependent/glslang_tab.cpp"
break;
case 358: /* type_specifier_nonarray: F16SAMPLER2DARRAYSHADOW */
-#line 2560 "glslang/MachineIndependent/glslang.y"
+#line 2561 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd2D, true, true);
}
-#line 8348 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8450 "MachineIndependent/glslang_tab.cpp"
break;
case 359: /* type_specifier_nonarray: F16SAMPLERCUBEARRAY */
-#line 2566 "glslang/MachineIndependent/glslang.y"
+#line 2567 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, EsdCube, true);
}
-#line 8359 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8461 "MachineIndependent/glslang_tab.cpp"
break;
case 360: /* type_specifier_nonarray: F16SAMPLERCUBEARRAYSHADOW */
-#line 2572 "glslang/MachineIndependent/glslang.y"
+#line 2573 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, EsdCube, true, true);
}
-#line 8370 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8472 "MachineIndependent/glslang_tab.cpp"
break;
case 361: /* type_specifier_nonarray: ISAMPLER1D */
-#line 2578 "glslang/MachineIndependent/glslang.y"
+#line 2579 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd1D);
}
-#line 8380 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8482 "MachineIndependent/glslang_tab.cpp"
break;
case 362: /* type_specifier_nonarray: ISAMPLER2D */
-#line 2584 "glslang/MachineIndependent/glslang.y"
+#line 2585 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd2D);
}
-#line 8390 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8492 "MachineIndependent/glslang_tab.cpp"
break;
case 363: /* type_specifier_nonarray: ISAMPLER3D */
-#line 2589 "glslang/MachineIndependent/glslang.y"
+#line 2590 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd3D);
}
-#line 8400 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8502 "MachineIndependent/glslang_tab.cpp"
break;
case 364: /* type_specifier_nonarray: ISAMPLERCUBE */
-#line 2594 "glslang/MachineIndependent/glslang.y"
+#line 2595 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, EsdCube);
}
-#line 8410 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8512 "MachineIndependent/glslang_tab.cpp"
break;
case 365: /* type_specifier_nonarray: ISAMPLER2DARRAY */
-#line 2599 "glslang/MachineIndependent/glslang.y"
+#line 2600 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd2D, true);
}
-#line 8420 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8522 "MachineIndependent/glslang_tab.cpp"
break;
case 366: /* type_specifier_nonarray: USAMPLER2D */
-#line 2604 "glslang/MachineIndependent/glslang.y"
+#line 2605 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd2D);
}
-#line 8430 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8532 "MachineIndependent/glslang_tab.cpp"
break;
case 367: /* type_specifier_nonarray: USAMPLER3D */
-#line 2609 "glslang/MachineIndependent/glslang.y"
+#line 2610 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd3D);
}
-#line 8440 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8542 "MachineIndependent/glslang_tab.cpp"
break;
case 368: /* type_specifier_nonarray: USAMPLERCUBE */
-#line 2614 "glslang/MachineIndependent/glslang.y"
+#line 2615 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, EsdCube);
}
-#line 8450 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8552 "MachineIndependent/glslang_tab.cpp"
break;
case 369: /* type_specifier_nonarray: ISAMPLER1DARRAY */
-#line 2620 "glslang/MachineIndependent/glslang.y"
+#line 2621 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd1D, true);
}
-#line 8460 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8562 "MachineIndependent/glslang_tab.cpp"
break;
case 370: /* type_specifier_nonarray: ISAMPLERCUBEARRAY */
-#line 2625 "glslang/MachineIndependent/glslang.y"
+#line 2626 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, EsdCube, true);
}
-#line 8470 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8572 "MachineIndependent/glslang_tab.cpp"
break;
case 371: /* type_specifier_nonarray: USAMPLER1D */
-#line 2630 "glslang/MachineIndependent/glslang.y"
+#line 2631 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd1D);
}
-#line 8480 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8582 "MachineIndependent/glslang_tab.cpp"
break;
case 372: /* type_specifier_nonarray: USAMPLER1DARRAY */
-#line 2635 "glslang/MachineIndependent/glslang.y"
+#line 2636 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd1D, true);
}
-#line 8490 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8592 "MachineIndependent/glslang_tab.cpp"
break;
case 373: /* type_specifier_nonarray: USAMPLERCUBEARRAY */
-#line 2640 "glslang/MachineIndependent/glslang.y"
+#line 2641 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, EsdCube, true);
}
-#line 8500 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8602 "MachineIndependent/glslang_tab.cpp"
break;
case 374: /* type_specifier_nonarray: TEXTURECUBEARRAY */
-#line 2645 "glslang/MachineIndependent/glslang.y"
+#line 2646 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, EsdCube, true);
}
-#line 8510 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8612 "MachineIndependent/glslang_tab.cpp"
break;
case 375: /* type_specifier_nonarray: ITEXTURECUBEARRAY */
-#line 2650 "glslang/MachineIndependent/glslang.y"
+#line 2651 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, EsdCube, true);
}
-#line 8520 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8622 "MachineIndependent/glslang_tab.cpp"
break;
case 376: /* type_specifier_nonarray: UTEXTURECUBEARRAY */
-#line 2655 "glslang/MachineIndependent/glslang.y"
+#line 2656 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, EsdCube, true);
}
-#line 8530 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8632 "MachineIndependent/glslang_tab.cpp"
break;
case 377: /* type_specifier_nonarray: USAMPLER2DARRAY */
-#line 2661 "glslang/MachineIndependent/glslang.y"
+#line 2662 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd2D, true);
}
-#line 8540 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8642 "MachineIndependent/glslang_tab.cpp"
break;
case 378: /* type_specifier_nonarray: TEXTURE2D */
-#line 2666 "glslang/MachineIndependent/glslang.y"
+#line 2667 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D);
}
-#line 8550 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8652 "MachineIndependent/glslang_tab.cpp"
break;
case 379: /* type_specifier_nonarray: TEXTURE3D */
-#line 2671 "glslang/MachineIndependent/glslang.y"
+#line 2672 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd3D);
}
-#line 8560 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8662 "MachineIndependent/glslang_tab.cpp"
break;
case 380: /* type_specifier_nonarray: TEXTURE2DARRAY */
-#line 2676 "glslang/MachineIndependent/glslang.y"
+#line 2677 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D, true);
}
-#line 8570 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8672 "MachineIndependent/glslang_tab.cpp"
break;
case 381: /* type_specifier_nonarray: TEXTURECUBE */
-#line 2681 "glslang/MachineIndependent/glslang.y"
+#line 2682 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, EsdCube);
}
-#line 8580 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8682 "MachineIndependent/glslang_tab.cpp"
break;
case 382: /* type_specifier_nonarray: ITEXTURE2D */
-#line 2686 "glslang/MachineIndependent/glslang.y"
+#line 2687 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd2D);
}
-#line 8590 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8692 "MachineIndependent/glslang_tab.cpp"
break;
case 383: /* type_specifier_nonarray: ITEXTURE3D */
-#line 2691 "glslang/MachineIndependent/glslang.y"
+#line 2692 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd3D);
}
-#line 8600 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8702 "MachineIndependent/glslang_tab.cpp"
break;
case 384: /* type_specifier_nonarray: ITEXTURECUBE */
-#line 2696 "glslang/MachineIndependent/glslang.y"
+#line 2697 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, EsdCube);
}
-#line 8610 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8712 "MachineIndependent/glslang_tab.cpp"
break;
case 385: /* type_specifier_nonarray: ITEXTURE2DARRAY */
-#line 2701 "glslang/MachineIndependent/glslang.y"
+#line 2702 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd2D, true);
}
-#line 8620 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8722 "MachineIndependent/glslang_tab.cpp"
break;
case 386: /* type_specifier_nonarray: UTEXTURE2D */
-#line 2706 "glslang/MachineIndependent/glslang.y"
+#line 2707 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd2D);
}
-#line 8630 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8732 "MachineIndependent/glslang_tab.cpp"
break;
case 387: /* type_specifier_nonarray: UTEXTURE3D */
-#line 2711 "glslang/MachineIndependent/glslang.y"
+#line 2712 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd3D);
}
-#line 8640 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8742 "MachineIndependent/glslang_tab.cpp"
break;
case 388: /* type_specifier_nonarray: UTEXTURECUBE */
-#line 2716 "glslang/MachineIndependent/glslang.y"
+#line 2717 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, EsdCube);
}
-#line 8650 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8752 "MachineIndependent/glslang_tab.cpp"
break;
case 389: /* type_specifier_nonarray: UTEXTURE2DARRAY */
-#line 2721 "glslang/MachineIndependent/glslang.y"
+#line 2722 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd2D, true);
}
-#line 8660 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8762 "MachineIndependent/glslang_tab.cpp"
break;
case 390: /* type_specifier_nonarray: SAMPLER */
-#line 2726 "glslang/MachineIndependent/glslang.y"
+#line 2727 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setPureSampler(false);
}
-#line 8670 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8772 "MachineIndependent/glslang_tab.cpp"
break;
case 391: /* type_specifier_nonarray: SAMPLERSHADOW */
-#line 2731 "glslang/MachineIndependent/glslang.y"
+#line 2732 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setPureSampler(true);
}
-#line 8680 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8782 "MachineIndependent/glslang_tab.cpp"
break;
case 392: /* type_specifier_nonarray: SAMPLER2DRECT */
-#line 2737 "glslang/MachineIndependent/glslang.y"
+#line 2738 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdRect);
}
-#line 8690 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8792 "MachineIndependent/glslang_tab.cpp"
break;
case 393: /* type_specifier_nonarray: SAMPLER2DRECTSHADOW */
-#line 2742 "glslang/MachineIndependent/glslang.y"
+#line 2743 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdRect, false, true);
}
-#line 8700 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8802 "MachineIndependent/glslang_tab.cpp"
break;
case 394: /* type_specifier_nonarray: F16SAMPLER2DRECT */
-#line 2747 "glslang/MachineIndependent/glslang.y"
+#line 2748 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, EsdRect);
}
-#line 8711 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8813 "MachineIndependent/glslang_tab.cpp"
break;
case 395: /* type_specifier_nonarray: F16SAMPLER2DRECTSHADOW */
-#line 2753 "glslang/MachineIndependent/glslang.y"
+#line 2754 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, EsdRect, false, true);
}
-#line 8722 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8824 "MachineIndependent/glslang_tab.cpp"
break;
case 396: /* type_specifier_nonarray: ISAMPLER2DRECT */
-#line 2759 "glslang/MachineIndependent/glslang.y"
+#line 2760 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, EsdRect);
}
-#line 8732 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8834 "MachineIndependent/glslang_tab.cpp"
break;
case 397: /* type_specifier_nonarray: USAMPLER2DRECT */
-#line 2764 "glslang/MachineIndependent/glslang.y"
+#line 2765 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, EsdRect);
}
-#line 8742 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8844 "MachineIndependent/glslang_tab.cpp"
break;
case 398: /* type_specifier_nonarray: SAMPLERBUFFER */
-#line 2769 "glslang/MachineIndependent/glslang.y"
+#line 2770 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, EsdBuffer);
}
-#line 8752 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8854 "MachineIndependent/glslang_tab.cpp"
break;
case 399: /* type_specifier_nonarray: F16SAMPLERBUFFER */
-#line 2774 "glslang/MachineIndependent/glslang.y"
+#line 2775 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, EsdBuffer);
}
-#line 8763 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8865 "MachineIndependent/glslang_tab.cpp"
break;
case 400: /* type_specifier_nonarray: ISAMPLERBUFFER */
-#line 2780 "glslang/MachineIndependent/glslang.y"
+#line 2781 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, EsdBuffer);
}
-#line 8773 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8875 "MachineIndependent/glslang_tab.cpp"
break;
case 401: /* type_specifier_nonarray: USAMPLERBUFFER */
-#line 2785 "glslang/MachineIndependent/glslang.y"
+#line 2786 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, EsdBuffer);
}
-#line 8783 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8885 "MachineIndependent/glslang_tab.cpp"
break;
case 402: /* type_specifier_nonarray: SAMPLER2DMS */
-#line 2790 "glslang/MachineIndependent/glslang.y"
+#line 2791 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D, false, false, true);
}
-#line 8793 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8895 "MachineIndependent/glslang_tab.cpp"
break;
case 403: /* type_specifier_nonarray: F16SAMPLER2DMS */
-#line 2795 "glslang/MachineIndependent/glslang.y"
+#line 2796 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd2D, false, false, true);
}
-#line 8804 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8906 "MachineIndependent/glslang_tab.cpp"
break;
case 404: /* type_specifier_nonarray: ISAMPLER2DMS */
-#line 2801 "glslang/MachineIndependent/glslang.y"
+#line 2802 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd2D, false, false, true);
}
-#line 8814 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8916 "MachineIndependent/glslang_tab.cpp"
break;
case 405: /* type_specifier_nonarray: USAMPLER2DMS */
-#line 2806 "glslang/MachineIndependent/glslang.y"
+#line 2807 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd2D, false, false, true);
}
-#line 8824 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8926 "MachineIndependent/glslang_tab.cpp"
break;
case 406: /* type_specifier_nonarray: SAMPLER2DMSARRAY */
-#line 2811 "glslang/MachineIndependent/glslang.y"
+#line 2812 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D, true, false, true);
}
-#line 8834 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8936 "MachineIndependent/glslang_tab.cpp"
break;
case 407: /* type_specifier_nonarray: F16SAMPLER2DMSARRAY */
-#line 2816 "glslang/MachineIndependent/glslang.y"
+#line 2817 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float sampler", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat16, Esd2D, true, false, true);
}
-#line 8845 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8947 "MachineIndependent/glslang_tab.cpp"
break;
case 408: /* type_specifier_nonarray: ISAMPLER2DMSARRAY */
-#line 2822 "glslang/MachineIndependent/glslang.y"
+#line 2823 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtInt, Esd2D, true, false, true);
}
-#line 8855 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8957 "MachineIndependent/glslang_tab.cpp"
break;
case 409: /* type_specifier_nonarray: USAMPLER2DMSARRAY */
-#line 2827 "glslang/MachineIndependent/glslang.y"
+#line 2828 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtUint, Esd2D, true, false, true);
}
-#line 8865 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8967 "MachineIndependent/glslang_tab.cpp"
break;
case 410: /* type_specifier_nonarray: TEXTURE1D */
-#line 2832 "glslang/MachineIndependent/glslang.y"
+#line 2833 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd1D);
}
-#line 8875 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8977 "MachineIndependent/glslang_tab.cpp"
break;
case 411: /* type_specifier_nonarray: F16TEXTURE1D */
-#line 2837 "glslang/MachineIndependent/glslang.y"
+#line 2838 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, Esd1D);
}
-#line 8886 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8988 "MachineIndependent/glslang_tab.cpp"
break;
case 412: /* type_specifier_nonarray: F16TEXTURE2D */
-#line 2843 "glslang/MachineIndependent/glslang.y"
+#line 2844 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, Esd2D);
}
-#line 8897 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 8999 "MachineIndependent/glslang_tab.cpp"
break;
case 413: /* type_specifier_nonarray: F16TEXTURE3D */
-#line 2849 "glslang/MachineIndependent/glslang.y"
+#line 2850 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, Esd3D);
}
-#line 8908 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9010 "MachineIndependent/glslang_tab.cpp"
break;
case 414: /* type_specifier_nonarray: F16TEXTURECUBE */
-#line 2855 "glslang/MachineIndependent/glslang.y"
+#line 2856 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, EsdCube);
}
-#line 8919 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9021 "MachineIndependent/glslang_tab.cpp"
break;
case 415: /* type_specifier_nonarray: TEXTURE1DARRAY */
-#line 2861 "glslang/MachineIndependent/glslang.y"
+#line 2862 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd1D, true);
}
-#line 8929 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9031 "MachineIndependent/glslang_tab.cpp"
break;
case 416: /* type_specifier_nonarray: F16TEXTURE1DARRAY */
-#line 2866 "glslang/MachineIndependent/glslang.y"
+#line 2867 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, Esd1D, true);
}
-#line 8940 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9042 "MachineIndependent/glslang_tab.cpp"
break;
case 417: /* type_specifier_nonarray: F16TEXTURE2DARRAY */
-#line 2872 "glslang/MachineIndependent/glslang.y"
+#line 2873 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, Esd2D, true);
}
-#line 8951 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9053 "MachineIndependent/glslang_tab.cpp"
break;
case 418: /* type_specifier_nonarray: F16TEXTURECUBEARRAY */
-#line 2878 "glslang/MachineIndependent/glslang.y"
+#line 2879 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, EsdCube, true);
}
-#line 8962 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9064 "MachineIndependent/glslang_tab.cpp"
break;
case 419: /* type_specifier_nonarray: ITEXTURE1D */
-#line 2884 "glslang/MachineIndependent/glslang.y"
+#line 2885 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd1D);
}
-#line 8972 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9074 "MachineIndependent/glslang_tab.cpp"
break;
case 420: /* type_specifier_nonarray: ITEXTURE1DARRAY */
-#line 2889 "glslang/MachineIndependent/glslang.y"
+#line 2890 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd1D, true);
}
-#line 8982 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9084 "MachineIndependent/glslang_tab.cpp"
break;
case 421: /* type_specifier_nonarray: UTEXTURE1D */
-#line 2894 "glslang/MachineIndependent/glslang.y"
+#line 2895 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd1D);
}
-#line 8992 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9094 "MachineIndependent/glslang_tab.cpp"
break;
case 422: /* type_specifier_nonarray: UTEXTURE1DARRAY */
-#line 2899 "glslang/MachineIndependent/glslang.y"
+#line 2900 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd1D, true);
}
-#line 9002 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9104 "MachineIndependent/glslang_tab.cpp"
break;
case 423: /* type_specifier_nonarray: TEXTURE2DRECT */
-#line 2904 "glslang/MachineIndependent/glslang.y"
+#line 2905 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, EsdRect);
}
-#line 9012 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9114 "MachineIndependent/glslang_tab.cpp"
break;
case 424: /* type_specifier_nonarray: F16TEXTURE2DRECT */
-#line 2909 "glslang/MachineIndependent/glslang.y"
+#line 2910 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, EsdRect);
}
-#line 9023 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9125 "MachineIndependent/glslang_tab.cpp"
break;
case 425: /* type_specifier_nonarray: ITEXTURE2DRECT */
-#line 2915 "glslang/MachineIndependent/glslang.y"
+#line 2916 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, EsdRect);
}
-#line 9033 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9135 "MachineIndependent/glslang_tab.cpp"
break;
case 426: /* type_specifier_nonarray: UTEXTURE2DRECT */
-#line 2920 "glslang/MachineIndependent/glslang.y"
+#line 2921 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, EsdRect);
}
-#line 9043 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9145 "MachineIndependent/glslang_tab.cpp"
break;
case 427: /* type_specifier_nonarray: TEXTUREBUFFER */
-#line 2925 "glslang/MachineIndependent/glslang.y"
+#line 2926 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, EsdBuffer);
}
-#line 9053 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9155 "MachineIndependent/glslang_tab.cpp"
break;
case 428: /* type_specifier_nonarray: F16TEXTUREBUFFER */
-#line 2930 "glslang/MachineIndependent/glslang.y"
+#line 2931 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, EsdBuffer);
}
-#line 9064 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9166 "MachineIndependent/glslang_tab.cpp"
break;
case 429: /* type_specifier_nonarray: ITEXTUREBUFFER */
-#line 2936 "glslang/MachineIndependent/glslang.y"
+#line 2937 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, EsdBuffer);
}
-#line 9074 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9176 "MachineIndependent/glslang_tab.cpp"
break;
case 430: /* type_specifier_nonarray: UTEXTUREBUFFER */
-#line 2941 "glslang/MachineIndependent/glslang.y"
+#line 2942 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, EsdBuffer);
}
-#line 9084 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9186 "MachineIndependent/glslang_tab.cpp"
break;
case 431: /* type_specifier_nonarray: TEXTURE2DMS */
-#line 2946 "glslang/MachineIndependent/glslang.y"
+#line 2947 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D, false, false, true);
}
-#line 9094 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9196 "MachineIndependent/glslang_tab.cpp"
break;
case 432: /* type_specifier_nonarray: F16TEXTURE2DMS */
-#line 2951 "glslang/MachineIndependent/glslang.y"
+#line 2952 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, Esd2D, false, false, true);
}
-#line 9105 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9207 "MachineIndependent/glslang_tab.cpp"
break;
case 433: /* type_specifier_nonarray: ITEXTURE2DMS */
-#line 2957 "glslang/MachineIndependent/glslang.y"
+#line 2958 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd2D, false, false, true);
}
-#line 9115 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9217 "MachineIndependent/glslang_tab.cpp"
break;
case 434: /* type_specifier_nonarray: UTEXTURE2DMS */
-#line 2962 "glslang/MachineIndependent/glslang.y"
+#line 2963 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd2D, false, false, true);
}
-#line 9125 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9227 "MachineIndependent/glslang_tab.cpp"
break;
case 435: /* type_specifier_nonarray: TEXTURE2DMSARRAY */
-#line 2967 "glslang/MachineIndependent/glslang.y"
+#line 2968 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat, Esd2D, true, false, true);
}
-#line 9135 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9237 "MachineIndependent/glslang_tab.cpp"
break;
case 436: /* type_specifier_nonarray: F16TEXTURE2DMSARRAY */
-#line 2972 "glslang/MachineIndependent/glslang.y"
+#line 2973 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float texture", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtFloat16, Esd2D, true, false, true);
}
-#line 9146 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9248 "MachineIndependent/glslang_tab.cpp"
break;
case 437: /* type_specifier_nonarray: ITEXTURE2DMSARRAY */
-#line 2978 "glslang/MachineIndependent/glslang.y"
+#line 2979 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtInt, Esd2D, true, false, true);
}
-#line 9156 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9258 "MachineIndependent/glslang_tab.cpp"
break;
case 438: /* type_specifier_nonarray: UTEXTURE2DMSARRAY */
-#line 2983 "glslang/MachineIndependent/glslang.y"
+#line 2984 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setTexture(EbtUint, Esd2D, true, false, true);
}
-#line 9166 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9268 "MachineIndependent/glslang_tab.cpp"
break;
case 439: /* type_specifier_nonarray: IMAGE1D */
-#line 2988 "glslang/MachineIndependent/glslang.y"
+#line 2989 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd1D);
}
-#line 9176 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9278 "MachineIndependent/glslang_tab.cpp"
break;
case 440: /* type_specifier_nonarray: F16IMAGE1D */
-#line 2993 "glslang/MachineIndependent/glslang.y"
+#line 2994 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, Esd1D);
}
-#line 9187 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9289 "MachineIndependent/glslang_tab.cpp"
break;
case 441: /* type_specifier_nonarray: IIMAGE1D */
-#line 2999 "glslang/MachineIndependent/glslang.y"
+#line 3000 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd1D);
}
-#line 9197 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9299 "MachineIndependent/glslang_tab.cpp"
break;
case 442: /* type_specifier_nonarray: UIMAGE1D */
-#line 3004 "glslang/MachineIndependent/glslang.y"
+#line 3005 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd1D);
}
-#line 9207 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9309 "MachineIndependent/glslang_tab.cpp"
break;
case 443: /* type_specifier_nonarray: IMAGE2D */
-#line 3009 "glslang/MachineIndependent/glslang.y"
+#line 3010 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd2D);
}
-#line 9217 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9319 "MachineIndependent/glslang_tab.cpp"
break;
case 444: /* type_specifier_nonarray: F16IMAGE2D */
-#line 3014 "glslang/MachineIndependent/glslang.y"
+#line 3015 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, Esd2D);
}
-#line 9228 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9330 "MachineIndependent/glslang_tab.cpp"
break;
case 445: /* type_specifier_nonarray: IIMAGE2D */
-#line 3020 "glslang/MachineIndependent/glslang.y"
+#line 3021 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd2D);
}
-#line 9238 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9340 "MachineIndependent/glslang_tab.cpp"
break;
case 446: /* type_specifier_nonarray: UIMAGE2D */
-#line 3025 "glslang/MachineIndependent/glslang.y"
+#line 3026 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd2D);
}
-#line 9248 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9350 "MachineIndependent/glslang_tab.cpp"
break;
case 447: /* type_specifier_nonarray: IMAGE3D */
-#line 3030 "glslang/MachineIndependent/glslang.y"
+#line 3031 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd3D);
}
-#line 9258 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9360 "MachineIndependent/glslang_tab.cpp"
break;
case 448: /* type_specifier_nonarray: F16IMAGE3D */
-#line 3035 "glslang/MachineIndependent/glslang.y"
+#line 3036 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, Esd3D);
}
-#line 9269 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9371 "MachineIndependent/glslang_tab.cpp"
break;
case 449: /* type_specifier_nonarray: IIMAGE3D */
-#line 3041 "glslang/MachineIndependent/glslang.y"
+#line 3042 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd3D);
}
-#line 9279 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9381 "MachineIndependent/glslang_tab.cpp"
break;
case 450: /* type_specifier_nonarray: UIMAGE3D */
-#line 3046 "glslang/MachineIndependent/glslang.y"
+#line 3047 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd3D);
}
-#line 9289 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9391 "MachineIndependent/glslang_tab.cpp"
break;
case 451: /* type_specifier_nonarray: IMAGE2DRECT */
-#line 3051 "glslang/MachineIndependent/glslang.y"
+#line 3052 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, EsdRect);
}
-#line 9299 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9401 "MachineIndependent/glslang_tab.cpp"
break;
case 452: /* type_specifier_nonarray: F16IMAGE2DRECT */
-#line 3056 "glslang/MachineIndependent/glslang.y"
+#line 3057 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, EsdRect);
}
-#line 9310 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9412 "MachineIndependent/glslang_tab.cpp"
break;
case 453: /* type_specifier_nonarray: IIMAGE2DRECT */
-#line 3062 "glslang/MachineIndependent/glslang.y"
+#line 3063 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, EsdRect);
}
-#line 9320 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9422 "MachineIndependent/glslang_tab.cpp"
break;
case 454: /* type_specifier_nonarray: UIMAGE2DRECT */
-#line 3067 "glslang/MachineIndependent/glslang.y"
+#line 3068 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, EsdRect);
}
-#line 9330 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9432 "MachineIndependent/glslang_tab.cpp"
break;
case 455: /* type_specifier_nonarray: IMAGECUBE */
-#line 3072 "glslang/MachineIndependent/glslang.y"
+#line 3073 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, EsdCube);
}
-#line 9340 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9442 "MachineIndependent/glslang_tab.cpp"
break;
case 456: /* type_specifier_nonarray: F16IMAGECUBE */
-#line 3077 "glslang/MachineIndependent/glslang.y"
+#line 3078 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, EsdCube);
}
-#line 9351 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9453 "MachineIndependent/glslang_tab.cpp"
break;
case 457: /* type_specifier_nonarray: IIMAGECUBE */
-#line 3083 "glslang/MachineIndependent/glslang.y"
+#line 3084 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, EsdCube);
}
-#line 9361 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9463 "MachineIndependent/glslang_tab.cpp"
break;
case 458: /* type_specifier_nonarray: UIMAGECUBE */
-#line 3088 "glslang/MachineIndependent/glslang.y"
+#line 3089 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, EsdCube);
}
-#line 9371 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9473 "MachineIndependent/glslang_tab.cpp"
break;
case 459: /* type_specifier_nonarray: IMAGEBUFFER */
-#line 3093 "glslang/MachineIndependent/glslang.y"
+#line 3094 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, EsdBuffer);
}
-#line 9381 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9483 "MachineIndependent/glslang_tab.cpp"
break;
case 460: /* type_specifier_nonarray: F16IMAGEBUFFER */
-#line 3098 "glslang/MachineIndependent/glslang.y"
+#line 3099 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, EsdBuffer);
}
-#line 9392 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9494 "MachineIndependent/glslang_tab.cpp"
break;
case 461: /* type_specifier_nonarray: IIMAGEBUFFER */
-#line 3104 "glslang/MachineIndependent/glslang.y"
+#line 3105 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, EsdBuffer);
}
-#line 9402 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9504 "MachineIndependent/glslang_tab.cpp"
break;
case 462: /* type_specifier_nonarray: UIMAGEBUFFER */
-#line 3109 "glslang/MachineIndependent/glslang.y"
+#line 3110 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, EsdBuffer);
}
-#line 9412 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9514 "MachineIndependent/glslang_tab.cpp"
break;
case 463: /* type_specifier_nonarray: IMAGE1DARRAY */
-#line 3114 "glslang/MachineIndependent/glslang.y"
+#line 3115 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd1D, true);
}
-#line 9422 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9524 "MachineIndependent/glslang_tab.cpp"
break;
case 464: /* type_specifier_nonarray: F16IMAGE1DARRAY */
-#line 3119 "glslang/MachineIndependent/glslang.y"
+#line 3120 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, Esd1D, true);
}
-#line 9433 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9535 "MachineIndependent/glslang_tab.cpp"
break;
case 465: /* type_specifier_nonarray: IIMAGE1DARRAY */
-#line 3125 "glslang/MachineIndependent/glslang.y"
+#line 3126 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd1D, true);
}
-#line 9443 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9545 "MachineIndependent/glslang_tab.cpp"
break;
case 466: /* type_specifier_nonarray: UIMAGE1DARRAY */
-#line 3130 "glslang/MachineIndependent/glslang.y"
+#line 3131 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd1D, true);
}
-#line 9453 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9555 "MachineIndependent/glslang_tab.cpp"
break;
case 467: /* type_specifier_nonarray: IMAGE2DARRAY */
-#line 3135 "glslang/MachineIndependent/glslang.y"
+#line 3136 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd2D, true);
}
-#line 9463 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9565 "MachineIndependent/glslang_tab.cpp"
break;
case 468: /* type_specifier_nonarray: F16IMAGE2DARRAY */
-#line 3140 "glslang/MachineIndependent/glslang.y"
+#line 3141 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, Esd2D, true);
}
-#line 9474 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9576 "MachineIndependent/glslang_tab.cpp"
break;
case 469: /* type_specifier_nonarray: IIMAGE2DARRAY */
-#line 3146 "glslang/MachineIndependent/glslang.y"
+#line 3147 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd2D, true);
}
-#line 9484 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9586 "MachineIndependent/glslang_tab.cpp"
break;
case 470: /* type_specifier_nonarray: UIMAGE2DARRAY */
-#line 3151 "glslang/MachineIndependent/glslang.y"
+#line 3152 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd2D, true);
}
-#line 9494 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9596 "MachineIndependent/glslang_tab.cpp"
break;
case 471: /* type_specifier_nonarray: IMAGECUBEARRAY */
-#line 3156 "glslang/MachineIndependent/glslang.y"
+#line 3157 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, EsdCube, true);
}
-#line 9504 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9606 "MachineIndependent/glslang_tab.cpp"
break;
case 472: /* type_specifier_nonarray: F16IMAGECUBEARRAY */
-#line 3161 "glslang/MachineIndependent/glslang.y"
+#line 3162 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, EsdCube, true);
}
-#line 9515 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9617 "MachineIndependent/glslang_tab.cpp"
break;
case 473: /* type_specifier_nonarray: IIMAGECUBEARRAY */
-#line 3167 "glslang/MachineIndependent/glslang.y"
+#line 3168 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, EsdCube, true);
}
-#line 9525 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9627 "MachineIndependent/glslang_tab.cpp"
break;
case 474: /* type_specifier_nonarray: UIMAGECUBEARRAY */
-#line 3172 "glslang/MachineIndependent/glslang.y"
+#line 3173 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, EsdCube, true);
}
-#line 9535 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9637 "MachineIndependent/glslang_tab.cpp"
break;
case 475: /* type_specifier_nonarray: IMAGE2DMS */
-#line 3177 "glslang/MachineIndependent/glslang.y"
+#line 3178 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd2D, false, false, true);
}
-#line 9545 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9647 "MachineIndependent/glslang_tab.cpp"
break;
case 476: /* type_specifier_nonarray: F16IMAGE2DMS */
-#line 3182 "glslang/MachineIndependent/glslang.y"
+#line 3183 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, Esd2D, false, false, true);
}
-#line 9556 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9658 "MachineIndependent/glslang_tab.cpp"
break;
case 477: /* type_specifier_nonarray: IIMAGE2DMS */
-#line 3188 "glslang/MachineIndependent/glslang.y"
+#line 3189 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd2D, false, false, true);
}
-#line 9566 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9668 "MachineIndependent/glslang_tab.cpp"
break;
case 478: /* type_specifier_nonarray: UIMAGE2DMS */
-#line 3193 "glslang/MachineIndependent/glslang.y"
+#line 3194 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd2D, false, false, true);
}
-#line 9576 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9678 "MachineIndependent/glslang_tab.cpp"
break;
case 479: /* type_specifier_nonarray: IMAGE2DMSARRAY */
-#line 3198 "glslang/MachineIndependent/glslang.y"
+#line 3199 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat, Esd2D, true, false, true);
}
-#line 9586 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9688 "MachineIndependent/glslang_tab.cpp"
break;
case 480: /* type_specifier_nonarray: F16IMAGE2DMSARRAY */
-#line 3203 "glslang/MachineIndependent/glslang.y"
+#line 3204 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float image", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtFloat16, Esd2D, true, false, true);
}
-#line 9597 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9699 "MachineIndependent/glslang_tab.cpp"
break;
case 481: /* type_specifier_nonarray: IIMAGE2DMSARRAY */
-#line 3209 "glslang/MachineIndependent/glslang.y"
+#line 3210 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt, Esd2D, true, false, true);
}
-#line 9607 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9709 "MachineIndependent/glslang_tab.cpp"
break;
case 482: /* type_specifier_nonarray: UIMAGE2DMSARRAY */
-#line 3214 "glslang/MachineIndependent/glslang.y"
+#line 3215 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint, Esd2D, true, false, true);
}
-#line 9617 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9719 "MachineIndependent/glslang_tab.cpp"
break;
case 483: /* type_specifier_nonarray: I64IMAGE1D */
-#line 3219 "glslang/MachineIndependent/glslang.y"
+#line 3220 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, Esd1D);
}
-#line 9627 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9729 "MachineIndependent/glslang_tab.cpp"
break;
case 484: /* type_specifier_nonarray: U64IMAGE1D */
-#line 3224 "glslang/MachineIndependent/glslang.y"
+#line 3225 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, Esd1D);
}
-#line 9637 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9739 "MachineIndependent/glslang_tab.cpp"
break;
case 485: /* type_specifier_nonarray: I64IMAGE2D */
-#line 3229 "glslang/MachineIndependent/glslang.y"
+#line 3230 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, Esd2D);
}
-#line 9647 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9749 "MachineIndependent/glslang_tab.cpp"
break;
case 486: /* type_specifier_nonarray: U64IMAGE2D */
-#line 3234 "glslang/MachineIndependent/glslang.y"
+#line 3235 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, Esd2D);
}
-#line 9657 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9759 "MachineIndependent/glslang_tab.cpp"
break;
case 487: /* type_specifier_nonarray: I64IMAGE3D */
-#line 3239 "glslang/MachineIndependent/glslang.y"
+#line 3240 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, Esd3D);
}
-#line 9667 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9769 "MachineIndependent/glslang_tab.cpp"
break;
case 488: /* type_specifier_nonarray: U64IMAGE3D */
-#line 3244 "glslang/MachineIndependent/glslang.y"
+#line 3245 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, Esd3D);
}
-#line 9677 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9779 "MachineIndependent/glslang_tab.cpp"
break;
case 489: /* type_specifier_nonarray: I64IMAGE2DRECT */
-#line 3249 "glslang/MachineIndependent/glslang.y"
+#line 3250 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, EsdRect);
}
-#line 9687 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9789 "MachineIndependent/glslang_tab.cpp"
break;
case 490: /* type_specifier_nonarray: U64IMAGE2DRECT */
-#line 3254 "glslang/MachineIndependent/glslang.y"
+#line 3255 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, EsdRect);
}
-#line 9697 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9799 "MachineIndependent/glslang_tab.cpp"
break;
case 491: /* type_specifier_nonarray: I64IMAGECUBE */
-#line 3259 "glslang/MachineIndependent/glslang.y"
+#line 3260 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, EsdCube);
}
-#line 9707 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9809 "MachineIndependent/glslang_tab.cpp"
break;
case 492: /* type_specifier_nonarray: U64IMAGECUBE */
-#line 3264 "glslang/MachineIndependent/glslang.y"
+#line 3265 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, EsdCube);
}
-#line 9717 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9819 "MachineIndependent/glslang_tab.cpp"
break;
case 493: /* type_specifier_nonarray: I64IMAGEBUFFER */
-#line 3269 "glslang/MachineIndependent/glslang.y"
+#line 3270 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, EsdBuffer);
}
-#line 9727 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9829 "MachineIndependent/glslang_tab.cpp"
break;
case 494: /* type_specifier_nonarray: U64IMAGEBUFFER */
-#line 3274 "glslang/MachineIndependent/glslang.y"
+#line 3275 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, EsdBuffer);
}
-#line 9737 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9839 "MachineIndependent/glslang_tab.cpp"
break;
case 495: /* type_specifier_nonarray: I64IMAGE1DARRAY */
-#line 3279 "glslang/MachineIndependent/glslang.y"
+#line 3280 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, Esd1D, true);
}
-#line 9747 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9849 "MachineIndependent/glslang_tab.cpp"
break;
case 496: /* type_specifier_nonarray: U64IMAGE1DARRAY */
-#line 3284 "glslang/MachineIndependent/glslang.y"
+#line 3285 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, Esd1D, true);
}
-#line 9757 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9859 "MachineIndependent/glslang_tab.cpp"
break;
case 497: /* type_specifier_nonarray: I64IMAGE2DARRAY */
-#line 3289 "glslang/MachineIndependent/glslang.y"
+#line 3290 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, Esd2D, true);
}
-#line 9767 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9869 "MachineIndependent/glslang_tab.cpp"
break;
case 498: /* type_specifier_nonarray: U64IMAGE2DARRAY */
-#line 3294 "glslang/MachineIndependent/glslang.y"
+#line 3295 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, Esd2D, true);
}
-#line 9777 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9879 "MachineIndependent/glslang_tab.cpp"
break;
case 499: /* type_specifier_nonarray: I64IMAGECUBEARRAY */
-#line 3299 "glslang/MachineIndependent/glslang.y"
+#line 3300 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, EsdCube, true);
}
-#line 9787 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9889 "MachineIndependent/glslang_tab.cpp"
break;
case 500: /* type_specifier_nonarray: U64IMAGECUBEARRAY */
-#line 3304 "glslang/MachineIndependent/glslang.y"
+#line 3305 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, EsdCube, true);
}
-#line 9797 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9899 "MachineIndependent/glslang_tab.cpp"
break;
case 501: /* type_specifier_nonarray: I64IMAGE2DMS */
-#line 3309 "glslang/MachineIndependent/glslang.y"
+#line 3310 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, Esd2D, false, false, true);
}
-#line 9807 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9909 "MachineIndependent/glslang_tab.cpp"
break;
case 502: /* type_specifier_nonarray: U64IMAGE2DMS */
-#line 3314 "glslang/MachineIndependent/glslang.y"
+#line 3315 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, Esd2D, false, false, true);
}
-#line 9817 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9919 "MachineIndependent/glslang_tab.cpp"
break;
case 503: /* type_specifier_nonarray: I64IMAGE2DMSARRAY */
-#line 3319 "glslang/MachineIndependent/glslang.y"
+#line 3320 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtInt64, Esd2D, true, false, true);
}
-#line 9827 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9929 "MachineIndependent/glslang_tab.cpp"
break;
case 504: /* type_specifier_nonarray: U64IMAGE2DMSARRAY */
-#line 3324 "glslang/MachineIndependent/glslang.y"
+#line 3325 "MachineIndependent/glslang.y"
{
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setImage(EbtUint64, Esd2D, true, false, true);
}
-#line 9837 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9939 "MachineIndependent/glslang_tab.cpp"
break;
case 505: /* type_specifier_nonarray: SAMPLEREXTERNALOES */
-#line 3329 "glslang/MachineIndependent/glslang.y"
+#line 3330 "MachineIndependent/glslang.y"
{ // GL_OES_EGL_image_external
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D);
(yyval.interm.type).sampler.external = true;
}
-#line 9848 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9950 "MachineIndependent/glslang_tab.cpp"
break;
case 506: /* type_specifier_nonarray: SAMPLEREXTERNAL2DY2YEXT */
-#line 3335 "glslang/MachineIndependent/glslang.y"
+#line 3336 "MachineIndependent/glslang.y"
{ // GL_EXT_YUV_target
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.set(EbtFloat, Esd2D);
(yyval.interm.type).sampler.yuv = true;
}
-#line 9859 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9961 "MachineIndependent/glslang_tab.cpp"
break;
case 507: /* type_specifier_nonarray: SUBPASSINPUT */
-#line 3341 "glslang/MachineIndependent/glslang.y"
+#line 3342 "MachineIndependent/glslang.y"
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtFloat);
}
-#line 9870 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9972 "MachineIndependent/glslang_tab.cpp"
break;
case 508: /* type_specifier_nonarray: SUBPASSINPUTMS */
-#line 3347 "glslang/MachineIndependent/glslang.y"
+#line 3348 "MachineIndependent/glslang.y"
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtFloat, true);
}
-#line 9881 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9983 "MachineIndependent/glslang_tab.cpp"
break;
case 509: /* type_specifier_nonarray: F16SUBPASSINPUT */
-#line 3353 "glslang/MachineIndependent/glslang.y"
+#line 3354 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float subpass input", parseContext.symbolTable.atBuiltInLevel());
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
@@ -9889,11 +9991,11 @@
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtFloat16);
}
-#line 9893 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 9995 "MachineIndependent/glslang_tab.cpp"
break;
case 510: /* type_specifier_nonarray: F16SUBPASSINPUTMS */
-#line 3360 "glslang/MachineIndependent/glslang.y"
+#line 3361 "MachineIndependent/glslang.y"
{
parseContext.float16OpaqueCheck((yyvsp[0].lex).loc, "half float subpass input", parseContext.symbolTable.atBuiltInLevel());
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
@@ -9901,98 +10003,98 @@
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtFloat16, true);
}
-#line 9905 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10007 "MachineIndependent/glslang_tab.cpp"
break;
case 511: /* type_specifier_nonarray: ISUBPASSINPUT */
-#line 3367 "glslang/MachineIndependent/glslang.y"
+#line 3368 "MachineIndependent/glslang.y"
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtInt);
}
-#line 9916 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10018 "MachineIndependent/glslang_tab.cpp"
break;
case 512: /* type_specifier_nonarray: ISUBPASSINPUTMS */
-#line 3373 "glslang/MachineIndependent/glslang.y"
+#line 3374 "MachineIndependent/glslang.y"
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtInt, true);
}
-#line 9927 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10029 "MachineIndependent/glslang_tab.cpp"
break;
case 513: /* type_specifier_nonarray: USUBPASSINPUT */
-#line 3379 "glslang/MachineIndependent/glslang.y"
+#line 3380 "MachineIndependent/glslang.y"
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtUint);
}
-#line 9938 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10040 "MachineIndependent/glslang_tab.cpp"
break;
case 514: /* type_specifier_nonarray: USUBPASSINPUTMS */
-#line 3385 "glslang/MachineIndependent/glslang.y"
+#line 3386 "MachineIndependent/glslang.y"
{
parseContext.requireStage((yyvsp[0].lex).loc, EShLangFragment, "subpass input");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtSampler;
(yyval.interm.type).sampler.setSubpass(EbtUint, true);
}
-#line 9949 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10051 "MachineIndependent/glslang_tab.cpp"
break;
case 515: /* type_specifier_nonarray: FCOOPMATNV */
-#line 3391 "glslang/MachineIndependent/glslang.y"
+#line 3392 "MachineIndependent/glslang.y"
{
parseContext.fcoopmatCheck((yyvsp[0].lex).loc, "fcoopmatNV", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).coopmat = true;
}
-#line 9960 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10062 "MachineIndependent/glslang_tab.cpp"
break;
case 516: /* type_specifier_nonarray: ICOOPMATNV */
-#line 3397 "glslang/MachineIndependent/glslang.y"
+#line 3398 "MachineIndependent/glslang.y"
{
parseContext.intcoopmatCheck((yyvsp[0].lex).loc, "icoopmatNV", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt;
(yyval.interm.type).coopmat = true;
}
-#line 9971 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10073 "MachineIndependent/glslang_tab.cpp"
break;
case 517: /* type_specifier_nonarray: UCOOPMATNV */
-#line 3403 "glslang/MachineIndependent/glslang.y"
+#line 3404 "MachineIndependent/glslang.y"
{
parseContext.intcoopmatCheck((yyvsp[0].lex).loc, "ucoopmatNV", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtUint;
(yyval.interm.type).coopmat = true;
}
-#line 9982 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10084 "MachineIndependent/glslang_tab.cpp"
break;
case 518: /* type_specifier_nonarray: struct_specifier */
-#line 3410 "glslang/MachineIndependent/glslang.y"
+#line 3411 "MachineIndependent/glslang.y"
{
(yyval.interm.type) = (yyvsp[0].interm.type);
(yyval.interm.type).qualifier.storage = parseContext.symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
parseContext.structTypeCheck((yyval.interm.type).loc, (yyval.interm.type));
}
-#line 9992 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10094 "MachineIndependent/glslang_tab.cpp"
break;
case 519: /* type_specifier_nonarray: TYPE_NAME */
-#line 3415 "glslang/MachineIndependent/glslang.y"
+#line 3416 "MachineIndependent/glslang.y"
{
//
// This is for user defined type names. The lexical phase looked up the
@@ -10006,47 +10108,47 @@
} else
parseContext.error((yyvsp[0].lex).loc, "expected type name", (yyvsp[0].lex).string->c_str(), "");
}
-#line 10010 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10112 "MachineIndependent/glslang_tab.cpp"
break;
case 520: /* precision_qualifier: HIGH_PRECISION */
-#line 3431 "glslang/MachineIndependent/glslang.y"
+#line 3432 "MachineIndependent/glslang.y"
{
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "highp precision qualifier");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqHigh);
}
-#line 10020 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10122 "MachineIndependent/glslang_tab.cpp"
break;
case 521: /* precision_qualifier: MEDIUM_PRECISION */
-#line 3436 "glslang/MachineIndependent/glslang.y"
+#line 3437 "MachineIndependent/glslang.y"
{
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "mediump precision qualifier");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqMedium);
}
-#line 10030 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10132 "MachineIndependent/glslang_tab.cpp"
break;
case 522: /* precision_qualifier: LOW_PRECISION */
-#line 3441 "glslang/MachineIndependent/glslang.y"
+#line 3442 "MachineIndependent/glslang.y"
{
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "lowp precision qualifier");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqLow);
}
-#line 10040 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10142 "MachineIndependent/glslang_tab.cpp"
break;
case 523: /* $@3: %empty */
-#line 3449 "glslang/MachineIndependent/glslang.y"
+#line 3450 "MachineIndependent/glslang.y"
{ parseContext.nestedStructCheck((yyvsp[-2].lex).loc); }
-#line 10046 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10148 "MachineIndependent/glslang_tab.cpp"
break;
case 524: /* struct_specifier: STRUCT IDENTIFIER LEFT_BRACE $@3 struct_declaration_list RIGHT_BRACE */
-#line 3449 "glslang/MachineIndependent/glslang.y"
+#line 3450 "MachineIndependent/glslang.y"
{
TType* structure = new TType((yyvsp[-1].interm.typeList), *(yyvsp[-4].lex).string);
parseContext.structArrayCheck((yyvsp[-4].lex).loc, *structure);
@@ -10058,17 +10160,17 @@
(yyval.interm.type).userDef = structure;
--parseContext.structNestingLevel;
}
-#line 10062 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10164 "MachineIndependent/glslang_tab.cpp"
break;
case 525: /* $@4: %empty */
-#line 3460 "glslang/MachineIndependent/glslang.y"
+#line 3461 "MachineIndependent/glslang.y"
{ parseContext.nestedStructCheck((yyvsp[-1].lex).loc); }
-#line 10068 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10170 "MachineIndependent/glslang_tab.cpp"
break;
case 526: /* struct_specifier: STRUCT LEFT_BRACE $@4 struct_declaration_list RIGHT_BRACE */
-#line 3460 "glslang/MachineIndependent/glslang.y"
+#line 3461 "MachineIndependent/glslang.y"
{
TType* structure = new TType((yyvsp[-1].interm.typeList), TString(""));
(yyval.interm.type).init((yyvsp[-4].lex).loc);
@@ -10076,19 +10178,19 @@
(yyval.interm.type).userDef = structure;
--parseContext.structNestingLevel;
}
-#line 10080 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10182 "MachineIndependent/glslang_tab.cpp"
break;
case 527: /* struct_declaration_list: struct_declaration */
-#line 3470 "glslang/MachineIndependent/glslang.y"
+#line 3471 "MachineIndependent/glslang.y"
{
(yyval.interm.typeList) = (yyvsp[0].interm.typeList);
}
-#line 10088 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10190 "MachineIndependent/glslang_tab.cpp"
break;
case 528: /* struct_declaration_list: struct_declaration_list struct_declaration */
-#line 3473 "glslang/MachineIndependent/glslang.y"
+#line 3474 "MachineIndependent/glslang.y"
{
(yyval.interm.typeList) = (yyvsp[-1].interm.typeList);
for (unsigned int i = 0; i < (yyvsp[0].interm.typeList)->size(); ++i) {
@@ -10099,11 +10201,11 @@
(yyval.interm.typeList)->push_back((*(yyvsp[0].interm.typeList))[i]);
}
}
-#line 10103 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10205 "MachineIndependent/glslang_tab.cpp"
break;
case 529: /* struct_declaration: type_specifier struct_declarator_list SEMICOLON */
-#line 3486 "glslang/MachineIndependent/glslang.y"
+#line 3487 "MachineIndependent/glslang.y"
{
if ((yyvsp[-2].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -10126,11 +10228,11 @@
(*(yyval.interm.typeList))[i].type->shallowCopy(type);
}
}
-#line 10130 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10232 "MachineIndependent/glslang_tab.cpp"
break;
case 530: /* struct_declaration: type_qualifier type_specifier struct_declarator_list SEMICOLON */
-#line 3508 "glslang/MachineIndependent/glslang.y"
+#line 3509 "MachineIndependent/glslang.y"
{
if ((yyvsp[-2].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
@@ -10155,38 +10257,38 @@
(*(yyval.interm.typeList))[i].type->shallowCopy(type);
}
}
-#line 10159 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10261 "MachineIndependent/glslang_tab.cpp"
break;
case 531: /* struct_declarator_list: struct_declarator */
-#line 3535 "glslang/MachineIndependent/glslang.y"
+#line 3536 "MachineIndependent/glslang.y"
{
(yyval.interm.typeList) = new TTypeList;
(yyval.interm.typeList)->push_back((yyvsp[0].interm.typeLine));
}
-#line 10168 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10270 "MachineIndependent/glslang_tab.cpp"
break;
case 532: /* struct_declarator_list: struct_declarator_list COMMA struct_declarator */
-#line 3539 "glslang/MachineIndependent/glslang.y"
+#line 3540 "MachineIndependent/glslang.y"
{
(yyval.interm.typeList)->push_back((yyvsp[0].interm.typeLine));
}
-#line 10176 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10278 "MachineIndependent/glslang_tab.cpp"
break;
case 533: /* struct_declarator: IDENTIFIER */
-#line 3545 "glslang/MachineIndependent/glslang.y"
+#line 3546 "MachineIndependent/glslang.y"
{
(yyval.interm.typeLine).type = new TType(EbtVoid);
(yyval.interm.typeLine).loc = (yyvsp[0].lex).loc;
(yyval.interm.typeLine).type->setFieldName(*(yyvsp[0].lex).string);
}
-#line 10186 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10288 "MachineIndependent/glslang_tab.cpp"
break;
case 534: /* struct_declarator: IDENTIFIER array_specifier */
-#line 3550 "glslang/MachineIndependent/glslang.y"
+#line 3551 "MachineIndependent/glslang.y"
{
parseContext.arrayOfArrayVersionCheck((yyvsp[-1].lex).loc, (yyvsp[0].interm).arraySizes);
@@ -10195,235 +10297,246 @@
(yyval.interm.typeLine).type->setFieldName(*(yyvsp[-1].lex).string);
(yyval.interm.typeLine).type->transferArraySizes((yyvsp[0].interm).arraySizes);
}
-#line 10199 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10301 "MachineIndependent/glslang_tab.cpp"
break;
case 535: /* initializer: assignment_expression */
-#line 3561 "glslang/MachineIndependent/glslang.y"
+#line 3562 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 10207 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10309 "MachineIndependent/glslang_tab.cpp"
break;
case 536: /* initializer: LEFT_BRACE initializer_list RIGHT_BRACE */
-#line 3565 "glslang/MachineIndependent/glslang.y"
+#line 3566 "MachineIndependent/glslang.y"
{
const char* initFeature = "{ } style initializers";
parseContext.requireProfile((yyvsp[-2].lex).loc, ~EEsProfile, initFeature);
parseContext.profileRequires((yyvsp[-2].lex).loc, ~EEsProfile, 420, E_GL_ARB_shading_language_420pack, initFeature);
(yyval.interm.intermTypedNode) = (yyvsp[-1].interm.intermTypedNode);
}
-#line 10218 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10320 "MachineIndependent/glslang_tab.cpp"
break;
case 537: /* initializer: LEFT_BRACE initializer_list COMMA RIGHT_BRACE */
-#line 3571 "glslang/MachineIndependent/glslang.y"
+#line 3572 "MachineIndependent/glslang.y"
{
const char* initFeature = "{ } style initializers";
parseContext.requireProfile((yyvsp[-3].lex).loc, ~EEsProfile, initFeature);
parseContext.profileRequires((yyvsp[-3].lex).loc, ~EEsProfile, 420, E_GL_ARB_shading_language_420pack, initFeature);
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
}
-#line 10229 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10331 "MachineIndependent/glslang_tab.cpp"
break;
- case 538: /* initializer_list: initializer */
-#line 3582 "glslang/MachineIndependent/glslang.y"
+ case 538: /* initializer: LEFT_BRACE RIGHT_BRACE */
+#line 3578 "MachineIndependent/glslang.y"
+ {
+ const char* initFeature = "empty { } initializer";
+ parseContext.profileRequires((yyvsp[-1].lex).loc, EEsProfile, 0, E_GL_EXT_null_initializer, initFeature);
+ parseContext.profileRequires((yyvsp[-1].lex).loc, ~EEsProfile, 0, E_GL_EXT_null_initializer, initFeature);
+ (yyval.interm.intermTypedNode) = parseContext.intermediate.makeAggregate((yyvsp[-1].lex).loc);
+ }
+#line 10342 "MachineIndependent/glslang_tab.cpp"
+ break;
+
+ case 539: /* initializer_list: initializer */
+#line 3589 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.growAggregate(0, (yyvsp[0].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)->getLoc());
}
-#line 10237 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10350 "MachineIndependent/glslang_tab.cpp"
break;
- case 539: /* initializer_list: initializer_list COMMA initializer */
-#line 3585 "glslang/MachineIndependent/glslang.y"
+ case 540: /* initializer_list: initializer_list COMMA initializer */
+#line 3592 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = parseContext.intermediate.growAggregate((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
}
-#line 10245 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10358 "MachineIndependent/glslang_tab.cpp"
break;
- case 540: /* declaration_statement: declaration */
-#line 3592 "glslang/MachineIndependent/glslang.y"
+ case 541: /* declaration_statement: declaration */
+#line 3599 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10251 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10364 "MachineIndependent/glslang_tab.cpp"
break;
- case 541: /* statement: compound_statement */
-#line 3596 "glslang/MachineIndependent/glslang.y"
+ case 542: /* statement: compound_statement */
+#line 3603 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10257 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10370 "MachineIndependent/glslang_tab.cpp"
break;
- case 542: /* statement: simple_statement */
-#line 3597 "glslang/MachineIndependent/glslang.y"
+ case 543: /* statement: simple_statement */
+#line 3604 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10263 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10376 "MachineIndependent/glslang_tab.cpp"
break;
- case 543: /* simple_statement: declaration_statement */
-#line 3603 "glslang/MachineIndependent/glslang.y"
+ case 544: /* simple_statement: declaration_statement */
+#line 3610 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10269 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10382 "MachineIndependent/glslang_tab.cpp"
break;
- case 544: /* simple_statement: expression_statement */
-#line 3604 "glslang/MachineIndependent/glslang.y"
+ case 545: /* simple_statement: expression_statement */
+#line 3611 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10275 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10388 "MachineIndependent/glslang_tab.cpp"
break;
- case 545: /* simple_statement: selection_statement */
-#line 3605 "glslang/MachineIndependent/glslang.y"
+ case 546: /* simple_statement: selection_statement */
+#line 3612 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10281 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10394 "MachineIndependent/glslang_tab.cpp"
break;
- case 546: /* simple_statement: switch_statement */
-#line 3606 "glslang/MachineIndependent/glslang.y"
+ case 547: /* simple_statement: switch_statement */
+#line 3613 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10287 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10400 "MachineIndependent/glslang_tab.cpp"
break;
- case 547: /* simple_statement: case_label */
-#line 3607 "glslang/MachineIndependent/glslang.y"
+ case 548: /* simple_statement: case_label */
+#line 3614 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10293 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10406 "MachineIndependent/glslang_tab.cpp"
break;
- case 548: /* simple_statement: iteration_statement */
-#line 3608 "glslang/MachineIndependent/glslang.y"
+ case 549: /* simple_statement: iteration_statement */
+#line 3615 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10299 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10412 "MachineIndependent/glslang_tab.cpp"
break;
- case 549: /* simple_statement: jump_statement */
-#line 3609 "glslang/MachineIndependent/glslang.y"
+ case 550: /* simple_statement: jump_statement */
+#line 3616 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10305 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10418 "MachineIndependent/glslang_tab.cpp"
break;
- case 550: /* simple_statement: demote_statement */
-#line 3611 "glslang/MachineIndependent/glslang.y"
+ case 551: /* simple_statement: demote_statement */
+#line 3618 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10311 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10424 "MachineIndependent/glslang_tab.cpp"
break;
- case 551: /* demote_statement: DEMOTE SEMICOLON */
-#line 3617 "glslang/MachineIndependent/glslang.y"
+ case 552: /* demote_statement: DEMOTE SEMICOLON */
+#line 3624 "MachineIndependent/glslang.y"
{
parseContext.requireStage((yyvsp[-1].lex).loc, EShLangFragment, "demote");
parseContext.requireExtensions((yyvsp[-1].lex).loc, 1, &E_GL_EXT_demote_to_helper_invocation, "demote");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpDemote, (yyvsp[-1].lex).loc);
}
-#line 10321 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10434 "MachineIndependent/glslang_tab.cpp"
break;
- case 552: /* compound_statement: LEFT_BRACE RIGHT_BRACE */
-#line 3626 "glslang/MachineIndependent/glslang.y"
+ case 553: /* compound_statement: LEFT_BRACE RIGHT_BRACE */
+#line 3633 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = 0; }
-#line 10327 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10440 "MachineIndependent/glslang_tab.cpp"
break;
- case 553: /* $@5: %empty */
-#line 3627 "glslang/MachineIndependent/glslang.y"
+ case 554: /* $@5: %empty */
+#line 3634 "MachineIndependent/glslang.y"
{
parseContext.symbolTable.push();
++parseContext.statementNestingLevel;
}
-#line 10336 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10449 "MachineIndependent/glslang_tab.cpp"
break;
- case 554: /* $@6: %empty */
-#line 3631 "glslang/MachineIndependent/glslang.y"
+ case 555: /* $@6: %empty */
+#line 3638 "MachineIndependent/glslang.y"
{
parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
--parseContext.statementNestingLevel;
}
-#line 10345 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10458 "MachineIndependent/glslang_tab.cpp"
break;
- case 555: /* compound_statement: LEFT_BRACE $@5 statement_list $@6 RIGHT_BRACE */
-#line 3635 "glslang/MachineIndependent/glslang.y"
+ case 556: /* compound_statement: LEFT_BRACE $@5 statement_list $@6 RIGHT_BRACE */
+#line 3642 "MachineIndependent/glslang.y"
{
if ((yyvsp[-2].interm.intermNode) && (yyvsp[-2].interm.intermNode)->getAsAggregate())
(yyvsp[-2].interm.intermNode)->getAsAggregate()->setOperator(EOpSequence);
(yyval.interm.intermNode) = (yyvsp[-2].interm.intermNode);
}
-#line 10355 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10468 "MachineIndependent/glslang_tab.cpp"
break;
- case 556: /* statement_no_new_scope: compound_statement_no_new_scope */
-#line 3643 "glslang/MachineIndependent/glslang.y"
+ case 557: /* statement_no_new_scope: compound_statement_no_new_scope */
+#line 3650 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10361 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10474 "MachineIndependent/glslang_tab.cpp"
break;
- case 557: /* statement_no_new_scope: simple_statement */
-#line 3644 "glslang/MachineIndependent/glslang.y"
+ case 558: /* statement_no_new_scope: simple_statement */
+#line 3651 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = (yyvsp[0].interm.intermNode); }
-#line 10367 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10480 "MachineIndependent/glslang_tab.cpp"
break;
- case 558: /* $@7: %empty */
-#line 3648 "glslang/MachineIndependent/glslang.y"
+ case 559: /* $@7: %empty */
+#line 3655 "MachineIndependent/glslang.y"
{
++parseContext.controlFlowNestingLevel;
}
-#line 10375 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10488 "MachineIndependent/glslang_tab.cpp"
break;
- case 559: /* statement_scoped: $@7 compound_statement */
-#line 3651 "glslang/MachineIndependent/glslang.y"
+ case 560: /* statement_scoped: $@7 compound_statement */
+#line 3658 "MachineIndependent/glslang.y"
{
--parseContext.controlFlowNestingLevel;
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10384 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10497 "MachineIndependent/glslang_tab.cpp"
break;
- case 560: /* $@8: %empty */
-#line 3655 "glslang/MachineIndependent/glslang.y"
+ case 561: /* $@8: %empty */
+#line 3662 "MachineIndependent/glslang.y"
{
parseContext.symbolTable.push();
++parseContext.statementNestingLevel;
++parseContext.controlFlowNestingLevel;
}
-#line 10394 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10507 "MachineIndependent/glslang_tab.cpp"
break;
- case 561: /* statement_scoped: $@8 simple_statement */
-#line 3660 "glslang/MachineIndependent/glslang.y"
+ case 562: /* statement_scoped: $@8 simple_statement */
+#line 3667 "MachineIndependent/glslang.y"
{
parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
--parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel;
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10405 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10518 "MachineIndependent/glslang_tab.cpp"
break;
- case 562: /* compound_statement_no_new_scope: LEFT_BRACE RIGHT_BRACE */
-#line 3669 "glslang/MachineIndependent/glslang.y"
+ case 563: /* compound_statement_no_new_scope: LEFT_BRACE RIGHT_BRACE */
+#line 3676 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = 0;
}
-#line 10413 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10526 "MachineIndependent/glslang_tab.cpp"
break;
- case 563: /* compound_statement_no_new_scope: LEFT_BRACE statement_list RIGHT_BRACE */
-#line 3672 "glslang/MachineIndependent/glslang.y"
+ case 564: /* compound_statement_no_new_scope: LEFT_BRACE statement_list RIGHT_BRACE */
+#line 3679 "MachineIndependent/glslang.y"
{
if ((yyvsp[-1].interm.intermNode) && (yyvsp[-1].interm.intermNode)->getAsAggregate())
(yyvsp[-1].interm.intermNode)->getAsAggregate()->setOperator(EOpSequence);
(yyval.interm.intermNode) = (yyvsp[-1].interm.intermNode);
}
-#line 10423 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10536 "MachineIndependent/glslang_tab.cpp"
break;
- case 564: /* statement_list: statement */
-#line 3680 "glslang/MachineIndependent/glslang.y"
+ case 565: /* statement_list: statement */
+#line 3687 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[0].interm.intermNode));
if ((yyvsp[0].interm.intermNode) && (yyvsp[0].interm.intermNode)->getAsBranchNode() && ((yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpCase ||
@@ -10432,11 +10545,11 @@
(yyval.interm.intermNode) = 0; // start a fresh subsequence for what's after this case
}
}
-#line 10436 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10549 "MachineIndependent/glslang_tab.cpp"
break;
- case 565: /* statement_list: statement_list statement */
-#line 3688 "glslang/MachineIndependent/glslang.y"
+ case 566: /* statement_list: statement_list statement */
+#line 3695 "MachineIndependent/glslang.y"
{
if ((yyvsp[0].interm.intermNode) && (yyvsp[0].interm.intermNode)->getAsBranchNode() && ((yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpCase ||
(yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpDefault)) {
@@ -10445,76 +10558,76 @@
} else
(yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode));
}
-#line 10449 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10562 "MachineIndependent/glslang_tab.cpp"
break;
- case 566: /* expression_statement: SEMICOLON */
-#line 3699 "glslang/MachineIndependent/glslang.y"
+ case 567: /* expression_statement: SEMICOLON */
+#line 3706 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = 0; }
-#line 10455 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10568 "MachineIndependent/glslang_tab.cpp"
break;
- case 567: /* expression_statement: expression SEMICOLON */
-#line 3700 "glslang/MachineIndependent/glslang.y"
+ case 568: /* expression_statement: expression SEMICOLON */
+#line 3707 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = static_cast<TIntermNode*>((yyvsp[-1].interm.intermTypedNode)); }
-#line 10461 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10574 "MachineIndependent/glslang_tab.cpp"
break;
- case 568: /* selection_statement: selection_statement_nonattributed */
-#line 3704 "glslang/MachineIndependent/glslang.y"
+ case 569: /* selection_statement: selection_statement_nonattributed */
+#line 3711 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10469 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10582 "MachineIndependent/glslang_tab.cpp"
break;
- case 569: /* selection_statement: attribute selection_statement_nonattributed */
-#line 3708 "glslang/MachineIndependent/glslang.y"
+ case 570: /* selection_statement: attribute selection_statement_nonattributed */
+#line 3715 "MachineIndependent/glslang.y"
{
parseContext.handleSelectionAttributes(*(yyvsp[-1].interm.attributes), (yyvsp[0].interm.intermNode));
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10478 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10591 "MachineIndependent/glslang_tab.cpp"
break;
- case 570: /* selection_statement_nonattributed: IF LEFT_PAREN expression RIGHT_PAREN selection_rest_statement */
-#line 3715 "glslang/MachineIndependent/glslang.y"
+ case 571: /* selection_statement_nonattributed: IF LEFT_PAREN expression RIGHT_PAREN selection_rest_statement */
+#line 3722 "MachineIndependent/glslang.y"
{
parseContext.boolCheck((yyvsp[-4].lex).loc, (yyvsp[-2].interm.intermTypedNode));
(yyval.interm.intermNode) = parseContext.intermediate.addSelection((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.nodePair), (yyvsp[-4].lex).loc);
}
-#line 10487 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10600 "MachineIndependent/glslang_tab.cpp"
break;
- case 571: /* selection_rest_statement: statement_scoped ELSE statement_scoped */
-#line 3722 "glslang/MachineIndependent/glslang.y"
+ case 572: /* selection_rest_statement: statement_scoped ELSE statement_scoped */
+#line 3729 "MachineIndependent/glslang.y"
{
(yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermNode);
(yyval.interm.nodePair).node2 = (yyvsp[0].interm.intermNode);
}
-#line 10496 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10609 "MachineIndependent/glslang_tab.cpp"
break;
- case 572: /* selection_rest_statement: statement_scoped */
-#line 3726 "glslang/MachineIndependent/glslang.y"
+ case 573: /* selection_rest_statement: statement_scoped */
+#line 3733 "MachineIndependent/glslang.y"
{
(yyval.interm.nodePair).node1 = (yyvsp[0].interm.intermNode);
(yyval.interm.nodePair).node2 = 0;
}
-#line 10505 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10618 "MachineIndependent/glslang_tab.cpp"
break;
- case 573: /* condition: expression */
-#line 3734 "glslang/MachineIndependent/glslang.y"
+ case 574: /* condition: expression */
+#line 3741 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
parseContext.boolCheck((yyvsp[0].interm.intermTypedNode)->getLoc(), (yyvsp[0].interm.intermTypedNode));
}
-#line 10514 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10627 "MachineIndependent/glslang_tab.cpp"
break;
- case 574: /* condition: fully_specified_type IDENTIFIER EQUAL initializer */
-#line 3738 "glslang/MachineIndependent/glslang.y"
+ case 575: /* condition: fully_specified_type IDENTIFIER EQUAL initializer */
+#line 3745 "MachineIndependent/glslang.y"
{
parseContext.boolCheck((yyvsp[-2].lex).loc, (yyvsp[-3].interm.type));
@@ -10525,28 +10638,28 @@
else
(yyval.interm.intermTypedNode) = 0;
}
-#line 10529 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10642 "MachineIndependent/glslang_tab.cpp"
break;
- case 575: /* switch_statement: switch_statement_nonattributed */
-#line 3751 "glslang/MachineIndependent/glslang.y"
+ case 576: /* switch_statement: switch_statement_nonattributed */
+#line 3758 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10537 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10650 "MachineIndependent/glslang_tab.cpp"
break;
- case 576: /* switch_statement: attribute switch_statement_nonattributed */
-#line 3755 "glslang/MachineIndependent/glslang.y"
+ case 577: /* switch_statement: attribute switch_statement_nonattributed */
+#line 3762 "MachineIndependent/glslang.y"
{
parseContext.handleSwitchAttributes(*(yyvsp[-1].interm.attributes), (yyvsp[0].interm.intermNode));
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10546 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10659 "MachineIndependent/glslang_tab.cpp"
break;
- case 577: /* $@9: %empty */
-#line 3762 "glslang/MachineIndependent/glslang.y"
+ case 578: /* $@9: %empty */
+#line 3769 "MachineIndependent/glslang.y"
{
// start new switch sequence on the switch stack
++parseContext.controlFlowNestingLevel;
@@ -10555,11 +10668,11 @@
parseContext.switchLevel.push_back(parseContext.statementNestingLevel);
parseContext.symbolTable.push();
}
-#line 10559 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10672 "MachineIndependent/glslang_tab.cpp"
break;
- case 578: /* switch_statement_nonattributed: SWITCH LEFT_PAREN expression RIGHT_PAREN $@9 LEFT_BRACE switch_statement_list RIGHT_BRACE */
-#line 3770 "glslang/MachineIndependent/glslang.y"
+ case 579: /* switch_statement_nonattributed: SWITCH LEFT_PAREN expression RIGHT_PAREN $@9 LEFT_BRACE switch_statement_list RIGHT_BRACE */
+#line 3777 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = parseContext.addSwitch((yyvsp[-7].lex).loc, (yyvsp[-5].interm.intermTypedNode), (yyvsp[-1].interm.intermNode) ? (yyvsp[-1].interm.intermNode)->getAsAggregate() : 0);
delete parseContext.switchSequenceStack.back();
@@ -10569,27 +10682,27 @@
--parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel;
}
-#line 10573 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10686 "MachineIndependent/glslang_tab.cpp"
break;
- case 579: /* switch_statement_list: %empty */
-#line 3782 "glslang/MachineIndependent/glslang.y"
+ case 580: /* switch_statement_list: %empty */
+#line 3789 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = 0;
}
-#line 10581 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10694 "MachineIndependent/glslang_tab.cpp"
break;
- case 580: /* switch_statement_list: statement_list */
-#line 3785 "glslang/MachineIndependent/glslang.y"
+ case 581: /* switch_statement_list: statement_list */
+#line 3792 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10589 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10702 "MachineIndependent/glslang_tab.cpp"
break;
- case 581: /* case_label: CASE expression COLON */
-#line 3791 "glslang/MachineIndependent/glslang.y"
+ case 582: /* case_label: CASE expression COLON */
+#line 3798 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = 0;
if (parseContext.switchLevel.size() == 0)
@@ -10602,11 +10715,11 @@
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpCase, (yyvsp[-1].interm.intermTypedNode), (yyvsp[-2].lex).loc);
}
}
-#line 10606 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10719 "MachineIndependent/glslang_tab.cpp"
break;
- case 582: /* case_label: DEFAULT COLON */
-#line 3803 "glslang/MachineIndependent/glslang.y"
+ case 583: /* case_label: DEFAULT COLON */
+#line 3810 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = 0;
if (parseContext.switchLevel.size() == 0)
@@ -10616,28 +10729,28 @@
else
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpDefault, (yyvsp[-1].lex).loc);
}
-#line 10620 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10733 "MachineIndependent/glslang_tab.cpp"
break;
- case 583: /* iteration_statement: iteration_statement_nonattributed */
-#line 3815 "glslang/MachineIndependent/glslang.y"
+ case 584: /* iteration_statement: iteration_statement_nonattributed */
+#line 3822 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10628 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10741 "MachineIndependent/glslang_tab.cpp"
break;
- case 584: /* iteration_statement: attribute iteration_statement_nonattributed */
-#line 3819 "glslang/MachineIndependent/glslang.y"
+ case 585: /* iteration_statement: attribute iteration_statement_nonattributed */
+#line 3826 "MachineIndependent/glslang.y"
{
parseContext.handleLoopAttributes(*(yyvsp[-1].interm.attributes), (yyvsp[0].interm.intermNode));
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10637 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10750 "MachineIndependent/glslang_tab.cpp"
break;
- case 585: /* $@10: %empty */
-#line 3826 "glslang/MachineIndependent/glslang.y"
+ case 586: /* $@10: %empty */
+#line 3833 "MachineIndependent/glslang.y"
{
if (! parseContext.limits.whileLoops)
parseContext.error((yyvsp[-1].lex).loc, "while loops not available", "limitation", "");
@@ -10646,11 +10759,11 @@
++parseContext.statementNestingLevel;
++parseContext.controlFlowNestingLevel;
}
-#line 10650 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10763 "MachineIndependent/glslang_tab.cpp"
break;
- case 586: /* iteration_statement_nonattributed: WHILE LEFT_PAREN $@10 condition RIGHT_PAREN statement_no_new_scope */
-#line 3834 "glslang/MachineIndependent/glslang.y"
+ case 587: /* iteration_statement_nonattributed: WHILE LEFT_PAREN $@10 condition RIGHT_PAREN statement_no_new_scope */
+#line 3841 "MachineIndependent/glslang.y"
{
parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
(yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[0].interm.intermNode), (yyvsp[-2].interm.intermTypedNode), 0, true, (yyvsp[-5].lex).loc);
@@ -10658,21 +10771,21 @@
--parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel;
}
-#line 10662 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10775 "MachineIndependent/glslang_tab.cpp"
break;
- case 587: /* $@11: %empty */
-#line 3841 "glslang/MachineIndependent/glslang.y"
+ case 588: /* $@11: %empty */
+#line 3848 "MachineIndependent/glslang.y"
{
++parseContext.loopNestingLevel;
++parseContext.statementNestingLevel;
++parseContext.controlFlowNestingLevel;
}
-#line 10672 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10785 "MachineIndependent/glslang_tab.cpp"
break;
- case 588: /* iteration_statement_nonattributed: DO $@11 statement WHILE LEFT_PAREN expression RIGHT_PAREN SEMICOLON */
-#line 3846 "glslang/MachineIndependent/glslang.y"
+ case 589: /* iteration_statement_nonattributed: DO $@11 statement WHILE LEFT_PAREN expression RIGHT_PAREN SEMICOLON */
+#line 3853 "MachineIndependent/glslang.y"
{
if (! parseContext.limits.whileLoops)
parseContext.error((yyvsp[-7].lex).loc, "do-while loops not available", "limitation", "");
@@ -10684,22 +10797,22 @@
--parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel;
}
-#line 10688 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10801 "MachineIndependent/glslang_tab.cpp"
break;
- case 589: /* $@12: %empty */
-#line 3857 "glslang/MachineIndependent/glslang.y"
+ case 590: /* $@12: %empty */
+#line 3864 "MachineIndependent/glslang.y"
{
parseContext.symbolTable.push();
++parseContext.loopNestingLevel;
++parseContext.statementNestingLevel;
++parseContext.controlFlowNestingLevel;
}
-#line 10699 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10812 "MachineIndependent/glslang_tab.cpp"
break;
- case 590: /* iteration_statement_nonattributed: FOR LEFT_PAREN $@12 for_init_statement for_rest_statement RIGHT_PAREN statement_no_new_scope */
-#line 3863 "glslang/MachineIndependent/glslang.y"
+ case 591: /* iteration_statement_nonattributed: FOR LEFT_PAREN $@12 for_init_statement for_rest_statement RIGHT_PAREN statement_no_new_scope */
+#line 3870 "MachineIndependent/glslang.y"
{
parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
(yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[-3].interm.intermNode), (yyvsp[-5].lex).loc);
@@ -10712,81 +10825,81 @@
--parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel;
}
-#line 10716 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10829 "MachineIndependent/glslang_tab.cpp"
break;
- case 591: /* for_init_statement: expression_statement */
-#line 3878 "glslang/MachineIndependent/glslang.y"
+ case 592: /* for_init_statement: expression_statement */
+#line 3885 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10724 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10837 "MachineIndependent/glslang_tab.cpp"
break;
- case 592: /* for_init_statement: declaration_statement */
-#line 3881 "glslang/MachineIndependent/glslang.y"
+ case 593: /* for_init_statement: declaration_statement */
+#line 3888 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10732 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10845 "MachineIndependent/glslang_tab.cpp"
break;
- case 593: /* conditionopt: condition */
-#line 3887 "glslang/MachineIndependent/glslang.y"
+ case 594: /* conditionopt: condition */
+#line 3894 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
}
-#line 10740 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10853 "MachineIndependent/glslang_tab.cpp"
break;
- case 594: /* conditionopt: %empty */
-#line 3890 "glslang/MachineIndependent/glslang.y"
+ case 595: /* conditionopt: %empty */
+#line 3897 "MachineIndependent/glslang.y"
{
(yyval.interm.intermTypedNode) = 0;
}
-#line 10748 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10861 "MachineIndependent/glslang_tab.cpp"
break;
- case 595: /* for_rest_statement: conditionopt SEMICOLON */
-#line 3896 "glslang/MachineIndependent/glslang.y"
+ case 596: /* for_rest_statement: conditionopt SEMICOLON */
+#line 3903 "MachineIndependent/glslang.y"
{
(yyval.interm.nodePair).node1 = (yyvsp[-1].interm.intermTypedNode);
(yyval.interm.nodePair).node2 = 0;
}
-#line 10757 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10870 "MachineIndependent/glslang_tab.cpp"
break;
- case 596: /* for_rest_statement: conditionopt SEMICOLON expression */
-#line 3900 "glslang/MachineIndependent/glslang.y"
+ case 597: /* for_rest_statement: conditionopt SEMICOLON expression */
+#line 3907 "MachineIndependent/glslang.y"
{
(yyval.interm.nodePair).node1 = (yyvsp[-2].interm.intermTypedNode);
(yyval.interm.nodePair).node2 = (yyvsp[0].interm.intermTypedNode);
}
-#line 10766 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10879 "MachineIndependent/glslang_tab.cpp"
break;
- case 597: /* jump_statement: CONTINUE SEMICOLON */
-#line 3907 "glslang/MachineIndependent/glslang.y"
+ case 598: /* jump_statement: CONTINUE SEMICOLON */
+#line 3914 "MachineIndependent/glslang.y"
{
if (parseContext.loopNestingLevel <= 0)
parseContext.error((yyvsp[-1].lex).loc, "continue statement only allowed in loops", "", "");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpContinue, (yyvsp[-1].lex).loc);
}
-#line 10776 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10889 "MachineIndependent/glslang_tab.cpp"
break;
- case 598: /* jump_statement: BREAK SEMICOLON */
-#line 3912 "glslang/MachineIndependent/glslang.y"
+ case 599: /* jump_statement: BREAK SEMICOLON */
+#line 3919 "MachineIndependent/glslang.y"
{
if (parseContext.loopNestingLevel + parseContext.switchSequenceStack.size() <= 0)
parseContext.error((yyvsp[-1].lex).loc, "break statement only allowed in switch and loops", "", "");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpBreak, (yyvsp[-1].lex).loc);
}
-#line 10786 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10899 "MachineIndependent/glslang_tab.cpp"
break;
- case 599: /* jump_statement: RETURN SEMICOLON */
-#line 3917 "glslang/MachineIndependent/glslang.y"
+ case 600: /* jump_statement: RETURN SEMICOLON */
+#line 3924 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpReturn, (yyvsp[-1].lex).loc);
if (parseContext.currentFunctionType->getBasicType() != EbtVoid)
@@ -10794,83 +10907,101 @@
if (parseContext.inMain)
parseContext.postEntryPointReturn = true;
}
-#line 10798 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10911 "MachineIndependent/glslang_tab.cpp"
break;
- case 600: /* jump_statement: RETURN expression SEMICOLON */
-#line 3924 "glslang/MachineIndependent/glslang.y"
+ case 601: /* jump_statement: RETURN expression SEMICOLON */
+#line 3931 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = parseContext.handleReturnValue((yyvsp[-2].lex).loc, (yyvsp[-1].interm.intermTypedNode));
}
-#line 10806 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10919 "MachineIndependent/glslang_tab.cpp"
break;
- case 601: /* jump_statement: DISCARD SEMICOLON */
-#line 3927 "glslang/MachineIndependent/glslang.y"
+ case 602: /* jump_statement: DISCARD SEMICOLON */
+#line 3934 "MachineIndependent/glslang.y"
{
parseContext.requireStage((yyvsp[-1].lex).loc, EShLangFragment, "discard");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpKill, (yyvsp[-1].lex).loc);
}
-#line 10815 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10928 "MachineIndependent/glslang_tab.cpp"
break;
- case 602: /* jump_statement: TERMINATE_INVOCATION SEMICOLON */
-#line 3931 "glslang/MachineIndependent/glslang.y"
+ case 603: /* jump_statement: TERMINATE_INVOCATION SEMICOLON */
+#line 3938 "MachineIndependent/glslang.y"
{
parseContext.requireStage((yyvsp[-1].lex).loc, EShLangFragment, "terminateInvocation");
(yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpTerminateInvocation, (yyvsp[-1].lex).loc);
}
-#line 10824 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10937 "MachineIndependent/glslang_tab.cpp"
break;
- case 603: /* translation_unit: external_declaration */
-#line 3940 "glslang/MachineIndependent/glslang.y"
+ case 604: /* jump_statement: TERMINATE_RAY SEMICOLON */
+#line 3943 "MachineIndependent/glslang.y"
+ {
+ parseContext.requireStage((yyvsp[-1].lex).loc, EShLangAnyHit, "terminateRayEXT");
+ (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpTerminateRayKHR, (yyvsp[-1].lex).loc);
+ }
+#line 10946 "MachineIndependent/glslang_tab.cpp"
+ break;
+
+ case 605: /* jump_statement: IGNORE_INTERSECTION SEMICOLON */
+#line 3947 "MachineIndependent/glslang.y"
+ {
+ parseContext.requireStage((yyvsp[-1].lex).loc, EShLangAnyHit, "ignoreIntersectionEXT");
+ (yyval.interm.intermNode) = parseContext.intermediate.addBranch(EOpIgnoreIntersectionKHR, (yyvsp[-1].lex).loc);
+ }
+#line 10955 "MachineIndependent/glslang_tab.cpp"
+ break;
+
+ case 606: /* translation_unit: external_declaration */
+#line 3957 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
parseContext.intermediate.setTreeRoot((yyval.interm.intermNode));
}
-#line 10833 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10964 "MachineIndependent/glslang_tab.cpp"
break;
- case 604: /* translation_unit: translation_unit external_declaration */
-#line 3944 "glslang/MachineIndependent/glslang.y"
+ case 607: /* translation_unit: translation_unit external_declaration */
+#line 3961 "MachineIndependent/glslang.y"
{
if ((yyvsp[0].interm.intermNode) != nullptr) {
(yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode));
parseContext.intermediate.setTreeRoot((yyval.interm.intermNode));
}
}
-#line 10844 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10975 "MachineIndependent/glslang_tab.cpp"
break;
- case 605: /* external_declaration: function_definition */
-#line 3953 "glslang/MachineIndependent/glslang.y"
+ case 608: /* external_declaration: function_definition */
+#line 3970 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10852 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10983 "MachineIndependent/glslang_tab.cpp"
break;
- case 606: /* external_declaration: declaration */
-#line 3956 "glslang/MachineIndependent/glslang.y"
+ case 609: /* external_declaration: declaration */
+#line 3973 "MachineIndependent/glslang.y"
{
(yyval.interm.intermNode) = (yyvsp[0].interm.intermNode);
}
-#line 10860 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 10991 "MachineIndependent/glslang_tab.cpp"
break;
- case 607: /* external_declaration: SEMICOLON */
-#line 3960 "glslang/MachineIndependent/glslang.y"
+ case 610: /* external_declaration: SEMICOLON */
+#line 3977 "MachineIndependent/glslang.y"
{
parseContext.requireProfile((yyvsp[0].lex).loc, ~EEsProfile, "extraneous semicolon");
parseContext.profileRequires((yyvsp[0].lex).loc, ~EEsProfile, 460, nullptr, "extraneous semicolon");
(yyval.interm.intermNode) = nullptr;
}
-#line 10870 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 11001 "MachineIndependent/glslang_tab.cpp"
break;
- case 608: /* $@13: %empty */
-#line 3969 "glslang/MachineIndependent/glslang.y"
+ case 611: /* $@13: %empty */
+#line 3986 "MachineIndependent/glslang.y"
{
(yyvsp[0].interm).function = parseContext.handleFunctionDeclarator((yyvsp[0].interm).loc, *(yyvsp[0].interm).function, false /* not prototype */);
(yyvsp[0].interm).intermNode = parseContext.handleFunctionDefinition((yyvsp[0].interm).loc, *(yyvsp[0].interm).function);
@@ -10883,11 +11014,11 @@
++parseContext.statementNestingLevel;
}
}
-#line 10887 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 11018 "MachineIndependent/glslang_tab.cpp"
break;
- case 609: /* function_definition: function_prototype $@13 compound_statement_no_new_scope */
-#line 3981 "glslang/MachineIndependent/glslang.y"
+ case 612: /* function_definition: function_prototype $@13 compound_statement_no_new_scope */
+#line 3998 "MachineIndependent/glslang.y"
{
// May be best done as post process phase on intermediate code
if (parseContext.currentFunctionType->getBasicType() != EbtVoid && ! parseContext.functionReturnsValue)
@@ -10914,52 +11045,52 @@
--parseContext.statementNestingLevel;
}
}
-#line 10918 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 11049 "MachineIndependent/glslang_tab.cpp"
break;
- case 610: /* attribute: LEFT_BRACKET LEFT_BRACKET attribute_list RIGHT_BRACKET RIGHT_BRACKET */
-#line 4011 "glslang/MachineIndependent/glslang.y"
+ case 613: /* attribute: LEFT_BRACKET LEFT_BRACKET attribute_list RIGHT_BRACKET RIGHT_BRACKET */
+#line 4028 "MachineIndependent/glslang.y"
{
(yyval.interm.attributes) = (yyvsp[-2].interm.attributes);
parseContext.requireExtensions((yyvsp[-4].lex).loc, 1, &E_GL_EXT_control_flow_attributes, "attribute");
}
-#line 10927 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 11058 "MachineIndependent/glslang_tab.cpp"
break;
- case 611: /* attribute_list: single_attribute */
-#line 4017 "glslang/MachineIndependent/glslang.y"
+ case 614: /* attribute_list: single_attribute */
+#line 4034 "MachineIndependent/glslang.y"
{
(yyval.interm.attributes) = (yyvsp[0].interm.attributes);
}
-#line 10935 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 11066 "MachineIndependent/glslang_tab.cpp"
break;
- case 612: /* attribute_list: attribute_list COMMA single_attribute */
-#line 4020 "glslang/MachineIndependent/glslang.y"
+ case 615: /* attribute_list: attribute_list COMMA single_attribute */
+#line 4037 "MachineIndependent/glslang.y"
{
(yyval.interm.attributes) = parseContext.mergeAttributes((yyvsp[-2].interm.attributes), (yyvsp[0].interm.attributes));
}
-#line 10943 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 11074 "MachineIndependent/glslang_tab.cpp"
break;
- case 613: /* single_attribute: IDENTIFIER */
-#line 4025 "glslang/MachineIndependent/glslang.y"
+ case 616: /* single_attribute: IDENTIFIER */
+#line 4042 "MachineIndependent/glslang.y"
{
(yyval.interm.attributes) = parseContext.makeAttributes(*(yyvsp[0].lex).string);
}
-#line 10951 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 11082 "MachineIndependent/glslang_tab.cpp"
break;
- case 614: /* single_attribute: IDENTIFIER LEFT_PAREN constant_expression RIGHT_PAREN */
-#line 4028 "glslang/MachineIndependent/glslang.y"
+ case 617: /* single_attribute: IDENTIFIER LEFT_PAREN constant_expression RIGHT_PAREN */
+#line 4045 "MachineIndependent/glslang.y"
{
(yyval.interm.attributes) = parseContext.makeAttributes(*(yyvsp[-3].lex).string, (yyvsp[-1].interm.intermTypedNode));
}
-#line 10959 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 11090 "MachineIndependent/glslang_tab.cpp"
break;
-#line 10963 "glslang/MachineIndependent/glslang_tab.cpp"
+#line 11094 "MachineIndependent/glslang_tab.cpp"
default: break;
}
@@ -11184,5 +11315,5 @@
return yyresult;
}
-#line 4033 "glslang/MachineIndependent/glslang.y"
+#line 4050 "MachineIndependent/glslang.y"
diff --git a/glslang/MachineIndependent/glslang_tab.cpp.h b/glslang/MachineIndependent/glslang_tab.cpp.h
index 66983a0..d6bc00d 100644
--- a/glslang/MachineIndependent/glslang_tab.cpp.h
+++ b/glslang/MachineIndependent/glslang_tab.cpp.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.7.2. */
+/* A Bison parser, made by GNU Bison 3.7.4. */
/* Bison interface for Yacc-like parsers in C
@@ -35,8 +35,8 @@
especially those whose name start with YY_ or yy_. They are
private implementation details that can be changed or removed. */
-#ifndef YY_YY_GLSLANG_MACHINEINDEPENDENT_GLSLANG_TAB_CPP_H_INCLUDED
-# define YY_YY_GLSLANG_MACHINEINDEPENDENT_GLSLANG_TAB_CPP_H_INCLUDED
+#ifndef YY_YY_MACHINEINDEPENDENT_GLSLANG_TAB_CPP_H_INCLUDED
+# define YY_YY_MACHINEINDEPENDENT_GLSLANG_TAB_CPP_H_INCLUDED
/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
@@ -447,53 +447,55 @@
CASE = 648, /* CASE */
DEFAULT = 649, /* DEFAULT */
TERMINATE_INVOCATION = 650, /* TERMINATE_INVOCATION */
- UNIFORM = 651, /* UNIFORM */
- SHARED = 652, /* SHARED */
- BUFFER = 653, /* BUFFER */
- FLAT = 654, /* FLAT */
- SMOOTH = 655, /* SMOOTH */
- LAYOUT = 656, /* LAYOUT */
- DOUBLECONSTANT = 657, /* DOUBLECONSTANT */
- INT16CONSTANT = 658, /* INT16CONSTANT */
- UINT16CONSTANT = 659, /* UINT16CONSTANT */
- FLOAT16CONSTANT = 660, /* FLOAT16CONSTANT */
- INT32CONSTANT = 661, /* INT32CONSTANT */
- UINT32CONSTANT = 662, /* UINT32CONSTANT */
- INT64CONSTANT = 663, /* INT64CONSTANT */
- UINT64CONSTANT = 664, /* UINT64CONSTANT */
- SUBROUTINE = 665, /* SUBROUTINE */
- DEMOTE = 666, /* DEMOTE */
- PAYLOADNV = 667, /* PAYLOADNV */
- PAYLOADINNV = 668, /* PAYLOADINNV */
- HITATTRNV = 669, /* HITATTRNV */
- CALLDATANV = 670, /* CALLDATANV */
- CALLDATAINNV = 671, /* CALLDATAINNV */
- PAYLOADEXT = 672, /* PAYLOADEXT */
- PAYLOADINEXT = 673, /* PAYLOADINEXT */
- HITATTREXT = 674, /* HITATTREXT */
- CALLDATAEXT = 675, /* CALLDATAEXT */
- CALLDATAINEXT = 676, /* CALLDATAINEXT */
- PATCH = 677, /* PATCH */
- SAMPLE = 678, /* SAMPLE */
- NONUNIFORM = 679, /* NONUNIFORM */
- COHERENT = 680, /* COHERENT */
- VOLATILE = 681, /* VOLATILE */
- RESTRICT = 682, /* RESTRICT */
- READONLY = 683, /* READONLY */
- WRITEONLY = 684, /* WRITEONLY */
- DEVICECOHERENT = 685, /* DEVICECOHERENT */
- QUEUEFAMILYCOHERENT = 686, /* QUEUEFAMILYCOHERENT */
- WORKGROUPCOHERENT = 687, /* WORKGROUPCOHERENT */
- SUBGROUPCOHERENT = 688, /* SUBGROUPCOHERENT */
- NONPRIVATE = 689, /* NONPRIVATE */
- SHADERCALLCOHERENT = 690, /* SHADERCALLCOHERENT */
- NOPERSPECTIVE = 691, /* NOPERSPECTIVE */
- EXPLICITINTERPAMD = 692, /* EXPLICITINTERPAMD */
- PERVERTEXNV = 693, /* PERVERTEXNV */
- PERPRIMITIVENV = 694, /* PERPRIMITIVENV */
- PERVIEWNV = 695, /* PERVIEWNV */
- PERTASKNV = 696, /* PERTASKNV */
- PRECISE = 697 /* PRECISE */
+ TERMINATE_RAY = 651, /* TERMINATE_RAY */
+ IGNORE_INTERSECTION = 652, /* IGNORE_INTERSECTION */
+ UNIFORM = 653, /* UNIFORM */
+ SHARED = 654, /* SHARED */
+ BUFFER = 655, /* BUFFER */
+ FLAT = 656, /* FLAT */
+ SMOOTH = 657, /* SMOOTH */
+ LAYOUT = 658, /* LAYOUT */
+ DOUBLECONSTANT = 659, /* DOUBLECONSTANT */
+ INT16CONSTANT = 660, /* INT16CONSTANT */
+ UINT16CONSTANT = 661, /* UINT16CONSTANT */
+ FLOAT16CONSTANT = 662, /* FLOAT16CONSTANT */
+ INT32CONSTANT = 663, /* INT32CONSTANT */
+ UINT32CONSTANT = 664, /* UINT32CONSTANT */
+ INT64CONSTANT = 665, /* INT64CONSTANT */
+ UINT64CONSTANT = 666, /* UINT64CONSTANT */
+ SUBROUTINE = 667, /* SUBROUTINE */
+ DEMOTE = 668, /* DEMOTE */
+ PAYLOADNV = 669, /* PAYLOADNV */
+ PAYLOADINNV = 670, /* PAYLOADINNV */
+ HITATTRNV = 671, /* HITATTRNV */
+ CALLDATANV = 672, /* CALLDATANV */
+ CALLDATAINNV = 673, /* CALLDATAINNV */
+ PAYLOADEXT = 674, /* PAYLOADEXT */
+ PAYLOADINEXT = 675, /* PAYLOADINEXT */
+ HITATTREXT = 676, /* HITATTREXT */
+ CALLDATAEXT = 677, /* CALLDATAEXT */
+ CALLDATAINEXT = 678, /* CALLDATAINEXT */
+ PATCH = 679, /* PATCH */
+ SAMPLE = 680, /* SAMPLE */
+ NONUNIFORM = 681, /* NONUNIFORM */
+ COHERENT = 682, /* COHERENT */
+ VOLATILE = 683, /* VOLATILE */
+ RESTRICT = 684, /* RESTRICT */
+ READONLY = 685, /* READONLY */
+ WRITEONLY = 686, /* WRITEONLY */
+ DEVICECOHERENT = 687, /* DEVICECOHERENT */
+ QUEUEFAMILYCOHERENT = 688, /* QUEUEFAMILYCOHERENT */
+ WORKGROUPCOHERENT = 689, /* WORKGROUPCOHERENT */
+ SUBGROUPCOHERENT = 690, /* SUBGROUPCOHERENT */
+ NONPRIVATE = 691, /* NONPRIVATE */
+ SHADERCALLCOHERENT = 692, /* SHADERCALLCOHERENT */
+ NOPERSPECTIVE = 693, /* NOPERSPECTIVE */
+ EXPLICITINTERPAMD = 694, /* EXPLICITINTERPAMD */
+ PERVERTEXNV = 695, /* PERVERTEXNV */
+ PERPRIMITIVENV = 696, /* PERPRIMITIVENV */
+ PERVIEWNV = 697, /* PERVIEWNV */
+ PERTASKNV = 698, /* PERTASKNV */
+ PRECISE = 699 /* PRECISE */
};
typedef enum yytokentype yytoken_kind_t;
#endif
@@ -502,7 +504,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
union YYSTYPE
{
-#line 97 "glslang/MachineIndependent/glslang.y"
+#line 97 "MachineIndependent/glslang.y"
struct {
glslang::TSourceLoc loc;
@@ -538,7 +540,7 @@
glslang::TArraySizes* typeParameters;
} interm;
-#line 542 "glslang/MachineIndependent/glslang_tab.cpp.h"
+#line 544 "MachineIndependent/glslang_tab.cpp.h"
};
typedef union YYSTYPE YYSTYPE;
@@ -550,4 +552,4 @@
int yyparse (glslang::TParseContext* pParseContext);
-#endif /* !YY_YY_GLSLANG_MACHINEINDEPENDENT_GLSLANG_TAB_CPP_H_INCLUDED */
+#endif /* !YY_YY_MACHINEINDEPENDENT_GLSLANG_TAB_CPP_H_INCLUDED */
diff --git a/glslang/MachineIndependent/intermOut.cpp b/glslang/MachineIndependent/intermOut.cpp
index ac862e6..5ce3e47 100644
--- a/glslang/MachineIndependent/intermOut.cpp
+++ b/glslang/MachineIndependent/intermOut.cpp
@@ -438,6 +438,9 @@
case EOpConvUint64ToPtr: out.debug << "Convert uint64_t to pointer"; break;
case EOpConvPtrToUint64: out.debug << "Convert pointer to uint64_t"; break;
+ case EOpConvUint64ToAccStruct: out.debug << "Convert uint64_t to acceleration structure"; break;
+ case EOpConvUvec2ToAccStruct: out.debug << "Convert uvec2 to acceleration strucuture "; break;
+
case EOpRadians: out.debug << "radians"; break;
case EOpDegrees: out.debug << "degrees"; break;
case EOpSin: out.debug << "sine"; break;
@@ -829,6 +832,7 @@
case EOpConstructTextureSampler: out.debug << "Construct combined texture-sampler"; break;
case EOpConstructReference: out.debug << "Construct reference"; break;
case EOpConstructCooperativeMatrix: out.debug << "Construct cooperative matrix"; break;
+ case EOpConstructAccStruct: out.debug << "Construct acceleration structure"; break;
case EOpLessThan: out.debug << "Compare Less Than"; break;
case EOpGreaterThan: out.debug << "Compare Greater Than"; break;
@@ -1079,11 +1083,15 @@
case EOpSubpassLoad: out.debug << "subpassLoad"; break;
case EOpSubpassLoadMS: out.debug << "subpassLoadMS"; break;
- case EOpTrace: out.debug << "traceNV"; break;
+ case EOpTraceNV: out.debug << "traceNV"; break;
+ case EOpTraceKHR: out.debug << "traceRayKHR"; break;
case EOpReportIntersection: out.debug << "reportIntersectionNV"; break;
- case EOpIgnoreIntersection: out.debug << "ignoreIntersectionNV"; break;
- case EOpTerminateRay: out.debug << "terminateRayNV"; break;
- case EOpExecuteCallable: out.debug << "executeCallableNV"; break;
+ case EOpIgnoreIntersectionNV: out.debug << "ignoreIntersectionNV"; break;
+ case EOpIgnoreIntersectionKHR: out.debug << "ignoreIntersectionKHR"; break;
+ case EOpTerminateRayNV: out.debug << "terminateRayNV"; break;
+ case EOpTerminateRayKHR: out.debug << "terminateRayKHR"; break;
+ case EOpExecuteCallableNV: out.debug << "executeCallableNV"; break;
+ case EOpExecuteCallableKHR: out.debug << "executeCallableKHR"; break;
case EOpWritePackedPrimitiveIndices4x8NV: out.debug << "writePackedPrimitiveIndices4x8NV"; break;
case EOpRayQueryInitialize: out.debug << "rayQueryInitializeEXT"; break;
@@ -1409,15 +1417,17 @@
OutputTreeText(out, node, depth);
switch (node->getFlowOp()) {
- case EOpKill: out.debug << "Branch: Kill"; break;
- case EOpTerminateInvocation: out.debug << "Branch: TerminateInvocation"; break;
- case EOpBreak: out.debug << "Branch: Break"; break;
- case EOpContinue: out.debug << "Branch: Continue"; break;
- case EOpReturn: out.debug << "Branch: Return"; break;
- case EOpCase: out.debug << "case: "; break;
- case EOpDemote: out.debug << "Demote"; break;
- case EOpDefault: out.debug << "default: "; break;
- default: out.debug << "Branch: Unknown Branch"; break;
+ case EOpKill: out.debug << "Branch: Kill"; break;
+ case EOpTerminateInvocation: out.debug << "Branch: TerminateInvocation"; break;
+ case EOpIgnoreIntersectionKHR: out.debug << "Branch: IgnoreIntersectionKHR"; break;
+ case EOpTerminateRayKHR: out.debug << "Branch: TerminateRayKHR"; break;
+ case EOpBreak: out.debug << "Branch: Break"; break;
+ case EOpContinue: out.debug << "Branch: Continue"; break;
+ case EOpReturn: out.debug << "Branch: Return"; break;
+ case EOpCase: out.debug << "case: "; break;
+ case EOpDemote: out.debug << "Demote"; break;
+ case EOpDefault: out.debug << "default: "; break;
+ default: out.debug << "Branch: Unknown Branch"; break;
}
if (node->getExpression()) {
diff --git a/glslang/MachineIndependent/linkValidate.cpp b/glslang/MachineIndependent/linkValidate.cpp
index 2b6738c..3f3a312 100644
--- a/glslang/MachineIndependent/linkValidate.cpp
+++ b/glslang/MachineIndependent/linkValidate.cpp
@@ -197,12 +197,14 @@
MERGE_TRUE(pointMode);
for (int i = 0; i < 3; ++i) {
- if (!localSizeNotDefault[i] && unit.localSizeNotDefault[i]) {
- localSize[i] = unit.localSize[i];
- localSizeNotDefault[i] = true;
+ if (unit.localSizeNotDefault[i]) {
+ if (!localSizeNotDefault[i]) {
+ localSize[i] = unit.localSize[i];
+ localSizeNotDefault[i] = true;
+ }
+ else if (localSize[i] != unit.localSize[i])
+ error(infoSink, "Contradictory local size");
}
- else if (localSize[i] != unit.localSize[i])
- error(infoSink, "Contradictory local size");
if (localSizeSpecId[i] == TQualifier::layoutNotSet)
localSizeSpecId[i] = unit.localSizeSpecId[i];
@@ -656,6 +658,25 @@
#endif
}
+void TIntermediate::sharedBlockCheck(TInfoSink& infoSink)
+{
+ bool has_shared_block = false;
+ bool has_shared_non_block = false;
+ TIntermSequence& linkObjects = findLinkerObjects()->getSequence();
+ for (size_t i = 0; i < linkObjects.size(); ++i) {
+ const TType& type = linkObjects[i]->getAsTyped()->getType();
+ const TQualifier& qualifier = type.getQualifier();
+ if (qualifier.storage == glslang::EvqShared) {
+ if (type.getBasicType() == glslang::EbtBlock)
+ has_shared_block = true;
+ else
+ has_shared_non_block = true;
+ }
+ }
+ if (has_shared_block && has_shared_non_block)
+ error(infoSink, "cannot mix use of shared variables inside and outside blocks");
+}
+
//
// Do final link-time error checking of a complete (merged) intermediate representation.
// (Much error checking was done during merging).
@@ -781,6 +802,7 @@
error(infoSink, "post_depth_coverage requires early_fragment_tests");
break;
case EShLangCompute:
+ sharedBlockCheck(infoSink);
break;
case EShLangRayGen:
case EShLangIntersect:
@@ -813,6 +835,7 @@
case EShLangTaskNV:
if (numTaskNVBlocks > 1)
error(infoSink, "Only one taskNV interface block is allowed per shader");
+ sharedBlockCheck(infoSink);
break;
default:
error(infoSink, "Unknown Stage.");
@@ -1060,8 +1083,8 @@
return found;
}
-// Accumulate locations used for inputs, outputs, and uniforms, and check for collisions
-// as the accumulation is done.
+// Accumulate locations used for inputs, outputs, and uniforms, payload and callable data
+// and check for collisions as the accumulation is done.
//
// Returns < 0 if no collision, >= 0 if collision and the value returned is a colliding value.
//
@@ -1073,6 +1096,7 @@
typeCollision = false;
int set;
+ int setRT;
if (qualifier.isPipeInput())
set = 0;
else if (qualifier.isPipeOutput())
@@ -1081,11 +1105,17 @@
set = 2;
else if (qualifier.storage == EvqBuffer)
set = 3;
+ else if (qualifier.isAnyPayload())
+ setRT = 0;
+ else if (qualifier.isAnyCallable())
+ setRT = 1;
else
return -1;
int size;
- if (qualifier.isUniformOrBuffer() || qualifier.isTaskMemory()) {
+ if (qualifier.isAnyPayload() || qualifier.isAnyCallable()) {
+ size = 1;
+ } else if (qualifier.isUniformOrBuffer() || qualifier.isTaskMemory()) {
if (type.isSizedArray())
size = type.getCumulativeArraySize();
else
@@ -1113,10 +1143,17 @@
// (A vertex shader input will show using only one location, even for a dvec3/4.)
//
// So, for the case of dvec3, we need two independent ioRanges.
-
+ //
+ // For raytracing IO (payloads and callabledata) each declaration occupies a single
+ // slot irrespective of type.
int collision = -1; // no collision
#ifndef GLSLANG_WEB
- if (size == 2 && type.getBasicType() == EbtDouble && type.getVectorSize() == 3 &&
+ if (qualifier.isAnyPayload() || qualifier.isAnyCallable()) {
+ TRange range(qualifier.layoutLocation, qualifier.layoutLocation);
+ collision = checkLocationRT(setRT, qualifier.layoutLocation);
+ if (collision < 0)
+ usedIoRT[setRT].push_back(range);
+ } else if (size == 2 && type.getBasicType() == EbtDouble && type.getVectorSize() == 3 &&
(qualifier.isPipeInput() || qualifier.isPipeOutput())) {
// Dealing with dvec3 in/out split across two locations.
// Need two io-ranges.
@@ -1192,6 +1229,16 @@
return -1; // no collision
}
+int TIntermediate::checkLocationRT(int set, int location) {
+ TRange range(location, location);
+ for (size_t r = 0; r < usedIoRT[set].size(); ++r) {
+ if (range.overlap(usedIoRT[set][r])) {
+ return range.start;
+ }
+ }
+ return -1; // no collision
+}
+
// Accumulate bindings and offsets, and check for collisions
// as the accumulation is done.
//
diff --git a/glslang/MachineIndependent/localintermediate.h b/glslang/MachineIndependent/localintermediate.h
index c7f8efb..1db3d1c 100644
--- a/glslang/MachineIndependent/localintermediate.h
+++ b/glslang/MachineIndependent/localintermediate.h
@@ -417,6 +417,9 @@
EShLanguage getStage() const { return language; }
void addRequestedExtension(const char* extension) { requestedExtensions.insert(extension); }
const std::set<std::string>& getRequestedExtensions() const { return requestedExtensions; }
+ bool isRayTracingStage() const {
+ return language >= EShLangRayGen && language <= EShLangCallableNV;
+ }
void setTreeRoot(TIntermNode* r) { treeRoot = r; }
TIntermNode* getTreeRoot() const { return treeRoot; }
@@ -532,6 +535,7 @@
// Linkage related
void addSymbolLinkageNodes(TIntermAggregate*& linkage, EShLanguage, TSymbolTable&);
void addSymbolLinkageNode(TIntermAggregate*& linkage, const TSymbol&);
+ TIntermAggregate* findLinkerObjects() const;
void setUseStorageBuffer() { useStorageBuffer = true; }
bool usingStorageBuffer() const { return useStorageBuffer; }
@@ -855,6 +859,14 @@
bool usingHlslIoMapping() { return false; }
#endif
+ bool usingScalarBlockLayout() const {
+ for (auto extIt = requestedExtensions.begin(); extIt != requestedExtensions.end(); ++extIt) {
+ if (*extIt == E_GL_EXT_scalar_block_layout)
+ return true;
+ }
+ return false;
+ }
+
void addToCallGraph(TInfoSink&, const TString& caller, const TString& callee);
void merge(TInfoSink&, TIntermediate&);
void finalCheck(TInfoSink&, bool keepUncalled);
@@ -867,6 +879,7 @@
int addUsedLocation(const TQualifier&, const TType&, bool& typeCollision);
int checkLocationRange(int set, const TIoRange& range, const TType&, bool& typeCollision);
+ int checkLocationRT(int set, int location);
int addUsedOffsets(int binding, int offset, int numOffsets);
bool addUsedConstantId(int id);
static int computeTypeLocationSize(const TType&, EShLanguage);
@@ -944,7 +957,7 @@
void checkCallGraphCycles(TInfoSink&);
void checkCallGraphBodies(TInfoSink&, bool keepUncalled);
void inOutLocationCheck(TInfoSink&);
- TIntermAggregate* findLinkerObjects() const;
+ void sharedBlockCheck(TInfoSink&);
bool userOutputUsed() const;
bool isSpecializationOperation(const TIntermOperator&) const;
bool isNonuniformPropagating(TOperator) const;
@@ -1054,6 +1067,8 @@
std::unordered_set<int> usedConstantId; // specialization constant ids used
std::vector<TOffsetRange> usedAtomics; // sets of bindings used by atomic counters
std::vector<TIoRange> usedIo[4]; // sets of used locations, one for each of in, out, uniform, and buffers
+ std::vector<TRange> usedIoRT[2]; // sets of used location, one for rayPayload/rayPayloadIN and other
+ // for callableData/callableDataIn
// set of names of statically read/written I/O that might need extra checking
std::set<TString> ioAccessed;
// source code of shader, useful as part of debug information
diff --git a/glslang/MachineIndependent/reflection.cpp b/glslang/MachineIndependent/reflection.cpp
index 7295002..9870a40 100644
--- a/glslang/MachineIndependent/reflection.cpp
+++ b/glslang/MachineIndependent/reflection.cpp
@@ -1138,6 +1138,8 @@
if (index >= 0)
indexToUniformBlock[i].counterIndex = index;
}
+#else
+ (void)intermediate;
#endif
}
diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h
index 5970575..e147b0d 100644
--- a/glslang/Public/ShaderLang.h
+++ b/glslang/Public/ShaderLang.h
@@ -167,7 +167,7 @@
EShTargetVulkan_1_1 = (1 << 22) | (1 << 12), // Vulkan 1.1
EShTargetVulkan_1_2 = (1 << 22) | (2 << 12), // Vulkan 1.2
EShTargetOpenGL_450 = 450, // OpenGL
- LAST_ELEMENT_MARKER(EShTargetClientVersionCount),
+ LAST_ELEMENT_MARKER(EShTargetClientVersionCount = 4),
} EShTargetClientVersion;
typedef EShTargetClientVersion EshTargetClientVersion;
@@ -179,7 +179,7 @@
EShTargetSpv_1_3 = (1 << 16) | (3 << 8), // SPIR-V 1.3
EShTargetSpv_1_4 = (1 << 16) | (4 << 8), // SPIR-V 1.4
EShTargetSpv_1_5 = (1 << 16) | (5 << 8), // SPIR-V 1.5
- LAST_ELEMENT_MARKER(EShTargetLanguageVersionCount),
+ LAST_ELEMENT_MARKER(EShTargetLanguageVersionCount = 6),
} EShTargetLanguageVersion;
struct TInputLanguage {
diff --git a/gtests/Hlsl.FromFile.cpp b/gtests/Hlsl.FromFile.cpp
index 4d1cb50..de071b9 100644
--- a/gtests/Hlsl.FromFile.cpp
+++ b/gtests/Hlsl.FromFile.cpp
@@ -313,6 +313,7 @@
{"hlsl.promote.binary.frag", "main"},
{"hlsl.promote.vec1.frag", "main"},
{"hlsl.promotions.frag", "main"},
+ {"hlsl.round.dx10.frag", "main"},
{"hlsl.rw.atomics.frag", "main"},
{"hlsl.rw.bracket.frag", "main"},
{"hlsl.rw.register.frag", "main"},
@@ -490,6 +491,7 @@
INSTANTIATE_TEST_SUITE_P(
ToSpirv, HlslDX9CompatibleTest,
::testing::ValuesIn(std::vector<FileNameEntryPointPair>{
+ {"hlsl.round.dx9.frag", "main"},
{"hlsl.sample.dx9.frag", "main"},
{"hlsl.sample.dx9.vert", "main"},
}),
diff --git a/gtests/Spv.FromFile.cpp b/gtests/Spv.FromFile.cpp
index 9cb3dba..2ee292e 100644
--- a/gtests/Spv.FromFile.cpp
+++ b/gtests/Spv.FromFile.cpp
@@ -240,6 +240,8 @@
"rayQuery-allOps.comp",
"rayQuery-allOps.frag",
"rayQuery-initialization.Error.comp",
+ "rayQuery-global.rgen",
+ "rayQuery-types.comp",
"spv.set.vert",
"spv.double.comp",
"spv.100ops.frag",
@@ -352,6 +354,7 @@
"spv.int64.frag",
"spv.intcoopmat.comp",
"spv.intOps.vert",
+ "spv.layer.tese",
"spv.layoutNested.vert",
"spv.length.frag",
"spv.localAggregates.frag",
@@ -373,6 +376,7 @@
"spv.nonuniform4.frag",
"spv.nonuniform5.frag",
"spv.noWorkgroup.comp",
+ "spv.nullInit.comp",
"spv.offsets.frag",
"spv.Operations.frag",
"spv.paramMemory.frag",
@@ -439,6 +443,7 @@
"spv.terminate.frag",
"spv.precise.tese",
"spv.precise.tesc",
+ "spv.viewportindex.tese",
"spv.volatileAtomic.comp",
"spv.vulkan100.subgroupArithmetic.comp",
"spv.vulkan100.subgroupPartitioned.comp",
@@ -498,6 +503,7 @@
"spv.memoryScopeSemantics.comp",
"spv.memoryScopeSemantics_Error.comp",
"spv.multiView.frag",
+ "spv.queueFamilyScope.comp",
"spv.RayGenShader11.rgen",
"spv.subgroup.frag",
"spv.subgroup.geom",
@@ -555,6 +561,7 @@
"spv.ext.AnyHitShader.rahit",
"spv.ext.AnyHitShader_Errors.rahit",
"spv.ext.ClosestHitShader.rchit",
+ "spv.ext.ClosestHitShader_Subgroup.rchit",
"spv.ext.ClosestHitShader_Errors.rchit",
"spv.ext.IntersectShader.rint",
"spv.ext.IntersectShader_Errors.rint",
@@ -565,9 +572,27 @@
"spv.ext.RayCallable_Errors.rcall",
"spv.ext.RayConstants.rgen",
"spv.ext.RayGenShader.rgen",
+ "spv.ext.RayGenShader_Errors.rgen",
"spv.ext.RayGenShader11.rgen",
"spv.ext.RayGenShaderArray.rgen",
+ "spv.ext.RayGenSBTlayout.rgen",
+ "spv.ext.RayGenSBTlayout140.rgen",
+ "spv.ext.RayGenSBTlayout430.rgen",
+ "spv.ext.RayGenSBTlayoutscalar.rgen",
"spv.ext.World3x4.rahit",
+ "spv.ext.AccelDecl.frag",
+ "spv.ext.RayQueryDecl.frag",
+
+ // SPV_KHR_workgroup_memory_explicit_layout depends on SPIR-V 1.4.
+ "spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp",
+ "spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp",
+ "spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp",
+ "spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp",
+ "spv.WorkgroupMemoryExplicitLayout.NonBlock.comp",
+ "spv.WorkgroupMemoryExplicitLayout.MixBlockNonBlock_Errors.comp",
+ "spv.WorkgroupMemoryExplicitLayout.std140.comp",
+ "spv.WorkgroupMemoryExplicitLayout.std430.comp",
+ "spv.WorkgroupMemoryExplicitLayout.scalar.comp",
})),
FileNameAsCustomTestSuffix
);
diff --git a/known_good.json b/known_good.json
index 5c498dc..4442f89 100644
--- a/known_good.json
+++ b/known_good.json
@@ -5,14 +5,14 @@
"site" : "github",
"subrepo" : "KhronosGroup/SPIRV-Tools",
"subdir" : "External/spirv-tools",
- "commit" : "56d0f50357a192602216bfc4873e714905323e35"
+ "commit" : "c79edd260c2b503f0eca57310057b4a100999cc5"
},
{
"name" : "spirv-tools/external/spirv-headers",
"site" : "github",
"subrepo" : "KhronosGroup/SPIRV-Headers",
"subdir" : "External/spirv-tools/external/spirv-headers",
- "commit" : "05836bdba63e7debce9fa9feaed42f20cd43af9d"
+ "commit" : "75b30a659c8a4979104986652c54cc421fc51129"
}
]
}
diff --git a/license-checker.cfg b/license-checker.cfg
index 886b335..409f18e 100644
--- a/license-checker.cfg
+++ b/license-checker.cfg
@@ -1,6 +1,7 @@
[
{
"licenses": [
+ "Apache-2.0",
"Apache-2.0-Header",
"BSD-2-Clause",
"BSD-3-Clause",
@@ -29,14 +30,19 @@
"build/**",
"out/**",
"Test/**",
- "External/spirv-tools/**"
+ "External/spirv-tools/**",
+
+ "SPIRV/GLSL.*.h",
+ "SPIRV/NonSemanticDebugPrintf.h",
+ "SPIRV/spirv.hpp"
]
}
]
},
{
"licenses": [
- "GPL-Header"
+ "GPL-Header",
+ "GPL-3.0-or-later"
],
"paths": [
{ "exclude": [ "**" ] },
diff --git a/parse_version.cmake b/parse_version.cmake
new file mode 100644
index 0000000..b9ba413
--- /dev/null
+++ b/parse_version.cmake
@@ -0,0 +1,41 @@
+# Copyright (C) 2020 Google, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# parse_version() reads and parses the version string from FILE, assigning the
+# version string to ${PROJECT}_VERSION and the parsed version to
+# ${PROJECT}_VERSION_MAJOR, ${PROJECT}_VERSION_MINOR, ${PROJECT}_VERSION_PATCH,
+# and the optional ${PROJECT}_VERSION_FLAVOR.
+#
+# The version string take one of the forms:
+# <major>.<minor>.<patch>
+# <major>.<minor>.<patch>-<flavor>
+function(parse_version FILE PROJECT)
+ configure_file(${FILE} "${CMAKE_CURRENT_BINARY_DIR}/CHANGES.md") # Required to re-run cmake on version change
+ file(READ ${FILE} CHANGES)
+ if(${CHANGES} MATCHES "#+ *([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[a-zA-Z0-9]+)?")
+ set(FLAVOR "")
+ if(NOT "${CMAKE_MATCH_4}" STREQUAL "")
+ string(SUBSTRING ${CMAKE_MATCH_4} 1 -1 FLAVOR)
+ endif()
+ set("${PROJECT}_VERSION_MAJOR" ${CMAKE_MATCH_1} PARENT_SCOPE)
+ set("${PROJECT}_VERSION_MINOR" ${CMAKE_MATCH_2} PARENT_SCOPE)
+ set("${PROJECT}_VERSION_PATCH" ${CMAKE_MATCH_3} PARENT_SCOPE)
+ set("${PROJECT}_VERSION_FLAVOR" ${FLAVOR} PARENT_SCOPE)
+ set("${PROJECT}_VERSION"
+ "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}${CMAKE_MATCH_4}"
+ PARENT_SCOPE)
+ else()
+ message(FATAL_ERROR "Unable to parse version from '${FILE}'")
+ endif()
+endfunction()
