mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use nullptr where possible instead of NULL or 0

Browse Source
This commit is contained in:
Johannes Kauffmann 2022-11-22 19:09:31 +01:00 committed by Jeremy Hayes
parent 728c689574
commit a7603c132d
38 changed files with 248 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OGLCompilersDLL/InitializeDll.cpp
View File

@ -102,7 +102,7 @@ bool InitThread()
return false; return false;
} }
if (OS_GetTLSValue(ThreadInitializeIndex) != 0) if (OS_GetTLSValue(ThreadInitializeIndex) != nullptr)
return true; return true;
if (! OS_SetTLSValue(ThreadInitializeIndex, (void *)1)) { if (! OS_SetTLSValue(ThreadInitializeIndex, (void *)1)) {
@ -130,8 +130,8 @@ bool DetachThread()
// //
// Function is re-entrant and this thread may not have been initialized. // Function is re-entrant and this thread may not have been initialized.
// //
if (OS_GetTLSValue(ThreadInitializeIndex) != 0) { if (OS_GetTLSValue(ThreadInitializeIndex) != nullptr) {
if (!OS_SetTLSValue(ThreadInitializeIndex, (void *)0)) { if (!OS_SetTLSValue(ThreadInitializeIndex, nullptr)) {
assert(0 && "DetachThread(): Unable to clear init flag."); assert(0 && "DetachThread(): Unable to clear init flag.");
success = false; success = false;
} }

2
SPIRV/GlslangToSpv.cpp
View File

@ -9615,7 +9615,7 @@ void GlslangToSpv(const TIntermediate& intermediate, std::vector<unsigned int>&
{ {
TIntermNode* root = intermediate.getTreeRoot(); TIntermNode* root = intermediate.getTreeRoot();
if (root == 0) if (root == nullptr)
return; return;
SpvOptions defaultOptions; SpvOptions defaultOptions;

10
SPIRV/SpvBuilder.cpp
View File

@ -71,9 +71,9 @@ Builder::Builder(unsigned int spvVersion, unsigned int magicNumber, SpvBuildLogg
addressModel(AddressingModelLogical), addressModel(AddressingModelLogical),
memoryModel(MemoryModelGLSL450), memoryModel(MemoryModelGLSL450),
builderNumber(magicNumber), builderNumber(magicNumber),
buildPoint(0), buildPoint(nullptr),
uniqueId(0), uniqueId(0),
entryPointFunction(0), entryPointFunction(nullptr),
generatingOpCodeForSpecConst(false), generatingOpCodeForSpecConst(false),
logger(buildLogger) logger(buildLogger)
{ {
@ -1675,7 +1675,7 @@ Id Builder::importNonSemanticShaderDebugInfoInstructions()
Id Builder::findCompositeConstant(Op typeClass, Id typeId, const std::vector<Id>& comps) Id Builder::findCompositeConstant(Op typeClass, Id typeId, const std::vector<Id>& comps)
{ {
Instruction* constant = 0; Instruction* constant = nullptr;
bool found = false; bool found = false;
for (int i = 0; i < (int)groupedConstants[typeClass].size(); ++i) { for (int i = 0; i < (int)groupedConstants[typeClass].size(); ++i) {
constant = groupedConstants[typeClass][i]; constant = groupedConstants[typeClass][i];
@ -1702,7 +1702,7 @@ Id Builder::findCompositeConstant(Op typeClass, Id typeId, const std::vector<Id>
Id Builder::findStructConstant(Id typeId, const std::vector<Id>& comps) Id Builder::findStructConstant(Id typeId, const std::vector<Id>& comps)
{ {
Instruction* constant = 0; Instruction* constant = nullptr;
bool found = false; bool found = false;
for (int i = 0; i < (int)groupedStructConstants[typeId].size(); ++i) { for (int i = 0; i < (int)groupedStructConstants[typeId].size(); ++i) {
constant = groupedStructConstants[typeId][i]; constant = groupedStructConstants[typeId][i];
@ -3332,7 +3332,7 @@ Builder::If::If(Id cond, unsigned int ctrl, Builder& gb) :
builder(gb), builder(gb),
condition(cond), condition(cond),
control(ctrl), control(ctrl),
elseBlock(0) elseBlock(nullptr)
{ {
function = &builder.getBuildPoint()->getParent(); function = &builder.getBuildPoint()->getParent();

2
SPIRV/SpvBuilder.h
View File

@ -414,7 +414,7 @@ public:
// The returned pointer is only valid for the lifetime of this builder. // The returned pointer is only valid for the lifetime of this builder.
Function* makeFunctionEntry(Decoration precision, Id returnType, const char* name, Function* makeFunctionEntry(Decoration precision, Id returnType, const char* name,
const std::vector<Id>& paramTypes, const std::vector<char const*>& paramNames, const std::vector<Id>& paramTypes, const std::vector<char const*>& paramNames,
const std::vector<std::vector<Decoration>>& precisions, Block **entry = 0); const std::vector<std::vector<Decoration>>& precisions, Block **entry = nullptr);
// Create a return. An 'implicit' return is one not appearing in the source // Create a return. An 'implicit' return is one not appearing in the source
// code. In the case of an implicit return, no post-return block is inserted. // code. In the case of an implicit return, no post-return block is inserted.

4
SPIRV/doc.cpp
View File

@ -1607,7 +1607,7 @@ void Parameterize()
DecorationOperands[DecorationInputAttachmentIndex].push(OperandLiteralNumber, "'Attachment Index'"); DecorationOperands[DecorationInputAttachmentIndex].push(OperandLiteralNumber, "'Attachment Index'");
DecorationOperands[DecorationAlignment].push(OperandLiteralNumber, "'Alignment'"); DecorationOperands[DecorationAlignment].push(OperandLiteralNumber, "'Alignment'");
OperandClassParams[OperandSource].set(0, SourceString, 0); OperandClassParams[OperandSource].set(0, SourceString, nullptr);
OperandClassParams[OperandExecutionModel].set(0, ExecutionModelString, nullptr); OperandClassParams[OperandExecutionModel].set(0, ExecutionModelString, nullptr);
OperandClassParams[OperandAddressing].set(0, AddressingString, nullptr); OperandClassParams[OperandAddressing].set(0, AddressingString, nullptr);
OperandClassParams[OperandMemory].set(0, MemoryString, nullptr); OperandClassParams[OperandMemory].set(0, MemoryString, nullptr);
@ -1639,7 +1639,7 @@ void Parameterize()
OperandClassParams[OperandKernelEnqueueFlags].set(0, KernelEnqueueFlagsString, nullptr); OperandClassParams[OperandKernelEnqueueFlags].set(0, KernelEnqueueFlagsString, nullptr);
OperandClassParams[OperandKernelProfilingInfo].set(0, KernelProfilingInfoString, nullptr, true); OperandClassParams[OperandKernelProfilingInfo].set(0, KernelProfilingInfoString, nullptr, true);
OperandClassParams[OperandCapability].set(0, CapabilityString, nullptr); OperandClassParams[OperandCapability].set(0, CapabilityString, nullptr);
OperandClassParams[OperandOpcode].set(OpCodeMask + 1, OpcodeString, 0); OperandClassParams[OperandOpcode].set(OpCodeMask + 1, OpcodeString, nullptr);
// set name of operator, an initial set of <id> style operands, and the description // set name of operator, an initial set of <id> style operands, and the description

4
SPIRV/doc.h
View File

@ -190,7 +190,7 @@ protected:
// Parameterize an enumerant // Parameterize an enumerant
class EnumParameters { class EnumParameters {
public: public:
EnumParameters() : desc(0) { } EnumParameters() : desc(nullptr) { }
const char* desc; const char* desc;
}; };
@ -198,7 +198,7 @@ public:
class EnumDefinition : public EnumParameters { class EnumDefinition : public EnumParameters {
public: public:
EnumDefinition() : EnumDefinition() :
ceiling(0), bitmask(false), getName(0), enumParams(0), operandParams(0) { } ceiling(0), bitmask(false), getName(nullptr), enumParams(nullptr), operandParams(nullptr) { }
void set(int ceil, const char* (*name)(int), EnumParameters* ep, bool mask = false) void set(int ceil, const char* (*name)(int), EnumParameters* ep, bool mask = false)
{ {
ceiling = ceil; ceiling = ceil;

14
StandAlone/StandAlone.cpp
View File

@ -504,7 +504,7 @@ void ProcessGlobalBlockSettings(int& argc, char**& argv, std::string* name, unsi
if (set) { if (set) {
errno = 0; errno = 0;
int setVal = ::strtol(argv[curArg], NULL, 10); int setVal = ::strtol(argv[curArg], nullptr, 10);
if (errno || setVal < 0) { if (errno || setVal < 0) {
printf("%s: invalid set\n", argv[curArg]); printf("%s: invalid set\n", argv[curArg]);
usage(); usage();
@ -516,7 +516,7 @@ void ProcessGlobalBlockSettings(int& argc, char**& argv, std::string* name, unsi
if (binding) { if (binding) {
errno = 0; errno = 0;
int bindingVal = ::strtol(argv[curArg], NULL, 10); int bindingVal = ::strtol(argv[curArg], nullptr, 10);
if (errno || bindingVal < 0) { if (errno || bindingVal < 0) {
printf("%s: invalid binding\n", argv[curArg]); printf("%s: invalid binding\n", argv[curArg]);
usage(); usage();
@ -594,12 +594,12 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
const auto getUniformOverride = [getStringOperand]() { const auto getUniformOverride = [getStringOperand]() {
const char *arg = getStringOperand("-u<name>:<location>"); const char *arg = getStringOperand("-u<name>:<location>");
const char *split = strchr(arg, ':'); const char *split = strchr(arg, ':');
if (split == NULL) { if (split == nullptr) {
printf("%s: missing location\n", arg); printf("%s: missing location\n", arg);
exit(EFailUsage); exit(EFailUsage);
} }
errno = 0; errno = 0;
int location = ::strtol(split + 1, NULL, 10); int location = ::strtol(split + 1, nullptr, 10);
if (errno) { if (errno) {
printf("%s: invalid location\n", arg); printf("%s: invalid location\n", arg);
exit(EFailUsage); exit(EFailUsage);
@ -626,7 +626,7 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
} else if (lowerword == "uniform-base") { } else if (lowerword == "uniform-base") {
if (argc <= 1) if (argc <= 1)
Error("no <base> provided", lowerword.c_str()); Error("no <base> provided", lowerword.c_str());
uniformBase = ::strtol(argv[1], NULL, 10); uniformBase = ::strtol(argv[1], nullptr, 10);
bumpArg(); bumpArg();
break; break;
} else if (lowerword == "client") { } else if (lowerword == "client") {
@ -1161,7 +1161,7 @@ void CompileShaders(glslang::TWorklist& worklist)
} else { } else {
while (worklist.remove(workItem)) { while (worklist.remove(workItem)) {
ShHandle compiler = ShConstructCompiler(FindLanguage(workItem->name), Options); ShHandle compiler = ShConstructCompiler(FindLanguage(workItem->name), Options);
if (compiler == 0) if (compiler == nullptr)
return; return;
CompileFile(workItem->name.c_str(), compiler); CompileFile(workItem->name.c_str(), compiler);
@ -1297,7 +1297,7 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
sources.push_back(compUnit.fileNameList[i]); sources.push_back(compUnit.fileNameList[i]);
} }
glslang::TShader* shader = new glslang::TShader(compUnit.stage); glslang::TShader* shader = new glslang::TShader(compUnit.stage);
shader->setStringsWithLengthsAndNames(compUnit.text, NULL, compUnit.fileNameList, compUnit.count); shader->setStringsWithLengthsAndNames(compUnit.text, nullptr, compUnit.fileNameList, compUnit.count);
if (entryPointName) if (entryPointName)
shader->setEntryPoint(entryPointName); shader->setEntryPoint(entryPointName);
if (sourceEntryPointName) { if (sourceEntryPointName) {

4
StandAlone/spirv-remap.cpp
View File

@ -157,7 +157,7 @@ namespace {
} }
// Print helpful usage message to stdout, and exit // Print helpful usage message to stdout, and exit
void usage(const char* const name, const char* const msg = 0) void usage(const char* const name, const char* const msg = nullptr)
{ {
if (msg) if (msg)
std::cout << msg << std::endl << std::endl; std::cout << msg << std::endl << std::endl;
@ -245,7 +245,7 @@ namespace {
verbosity = 1; verbosity = 1;
if (a < argc) { if (a < argc) {
char* end_ptr = 0; char* end_ptr = nullptr;
int verb = ::strtol(argv[a], &end_ptr, 10); int verb = ::strtol(argv[a], &end_ptr, 10);
// If we have not read to the end of the string or // If we have not read to the end of the string or
// the string contained no elements, then we do not want to // the string contained no elements, then we do not want to

2
gen_extension_headers.py
View File

@ -57,7 +57,7 @@ def generate_main(glsl_files, output_header_file):
contents += '\tfor (int i = 0; i < n; i++) {\n' contents += '\tfor (int i = 0; i < n; i++) {\n'
for symbol_name in symbol_name_list: for symbol_name in symbol_name_list:
contents += '\t\tif (strstr(shaders[i], "%s") != NULL) {\n' % (symbol_name) contents += '\t\tif (strstr(shaders[i], "%s") != nullptr) {\n' % (symbol_name)
contents += '\t\t shaderString.append(%s_GLSL);\n' % (symbol_name) contents += '\t\t shaderString.append(%s_GLSL);\n' % (symbol_name)
contents += '\t\t}\n' contents += '\t\t}\n'

2
glslang/GenericCodeGen/Link.cpp
View File

@ -82,7 +82,7 @@ void DeleteUniformMap(TUniformMap* map)
TShHandleBase* ConstructBindings() TShHandleBase* ConstructBindings()
{ {
return 0; return nullptr;
} }
void DeleteBindingList(TShHandleBase* bindingList) void DeleteBindingList(TShHandleBase* bindingList)

2
glslang/HLSL/hlslGrammar.cpp
View File

@ -3794,7 +3794,7 @@ bool HlslGrammar::acceptIterationStatement(TIntermNode*& statement, const TAttri
parseContext.unnestLooping(); parseContext.unnestLooping();
--parseContext.controlFlowNestingLevel; --parseContext.controlFlowNestingLevel;
loopNode = intermediate.addLoop(statement, condition, 0, false, loc); loopNode = intermediate.addLoop(statement, condition, nullptr, false, loc);
statement = loopNode; statement = loopNode;
break; break;

10
glslang/HLSL/hlslParseHelper.cpp
View File

@ -1596,7 +1596,7 @@ void HlslParseContext::handleFunctionDeclarator(const TSourceLoc& loc, TFunction
// //
bool builtIn; bool builtIn;
TSymbol* symbol = symbolTable.find(function.getMangledName(), &builtIn); TSymbol* symbol = symbolTable.find(function.getMangledName(), &builtIn);
const TFunction* prevDec = symbol ? symbol->getAsFunction() : 0; const TFunction* prevDec = symbol ? symbol->getAsFunction() : nullptr;
if (prototype) { if (prototype) {
// All built-in functions are defined, even though they don't have a body. // All built-in functions are defined, even though they don't have a body.
@ -2472,7 +2472,7 @@ TIntermNode* HlslParseContext::handleReturnValue(const TSourceLoc& loc, TIntermT
void HlslParseContext::handleFunctionArgument(TFunction* function, void HlslParseContext::handleFunctionArgument(TFunction* function,
TIntermTyped*& arguments, TIntermTyped* newArg) TIntermTyped*& arguments, TIntermTyped* newArg)
{ {
TParameter param = { 0, new TType, nullptr }; TParameter param = { nullptr, new TType, nullptr };
param.type->shallowCopy(newArg->getType()); param.type->shallowCopy(newArg->getType());
function->addParameter(param); function->addParameter(param);
@ -7790,18 +7790,18 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, TFunction
// Handle aggregates: put all args into the new function call // Handle aggregates: put all args into the new function call
for (int arg = 0; arg < int(args->getAsAggregate()->getSequence().size()); ++arg) { for (int arg = 0; arg < int(args->getAsAggregate()->getSequence().size()); ++arg) {
// TODO: But for constness, we could avoid the new & shallowCopy, and use the pointer directly. // TODO: But for constness, we could avoid the new & shallowCopy, and use the pointer directly.
TParameter param = { 0, new TType, nullptr }; TParameter param = { nullptr, new TType, nullptr };
param.type->shallowCopy(args->getAsAggregate()->getSequence()[arg]->getAsTyped()->getType()); param.type->shallowCopy(args->getAsAggregate()->getSequence()[arg]->getAsTyped()->getType());
convertedCall.addParameter(param); convertedCall.addParameter(param);
} }
} else if (args->getAsUnaryNode()) { } else if (args->getAsUnaryNode()) {
// Handle unaries: put all args into the new function call // Handle unaries: put all args into the new function call
TParameter param = { 0, new TType, nullptr }; TParameter param = { nullptr, new TType, nullptr };
param.type->shallowCopy(args->getAsUnaryNode()->getOperand()->getAsTyped()->getType()); param.type->shallowCopy(args->getAsUnaryNode()->getOperand()->getAsTyped()->getType());
convertedCall.addParameter(param); convertedCall.addParameter(param);
} else if (args->getAsTyped()) { } else if (args->getAsTyped()) {
// Handle bare e.g, floats, not in an aggregate. // Handle bare e.g, floats, not in an aggregate.
TParameter param = { 0, new TType, nullptr }; TParameter param = { nullptr, new TType, nullptr };
param.type->shallowCopy(args->getAsTyped()->getType()); param.type->shallowCopy(args->getAsTyped()->getType());
convertedCall.addParameter(param); convertedCall.addParameter(param);
} else { } else {

8
glslang/HLSL/hlslParseHelper.h
View File

@ -147,14 +147,14 @@ public:
void declareTypedef(const TSourceLoc&, const TString& identifier, const TType&); void declareTypedef(const TSourceLoc&, const TString& identifier, const TType&);
void declareStruct(const TSourceLoc&, TString& structName, TType&); void declareStruct(const TSourceLoc&, TString& structName, TType&);
TSymbol* lookupUserType(const TString&, TType&); TSymbol* lookupUserType(const TString&, TType&);
TIntermNode* declareVariable(const TSourceLoc&, const TString& identifier, TType&, TIntermTyped* initializer = 0); TIntermNode* declareVariable(const TSourceLoc&, const TString& identifier, TType&, TIntermTyped* initializer = nullptr);
void lengthenList(const TSourceLoc&, TIntermSequence& list, int size, TIntermTyped* scalarInit); void lengthenList(const TSourceLoc&, TIntermSequence& list, int size, TIntermTyped* scalarInit);
TIntermTyped* handleConstructor(const TSourceLoc&, TIntermTyped*, const TType&); TIntermTyped* handleConstructor(const TSourceLoc&, TIntermTyped*, const TType&);
TIntermTyped* addConstructor(const TSourceLoc&, TIntermTyped*, const TType&); TIntermTyped* addConstructor(const TSourceLoc&, TIntermTyped*, const TType&);
TIntermTyped* convertArray(TIntermTyped*, const TType&); TIntermTyped* convertArray(TIntermTyped*, const TType&);
TIntermTyped* constructAggregate(TIntermNode*, const TType&, int, const TSourceLoc&); TIntermTyped* constructAggregate(TIntermNode*, const TType&, int, const TSourceLoc&);
TIntermTyped* constructBuiltIn(const TType&, TOperator, TIntermTyped*, const TSourceLoc&, bool subset); TIntermTyped* constructBuiltIn(const TType&, TOperator, TIntermTyped*, const TSourceLoc&, bool subset);
void declareBlock(const TSourceLoc&, TType&, const TString* instanceName = 0); void declareBlock(const TSourceLoc&, TType&, const TString* instanceName = nullptr);
void declareStructBufferCounter(const TSourceLoc& loc, const TType& bufferType, const TString& name); void declareStructBufferCounter(const TSourceLoc& loc, const TType& bufferType, const TString& name);
void fixBlockLocations(const TSourceLoc&, TQualifier&, TTypeList&, bool memberWithLocation, bool memberWithoutLocation); void fixBlockLocations(const TSourceLoc&, TQualifier&, TTypeList&, bool memberWithLocation, bool memberWithoutLocation);
void fixXfbOffsets(TQualifier&, TTypeList&); void fixXfbOffsets(TQualifier&, TTypeList&);
@ -171,10 +171,10 @@ public:
void unnestAnnotations() { --annotationNestingLevel; } void unnestAnnotations() { --annotationNestingLevel; }
int getAnnotationNestingLevel() { return annotationNestingLevel; } int getAnnotationNestingLevel() { return annotationNestingLevel; }
void pushScope() { symbolTable.push(); } void pushScope() { symbolTable.push(); }
void popScope() { symbolTable.pop(0); } void popScope() { symbolTable.pop(nullptr); }
void pushThisScope(const TType&, const TVector<TFunctionDeclarator>&); void pushThisScope(const TType&, const TVector<TFunctionDeclarator>&);
void popThisScope() { symbolTable.pop(0); } void popThisScope() { symbolTable.pop(nullptr); }
void pushImplicitThis(TVariable* thisParameter) { implicitThisStack.push_back(thisParameter); } void pushImplicitThis(TVariable* thisParameter) { implicitThisStack.push_back(thisParameter); }
void popImplicitThis() { implicitThisStack.pop_back(); } void popImplicitThis() { implicitThisStack.pop_back(); }

6
glslang/Include/PoolAlloc.h
View File

@ -74,7 +74,7 @@ namespace glslang {
class TAllocation { class TAllocation {
public: public:
TAllocation(size_t size, unsigned char* mem, TAllocation* prev = 0) : TAllocation(size_t size, unsigned char* mem, TAllocation* prev = nullptr) :
size(size), mem(mem), prevAlloc(prev) { size(size), mem(mem), prevAlloc(prev) {
// Allocations are bracketed: // Allocations are bracketed:
// [allocationHeader][initialGuardBlock][userData][finalGuardBlock] // [allocationHeader][initialGuardBlock][userData][finalGuardBlock]
@ -171,7 +171,7 @@ public:
void popAll(); void popAll();
// //
// Call allocate() to actually acquire memory. Returns 0 if no memory // Call allocate() to actually acquire memory. Returns nullptr if no memory
// available, otherwise a properly aligned pointer to 'numBytes' of memory. // available, otherwise a properly aligned pointer to 'numBytes' of memory.
// //
void* allocate(size_t numBytes); void* allocate(size_t numBytes);
@ -189,7 +189,7 @@ protected:
struct tHeader { struct tHeader {
tHeader(tHeader* nextPage, size_t pageCount) : tHeader(tHeader* nextPage, size_t pageCount) :
#ifdef GUARD_BLOCKS #ifdef GUARD_BLOCKS
lastAllocation(0), lastAllocation(nullptr),
#endif #endif
nextPage(nextPage), pageCount(pageCount) { } nextPage(nextPage), pageCount(pageCount) { }

16
glslang/Include/ShHandle.h
View File

@ -58,9 +58,9 @@ class TShHandleBase {
public: public:
TShHandleBase() { pool = new glslang::TPoolAllocator; } TShHandleBase() { pool = new glslang::TPoolAllocator; }
virtual ~TShHandleBase() { delete pool; } virtual ~TShHandleBase() { delete pool; }
virtual TCompiler* getAsCompiler() { return 0; } virtual TCompiler* getAsCompiler() { return nullptr; }
virtual TLinker* getAsLinker() { return 0; } virtual TLinker* getAsLinker() { return nullptr; }
virtual TUniformMap* getAsUniformMap() { return 0; } virtual TUniformMap* getAsUniformMap() { return nullptr; }
virtual glslang::TPoolAllocator* getPool() const { return pool; } virtual glslang::TPoolAllocator* getPool() const { return pool; }
private: private:
glslang::TPoolAllocator* pool; glslang::TPoolAllocator* pool;
@ -123,11 +123,11 @@ public:
infoSink(iSink), infoSink(iSink),
executable(e), executable(e),
haveReturnableObjectCode(false), haveReturnableObjectCode(false),
appAttributeBindings(0), appAttributeBindings(nullptr),
fixedAttributeBindings(0), fixedAttributeBindings(nullptr),
excludedAttributes(0), excludedAttributes(nullptr),
excludedCount(0), excludedCount(0),
uniformBindings(0) { } uniformBindings(nullptr) { }
virtual TLinker* getAsLinker() { return this; } virtual TLinker* getAsLinker() { return this; }
virtual ~TLinker() { } virtual ~TLinker() { }
virtual bool link(TCompilerList&, TUniformMap*) = 0; virtual bool link(TCompilerList&, TUniformMap*) = 0;
@ -137,7 +137,7 @@ public:
virtual void getAttributeBindings(ShBindingTable const **t) const = 0; virtual void getAttributeBindings(ShBindingTable const **t) const = 0;
virtual void setExcludedAttributes(const int* attributes, int count) { excludedAttributes = attributes; excludedCount = count; } virtual void setExcludedAttributes(const int* attributes, int count) { excludedAttributes = attributes; excludedCount = count; }
virtual ShBindingTable* getUniformBindings() const { return uniformBindings; } virtual ShBindingTable* getUniformBindings() const { return uniformBindings; }
virtual const void* getObjectCode() const { return 0; } // a real compiler would be returning object code here virtual const void* getObjectCode() const { return nullptr; } // a real compiler would be returning object code here
virtual TInfoSink& getInfoSink() { return infoSink; } virtual TInfoSink& getInfoSink() { return infoSink; }
TInfoSink& infoSink; TInfoSink& infoSink;
protected: protected:

54
glslang/Include/intermediate.h
View File

@ -1086,31 +1086,31 @@ public:
virtual const glslang::TSourceLoc& getLoc() const { return loc; } virtual const glslang::TSourceLoc& getLoc() const { return loc; }
virtual void setLoc(const glslang::TSourceLoc& l) { loc = l; } virtual void setLoc(const glslang::TSourceLoc& l) { loc = l; }
virtual void traverse(glslang::TIntermTraverser*) = 0; virtual void traverse(glslang::TIntermTraverser*) = 0;
virtual glslang::TIntermTyped* getAsTyped() { return 0; } virtual glslang::TIntermTyped* getAsTyped() { return nullptr; }
virtual glslang::TIntermOperator* getAsOperator() { return 0; } virtual glslang::TIntermOperator* getAsOperator() { return nullptr; }
virtual glslang::TIntermConstantUnion* getAsConstantUnion() { return 0; } virtual glslang::TIntermConstantUnion* getAsConstantUnion() { return nullptr; }
virtual glslang::TIntermAggregate* getAsAggregate() { return 0; } virtual glslang::TIntermAggregate* getAsAggregate() { return nullptr; }
virtual glslang::TIntermUnary* getAsUnaryNode() { return 0; } virtual glslang::TIntermUnary* getAsUnaryNode() { return nullptr; }
virtual glslang::TIntermBinary* getAsBinaryNode() { return 0; } virtual glslang::TIntermBinary* getAsBinaryNode() { return nullptr; }
virtual glslang::TIntermSelection* getAsSelectionNode() { return 0; } virtual glslang::TIntermSelection* getAsSelectionNode() { return nullptr; }
virtual glslang::TIntermSwitch* getAsSwitchNode() { return 0; } virtual glslang::TIntermSwitch* getAsSwitchNode() { return nullptr; }
virtual glslang::TIntermMethod* getAsMethodNode() { return 0; } virtual glslang::TIntermMethod* getAsMethodNode() { return nullptr; }
virtual glslang::TIntermSymbol* getAsSymbolNode() { return 0; } virtual glslang::TIntermSymbol* getAsSymbolNode() { return nullptr; }
virtual glslang::TIntermBranch* getAsBranchNode() { return 0; } virtual glslang::TIntermBranch* getAsBranchNode() { return nullptr; }
virtual glslang::TIntermLoop* getAsLoopNode() { return 0; } virtual glslang::TIntermLoop* getAsLoopNode() { return nullptr; }
virtual const glslang::TIntermTyped* getAsTyped() const { return 0; } virtual const glslang::TIntermTyped* getAsTyped() const { return nullptr; }
virtual const glslang::TIntermOperator* getAsOperator() const { return 0; } virtual const glslang::TIntermOperator* getAsOperator() const { return nullptr; }
virtual const glslang::TIntermConstantUnion* getAsConstantUnion() const { return 0; } virtual const glslang::TIntermConstantUnion* getAsConstantUnion() const { return nullptr; }
virtual const glslang::TIntermAggregate* getAsAggregate() const { return 0; } virtual const glslang::TIntermAggregate* getAsAggregate() const { return nullptr; }
virtual const glslang::TIntermUnary* getAsUnaryNode() const { return 0; } virtual const glslang::TIntermUnary* getAsUnaryNode() const { return nullptr; }
virtual const glslang::TIntermBinary* getAsBinaryNode() const { return 0; } virtual const glslang::TIntermBinary* getAsBinaryNode() const { return nullptr; }
virtual const glslang::TIntermSelection* getAsSelectionNode() const { return 0; } virtual const glslang::TIntermSelection* getAsSelectionNode() const { return nullptr; }
virtual const glslang::TIntermSwitch* getAsSwitchNode() const { return 0; } virtual const glslang::TIntermSwitch* getAsSwitchNode() const { return nullptr; }
virtual const glslang::TIntermMethod* getAsMethodNode() const { return 0; } virtual const glslang::TIntermMethod* getAsMethodNode() const { return nullptr; }
virtual const glslang::TIntermSymbol* getAsSymbolNode() const { return 0; } virtual const glslang::TIntermSymbol* getAsSymbolNode() const { return nullptr; }
virtual const glslang::TIntermBranch* getAsBranchNode() const { return 0; } virtual const glslang::TIntermBranch* getAsBranchNode() const { return nullptr; }
virtual const glslang::TIntermLoop* getAsLoopNode() const { return 0; } virtual const glslang::TIntermLoop* getAsLoopNode() const { return nullptr; }
virtual ~TIntermNode() { } virtual ~TIntermNode() { }
protected: protected:
@ -1616,8 +1616,8 @@ protected:
// //
class TIntermUnary : public TIntermOperator { class TIntermUnary : public TIntermOperator {
public: public:
TIntermUnary(TOperator o, TType& t) : TIntermOperator(o, t), operand(0) {} TIntermUnary(TOperator o, TType& t) : TIntermOperator(o, t), operand(nullptr) {}
TIntermUnary(TOperator o) : TIntermOperator(o), operand(0) {} TIntermUnary(TOperator o) : TIntermOperator(o), operand(nullptr) {}
virtual void traverse(TIntermTraverser*); virtual void traverse(TIntermTraverser*);
virtual void setOperand(TIntermTyped* o) { operand = o; } virtual void setOperand(TIntermTyped* o) { operand = o; }
virtual TIntermTyped* getOperand() { return operand; } virtual TIntermTyped* getOperand() { return operand; }
@ -1819,7 +1819,7 @@ public:
TIntermNode *getParentNode() TIntermNode *getParentNode()
{ {
return path.size() == 0 ? NULL : path.back(); return path.size() == 0 ? nullptr : path.back();
} }
const bool preVisit; const bool preVisit;

10
glslang/MachineIndependent/Constant.cpp
View File

@ -226,7 +226,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TIntermTyped* right
newConstArray[i].setU64Const(leftUnionArray[i].getU64Const() / rightUnionArray[i].getU64Const()); newConstArray[i].setU64Const(leftUnionArray[i].getU64Const() / rightUnionArray[i].getU64Const());
break; break;
default: default:
return 0; return nullptr;
#endif #endif
} }
} }
@ -354,7 +354,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TIntermTyped* right
break; break;
default: default:
return 0; return nullptr;
} }
TIntermConstantUnion *newNode = new TIntermConstantUnion(newConstArray, returnType); TIntermConstantUnion *newNode = new TIntermConstantUnion(newConstArray, returnType);
@ -1345,7 +1345,7 @@ TIntermTyped* TIntermediate::foldDereference(TIntermTyped* node, int index, cons
{ {
TType dereferencedType(node->getType(), index); TType dereferencedType(node->getType(), index);
dereferencedType.getQualifier().storage = EvqConst; dereferencedType.getQualifier().storage = EvqConst;
TIntermTyped* result = 0; TIntermTyped* result = nullptr;
int size = dereferencedType.computeNumComponents(); int size = dereferencedType.computeNumComponents();
// arrays, vectors, matrices, all use simple multiplicative math // arrays, vectors, matrices, all use simple multiplicative math
@ -1365,7 +1365,7 @@ TIntermTyped* TIntermediate::foldDereference(TIntermTyped* node, int index, cons
result = addConstantUnion(TConstUnionArray(node->getAsConstantUnion()->getConstArray(), start, size), node->getType(), loc); result = addConstantUnion(TConstUnionArray(node->getAsConstantUnion()->getConstArray(), start, size), node->getType(), loc);
if (result == 0) if (result == nullptr)
result = node; result = node;
else else
result->setType(dereferencedType); result->setType(dereferencedType);
@ -1387,7 +1387,7 @@ TIntermTyped* TIntermediate::foldSwizzle(TIntermTyped* node, TSwizzleSelectors<T
TIntermTyped* result = addConstantUnion(constArray, node->getType(), loc); TIntermTyped* result = addConstantUnion(constArray, node->getType(), loc);
if (result == 0) if (result == nullptr)
result = node; result = node;
else else
result->setType(TType(node->getBasicType(), EvqConst, selectors.size())); result->setType(TType(node->getBasicType(), EvqConst, selectors.size()));

2
glslang/MachineIndependent/Intermediate.cpp
View File

@ -352,7 +352,7 @@ TIntermTyped* TIntermediate::addIndex(TOperator op, TIntermTyped* base, TIntermT
TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermTyped* child, TIntermTyped* TIntermediate::addUnaryMath(TOperator op, TIntermTyped* child,
const TSourceLoc& loc) const TSourceLoc& loc)
{ {
if (child == 0) if (child == nullptr)
return nullptr; return nullptr;
if (child->getType().getBasicType() == EbtBlock) if (child->getType().getBasicType() == EbtBlock)

12
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -1165,7 +1165,7 @@ TFunction* TParseContext::handleFunctionDeclarator(const TSourceLoc& loc, TFunct
if (symbol && builtIn && function.getBuiltInOp() == EOpSpirvInst) if (symbol && builtIn && function.getBuiltInOp() == EOpSpirvInst)
symbol = nullptr; symbol = nullptr;
#endif #endif
const TFunction* prevDec = symbol ? symbol->getAsFunction() : 0; const TFunction* prevDec = symbol ? symbol->getAsFunction() : nullptr;
if (prevDec) { if (prevDec) {
if (prevDec->isPrototyped() && prototype) if (prevDec->isPrototyped() && prototype)
profileRequires(loc, EEsProfile, 300, nullptr, "multiple prototypes for same function"); profileRequires(loc, EEsProfile, 300, nullptr, "multiple prototypes for same function");
@ -3140,7 +3140,7 @@ void TParseContext::reservedPpErrorCheck(const TSourceLoc& loc, const char* iden
ppWarn(loc, "\"defined\" is (un)defined:", op, identifier); ppWarn(loc, "\"defined\" is (un)defined:", op, identifier);
else else
ppError(loc, "\"defined\" can't be (un)defined:", op, identifier); ppError(loc, "\"defined\" can't be (un)defined:", op, identifier);
else if (strstr(identifier, "__") != 0 && !extensionTurnedOn(E_GL_EXT_spirv_intrinsics)) { else if (strstr(identifier, "__") != nullptr && !extensionTurnedOn(E_GL_EXT_spirv_intrinsics)) {
// The extension GL_EXT_spirv_intrinsics allows us to declare macros prefixed with "__". // The extension GL_EXT_spirv_intrinsics allows us to declare macros prefixed with "__".
if (isEsProfile() && version >= 300 && if (isEsProfile() && version >= 300 &&
(strcmp(identifier, "__LINE__") == 0 || (strcmp(identifier, "__LINE__") == 0 ||
@ -5206,7 +5206,7 @@ void TParseContext::inductiveLoopCheck(const TSourceLoc& loc, TIntermNode* init,
bool badInit = false; bool badInit = false;
if (! init || ! init->getAsAggregate() || init->getAsAggregate()->getSequence().size() != 1) if (! init || ! init->getAsAggregate() || init->getAsAggregate()->getSequence().size() != 1)
badInit = true; badInit = true;
TIntermBinary* binaryInit = 0; TIntermBinary* binaryInit = nullptr;
if (! badInit) { if (! badInit) {
// get the declaration assignment // get the declaration assignment
binaryInit = init->getAsAggregate()->getSequence()[0]->getAsBinaryNode(); binaryInit = init->getAsAggregate()->getSequence()[0]->getAsBinaryNode();
@ -6015,7 +6015,7 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi
if (language == EShLangMesh || language == EShLangTask) { if (language == EShLangMesh || language == EShLangTask) {
requireExtensions(loc, Num_AEP_mesh_shader, AEP_mesh_shader, "gl_WorkGroupSize"); requireExtensions(loc, Num_AEP_mesh_shader, AEP_mesh_shader, "gl_WorkGroupSize");
} else { } else {
profileRequires(loc, EEsProfile, 310, 0, "gl_WorkGroupSize"); profileRequires(loc, EEsProfile, 310, nullptr, "gl_WorkGroupSize");
profileRequires(loc, ~EEsProfile, 430, E_GL_ARB_compute_shader, "gl_WorkGroupSize"); profileRequires(loc, ~EEsProfile, 430, E_GL_ARB_compute_shader, "gl_WorkGroupSize");
} }
#endif #endif
@ -7082,7 +7082,7 @@ TIntermTyped* TParseContext::vkRelaxedRemapFunctionCall(const TSourceLoc& loc, T
realFunc.addParameter(TParameter().copyParam((*function)[i])); realFunc.addParameter(TParameter().copyParam((*function)[i]));
} }
TParameter tmpP = { 0, &uintType }; TParameter tmpP = { nullptr, &uintType };
realFunc.addParameter(TParameter().copyParam(tmpP)); realFunc.addParameter(TParameter().copyParam(tmpP));
arguments = intermediate.growAggregate(arguments, intermediate.addConstantUnion(1, loc, true)); arguments = intermediate.growAggregate(arguments, intermediate.addConstantUnion(1, loc, true));
@ -7099,7 +7099,7 @@ TIntermTyped* TParseContext::vkRelaxedRemapFunctionCall(const TSourceLoc& loc, T
realFunc.addParameter(TParameter().copyParam((*function)[i])); realFunc.addParameter(TParameter().copyParam((*function)[i]));
} }
TParameter tmpP = { 0, &uintType }; TParameter tmpP = { nullptr, &uintType };
realFunc.addParameter(TParameter().copyParam(tmpP)); realFunc.addParameter(TParameter().copyParam(tmpP));
arguments = intermediate.growAggregate(arguments, intermediate.addConstantUnion(-1, loc, true)); arguments = intermediate.growAggregate(arguments, intermediate.addConstantUnion(-1, loc, true));

4
glslang/MachineIndependent/ParseHelper.h
View File

@ -438,12 +438,12 @@ public:
const TFunction* findFunction400(const TSourceLoc& loc, const TFunction& call, bool& builtIn); const TFunction* findFunction400(const TSourceLoc& loc, const TFunction& call, bool& builtIn);
const TFunction* findFunctionExplicitTypes(const TSourceLoc& loc, const TFunction& call, bool& builtIn); const TFunction* findFunctionExplicitTypes(const TSourceLoc& loc, const TFunction& call, bool& builtIn);
void declareTypeDefaults(const TSourceLoc&, const TPublicType&); void declareTypeDefaults(const TSourceLoc&, const TPublicType&);
TIntermNode* declareVariable(const TSourceLoc&, TString& identifier, const TPublicType&, TArraySizes* typeArray = 0, TIntermTyped* initializer = 0); TIntermNode* declareVariable(const TSourceLoc&, TString& identifier, const TPublicType&, TArraySizes* typeArray = nullptr, TIntermTyped* initializer = nullptr);
TIntermTyped* addConstructor(const TSourceLoc&, TIntermNode*, const TType&); TIntermTyped* addConstructor(const TSourceLoc&, TIntermNode*, const TType&);
TIntermTyped* constructAggregate(TIntermNode*, const TType&, int, const TSourceLoc&); TIntermTyped* constructAggregate(TIntermNode*, const TType&, int, const TSourceLoc&);
TIntermTyped* constructBuiltIn(const TType&, TOperator, TIntermTyped*, const TSourceLoc&, bool subset); TIntermTyped* constructBuiltIn(const TType&, TOperator, TIntermTyped*, const TSourceLoc&, bool subset);
void inheritMemoryQualifiers(const TQualifier& from, TQualifier& to); void inheritMemoryQualifiers(const TQualifier& from, TQualifier& to);
void declareBlock(const TSourceLoc&, TTypeList& typeList, const TString* instanceName = 0, TArraySizes* arraySizes = 0); void declareBlock(const TSourceLoc&, TTypeList& typeList, const TString* instanceName = nullptr, TArraySizes* arraySizes = nullptr);
void blockStorageRemap(const TSourceLoc&, const TString*, TQualifier&); void blockStorageRemap(const TSourceLoc&, const TString*, TQualifier&);
void blockStageIoCheck(const TSourceLoc&, const TQualifier&); void blockStageIoCheck(const TSourceLoc&, const TQualifier&);
void blockQualifierCheck(const TSourceLoc&, const TQualifier&, bool instanceName); void blockQualifierCheck(const TSourceLoc&, const TQualifier&, bool instanceName);

10
glslang/MachineIndependent/PoolAlloc.cpp
View File

@ -267,8 +267,8 @@ void* TPoolAllocator::allocate(size_t numBytes)
// //
size_t numBytesToAlloc = allocationSize + headerSkip; size_t numBytesToAlloc = allocationSize + headerSkip;
tHeader* memory = reinterpret_cast<tHeader*>(::new char[numBytesToAlloc]); tHeader* memory = reinterpret_cast<tHeader*>(::new char[numBytesToAlloc]);
if (memory == 0) if (memory == nullptr)
return 0; return nullptr;
// Use placement-new to initialize header // Use placement-new to initialize header
new(memory) tHeader(inUseList, (numBytesToAlloc + pageSize - 1) / pageSize); new(memory) tHeader(inUseList, (numBytesToAlloc + pageSize - 1) / pageSize);
@ -289,8 +289,8 @@ void* TPoolAllocator::allocate(size_t numBytes)
freeList = freeList->nextPage; freeList = freeList->nextPage;
} else { } else {
memory = reinterpret_cast<tHeader*>(::new char[pageSize]); memory = reinterpret_cast<tHeader*>(::new char[pageSize]);
if (memory == 0) if (memory == nullptr)
return 0; return nullptr;
} }
// Use placement-new to initialize header // Use placement-new to initialize header
@ -308,7 +308,7 @@ void* TPoolAllocator::allocate(size_t numBytes)
// //
void TAllocation::checkAllocList() const void TAllocation::checkAllocList() const
{ {
for (const TAllocation* alloc = this; alloc != 0; alloc = alloc->prevAlloc) for (const TAllocation* alloc = this; alloc != nullptr; alloc = alloc->prevAlloc)
alloc->check(); alloc->check();
} }

60
glslang/MachineIndependent/ShaderLang.cpp
View File

@ -1357,7 +1357,7 @@ int ShInitialize()
ShHandle ShConstructCompiler(const EShLanguage language, int debugOptions) ShHandle ShConstructCompiler(const EShLanguage language, int debugOptions)
{ {
if (!InitThread()) if (!InitThread())
return 0; return nullptr;
TShHandleBase* base = static_cast<TShHandleBase*>(ConstructCompiler(language, debugOptions)); TShHandleBase* base = static_cast<TShHandleBase*>(ConstructCompiler(language, debugOptions));
@ -1367,7 +1367,7 @@ ShHandle ShConstructCompiler(const EShLanguage language, int debugOptions)
ShHandle ShConstructLinker(const EShExecutable executable, int debugOptions) ShHandle ShConstructLinker(const EShExecutable executable, int debugOptions)
{ {
if (!InitThread()) if (!InitThread())
return 0; return nullptr;
TShHandleBase* base = static_cast<TShHandleBase*>(ConstructLinker(executable, debugOptions)); TShHandleBase* base = static_cast<TShHandleBase*>(ConstructLinker(executable, debugOptions));
@ -1377,7 +1377,7 @@ ShHandle ShConstructLinker(const EShExecutable executable, int debugOptions)
ShHandle ShConstructUniformMap() ShHandle ShConstructUniformMap()
{ {
if (!InitThread()) if (!InitThread())
return 0; return nullptr;
TShHandleBase* base = static_cast<TShHandleBase*>(ConstructUniformMap()); TShHandleBase* base = static_cast<TShHandleBase*>(ConstructUniformMap());
@ -1386,7 +1386,7 @@ ShHandle ShConstructUniformMap()
void ShDestruct(ShHandle handle) void ShDestruct(ShHandle handle)
{ {
if (handle == 0) if (handle == nullptr)
return; return;
TShHandleBase* base = static_cast<TShHandleBase*>(handle); TShHandleBase* base = static_cast<TShHandleBase*>(handle);
@ -1419,7 +1419,7 @@ int ShFinalize()
for (int source = 0; source < SourceCount; ++source) { for (int source = 0; source < SourceCount; ++source) {
for (int stage = 0; stage < EShLangCount; ++stage) { for (int stage = 0; stage < EShLangCount; ++stage) {
delete SharedSymbolTables[version][spvVersion][p][source][stage]; delete SharedSymbolTables[version][spvVersion][p][source][stage];
SharedSymbolTables[version][spvVersion][p][source][stage] = 0; SharedSymbolTables[version][spvVersion][p][source][stage] = nullptr;
} }
} }
} }
@ -1432,7 +1432,7 @@ int ShFinalize()
for (int source = 0; source < SourceCount; ++source) { for (int source = 0; source < SourceCount; ++source) {
for (int pc = 0; pc < EPcCount; ++pc) { for (int pc = 0; pc < EPcCount; ++pc) {
delete CommonSymbolTable[version][spvVersion][p][source][pc]; delete CommonSymbolTable[version][spvVersion][p][source][pc];
CommonSymbolTable[version][spvVersion][p][source][pc] = 0; CommonSymbolTable[version][spvVersion][p][source][pc] = nullptr;
} }
} }
} }
@ -1475,12 +1475,12 @@ int ShCompile(
) )
{ {
// Map the generic handle to the C++ object // Map the generic handle to the C++ object
if (handle == 0) if (handle == nullptr)
return 0; return 0;
TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle); TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
TCompiler* compiler = base->getAsCompiler(); TCompiler* compiler = base->getAsCompiler();
if (compiler == 0) if (compiler == nullptr)
return 0; return 0;
SetThreadPoolAllocator(compiler->getPool()); SetThreadPoolAllocator(compiler->getPool());
@ -1520,13 +1520,13 @@ int ShLinkExt(
const ShHandle compHandles[], const ShHandle compHandles[],
const int numHandles) const int numHandles)
{ {
if (linkHandle == 0 || numHandles == 0) if (linkHandle == nullptr || numHandles == 0)
return 0; return 0;
THandleList cObjects; THandleList cObjects;
for (int i = 0; i < numHandles; ++i) { for (int i = 0; i < numHandles; ++i) {
if (compHandles[i] == 0) if (compHandles[i] == nullptr)
return 0; return 0;
TShHandleBase* base = reinterpret_cast<TShHandleBase*>(compHandles[i]); TShHandleBase* base = reinterpret_cast<TShHandleBase*>(compHandles[i]);
if (base->getAsLinker()) { if (base->getAsLinker()) {
@ -1535,7 +1535,7 @@ int ShLinkExt(
if (base->getAsCompiler()) if (base->getAsCompiler())
cObjects.push_back(base->getAsCompiler()); cObjects.push_back(base->getAsCompiler());
if (cObjects[i] == 0) if (cObjects[i] == nullptr)
return 0; return 0;
} }
@ -1544,7 +1544,7 @@ int ShLinkExt(
SetThreadPoolAllocator(linker->getPool()); SetThreadPoolAllocator(linker->getPool());
if (linker == 0) if (linker == nullptr)
return 0; return 0;
linker->infoSink.info.erase(); linker->infoSink.info.erase();
@ -1569,7 +1569,7 @@ int ShLinkExt(
// //
void ShSetEncryptionMethod(ShHandle handle) void ShSetEncryptionMethod(ShHandle handle)
{ {
if (handle == 0) if (handle == nullptr)
return; return;
} }
@ -1578,8 +1578,8 @@ void ShSetEncryptionMethod(ShHandle handle)
// //
const char* ShGetInfoLog(const ShHandle handle) const char* ShGetInfoLog(const ShHandle handle)
{ {
if (handle == 0) if (handle == nullptr)
return 0; return nullptr;
TShHandleBase* base = static_cast<TShHandleBase*>(handle); TShHandleBase* base = static_cast<TShHandleBase*>(handle);
TInfoSink* infoSink; TInfoSink* infoSink;
@ -1589,7 +1589,7 @@ const char* ShGetInfoLog(const ShHandle handle)
else if (base->getAsLinker()) else if (base->getAsLinker())
infoSink = &(base->getAsLinker()->getInfoSink()); infoSink = &(base->getAsLinker()->getInfoSink());
else else
return 0; return nullptr;
infoSink->info << infoSink->debug.c_str(); infoSink->info << infoSink->debug.c_str();
return infoSink->info.c_str(); return infoSink->info.c_str();
@ -1601,14 +1601,14 @@ const char* ShGetInfoLog(const ShHandle handle)
// //
const void* ShGetExecutable(const ShHandle handle) const void* ShGetExecutable(const ShHandle handle)
{ {
if (handle == 0) if (handle == nullptr)
return 0; return nullptr;
TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle); TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
TLinker* linker = static_cast<TLinker*>(base->getAsLinker()); TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
if (linker == 0) if (linker == nullptr)
return 0; return nullptr;
return linker->getObjectCode(); return linker->getObjectCode();
} }
@ -1623,13 +1623,13 @@ const void* ShGetExecutable(const ShHandle handle)
// //
int ShSetVirtualAttributeBindings(const ShHandle handle, const ShBindingTable* table) int ShSetVirtualAttributeBindings(const ShHandle handle, const ShBindingTable* table)
{ {
if (handle == 0) if (handle == nullptr)
return 0; return 0;
TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle); TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
TLinker* linker = static_cast<TLinker*>(base->getAsLinker()); TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
if (linker == 0) if (linker == nullptr)
return 0; return 0;
linker->setAppAttributeBindings(table); linker->setAppAttributeBindings(table);
@ -1642,13 +1642,13 @@ int ShSetVirtualAttributeBindings(const ShHandle handle, const ShBindingTable* t
// //
int ShSetFixedAttributeBindings(const ShHandle handle, const ShBindingTable* table) int ShSetFixedAttributeBindings(const ShHandle handle, const ShBindingTable* table)
{ {
if (handle == 0) if (handle == nullptr)
return 0; return 0;
TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle); TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
TLinker* linker = static_cast<TLinker*>(base->getAsLinker()); TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
if (linker == 0) if (linker == nullptr)
return 0; return 0;
linker->setFixedAttributeBindings(table); linker->setFixedAttributeBindings(table);
@ -1660,12 +1660,12 @@ int ShSetFixedAttributeBindings(const ShHandle handle, const ShBindingTable* tab
// //
int ShExcludeAttributes(const ShHandle handle, int *attributes, int count) int ShExcludeAttributes(const ShHandle handle, int *attributes, int count)
{ {
if (handle == 0) if (handle == nullptr)
return 0; return 0;
TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle); TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
TLinker* linker = static_cast<TLinker*>(base->getAsLinker()); TLinker* linker = static_cast<TLinker*>(base->getAsLinker());
if (linker == 0) if (linker == nullptr)
return 0; return 0;
linker->setExcludedAttributes(attributes, count); linker->setExcludedAttributes(attributes, count);
@ -1681,12 +1681,12 @@ int ShExcludeAttributes(const ShHandle handle, int *attributes, int count)
// //
int ShGetUniformLocation(const ShHandle handle, const char* name) int ShGetUniformLocation(const ShHandle handle, const char* name)
{ {
if (handle == 0) if (handle == nullptr)
return -1; return -1;
TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle); TShHandleBase* base = reinterpret_cast<TShHandleBase*>(handle);
TUniformMap* uniformMap= base->getAsUniformMap(); TUniformMap* uniformMap= base->getAsUniformMap();
if (uniformMap == 0) if (uniformMap == nullptr)
return -1; return -1;
return uniformMap->getLocation(name); return uniformMap->getLocation(name);
@ -1954,14 +1954,14 @@ const char* TShader::getInfoDebugLog()
TProgram::TProgram() : TProgram::TProgram() :
#if !defined(GLSLANG_WEB) #if !defined(GLSLANG_WEB)
reflection(0), reflection(nullptr),
#endif #endif
linked(false) linked(false)
{ {
pool = new TPoolAllocator; pool = new TPoolAllocator;
infoSink = new TInfoSink; infoSink = new TInfoSink;
for (int s = 0; s < EShLangCount; ++s) { for (int s = 0; s < EShLangCount; ++s) {
intermediate[s] = 0; intermediate[s] = nullptr;
newedIntermediate[s] = false; newedIntermediate[s] = false;
} }
} }

2
glslang/MachineIndependent/SymbolTable.cpp
View File

@ -416,7 +416,7 @@ TAnonMember* TAnonMember::clone() const
// copy of the original container. // copy of the original container.
assert(0); assert(0);
return 0; return nullptr;
} }
TSymbolTableLevel* TSymbolTableLevel::clone() const TSymbolTableLevel* TSymbolTableLevel::clone() const

32
glslang/MachineIndependent/SymbolTable.h
View File

@ -84,7 +84,7 @@ typedef TVector<const char*> TExtensionList;
class TSymbol { class TSymbol {
public: public:
POOL_ALLOCATOR_NEW_DELETE(GetThreadPoolAllocator()) POOL_ALLOCATOR_NEW_DELETE(GetThreadPoolAllocator())
explicit TSymbol(const TString *n) : name(n), uniqueId(0), extensions(0), writable(true) { } explicit TSymbol(const TString *n) : name(n), uniqueId(0), extensions(nullptr), writable(true) { }
virtual TSymbol* clone() const = 0; virtual TSymbol* clone() const = 0;
virtual ~TSymbol() { } // rely on all symbol owned memory coming from the pool virtual ~TSymbol() { } // rely on all symbol owned memory coming from the pool
@ -97,18 +97,18 @@ public:
changeName(NewPoolTString(newName.c_str())); changeName(NewPoolTString(newName.c_str()));
} }
virtual const TString& getMangledName() const { return getName(); } virtual const TString& getMangledName() const { return getName(); }
virtual TFunction* getAsFunction() { return 0; } virtual TFunction* getAsFunction() { return nullptr; }
virtual const TFunction* getAsFunction() const { return 0; } virtual const TFunction* getAsFunction() const { return nullptr; }
virtual TVariable* getAsVariable() { return 0; } virtual TVariable* getAsVariable() { return nullptr; }
virtual const TVariable* getAsVariable() const { return 0; } virtual const TVariable* getAsVariable() const { return nullptr; }
virtual const TAnonMember* getAsAnonMember() const { return 0; } virtual const TAnonMember* getAsAnonMember() const { return nullptr; }
virtual const TType& getType() const = 0; virtual const TType& getType() const = 0;
virtual TType& getWritableType() = 0; virtual TType& getWritableType() = 0;
virtual void setUniqueId(long long id) { uniqueId = id; } virtual void setUniqueId(long long id) { uniqueId = id; }
virtual long long getUniqueId() const { return uniqueId; } virtual long long getUniqueId() const { return uniqueId; }
virtual void setExtensions(int numExts, const char* const exts[]) virtual void setExtensions(int numExts, const char* const exts[])
{ {
assert(extensions == 0); assert(extensions == nullptr);
assert(numExts > 0); assert(numExts > 0);
extensions = NewPoolObject(extensions); extensions = NewPoolObject(extensions);
for (int e = 0; e < numExts; ++e) for (int e = 0; e < numExts; ++e)
@ -229,7 +229,7 @@ struct TParameter {
if (param.name) if (param.name)
name = NewPoolTString(param.name->c_str()); name = NewPoolTString(param.name->c_str());
else else
name = 0; name = nullptr;
type = param.type->clone(); type = param.type->clone();
defaultValue = param.defaultValue; defaultValue = param.defaultValue;
return *this; return *this;
@ -243,7 +243,7 @@ struct TParameter {
class TFunction : public TSymbol { class TFunction : public TSymbol {
public: public:
explicit TFunction(TOperator o) : explicit TFunction(TOperator o) :
TSymbol(0), TSymbol(nullptr),
op(o), op(o),
defined(false), prototyped(false), implicitThis(false), illegalImplicitThis(false), defaultParamCount(0) { } defined(false), prototyped(false), implicitThis(false), illegalImplicitThis(false), defaultParamCount(0) { }
TFunction(const TString *name, const TType& retType, TOperator tOp = EOpNull) : TFunction(const TString *name, const TType& retType, TOperator tOp = EOpNull) :
@ -411,7 +411,7 @@ protected:
class TSymbolTableLevel { class TSymbolTableLevel {
public: public:
POOL_ALLOCATOR_NEW_DELETE(GetThreadPoolAllocator()) POOL_ALLOCATOR_NEW_DELETE(GetThreadPoolAllocator())
TSymbolTableLevel() : defaultPrecision(0), anonId(0), thisLevel(false) { } TSymbolTableLevel() : defaultPrecision(nullptr), anonId(0), thisLevel(false) { }
~TSymbolTableLevel(); ~TSymbolTableLevel();
bool insert(const TString& name, TSymbol* symbol) { bool insert(const TString& name, TSymbol* symbol) {
@ -493,7 +493,7 @@ public:
{ {
tLevel::const_iterator it = level.find(name); tLevel::const_iterator it = level.find(name);
if (it == level.end()) if (it == level.end())
return 0; return nullptr;
else else
return (*it).second; return (*it).second;
} }
@ -561,7 +561,7 @@ public:
{ {
// can call multiple times at one scope, will only latch on first call, // can call multiple times at one scope, will only latch on first call,
// as we're tracking the previous scope's values, not the current values // as we're tracking the previous scope's values, not the current values
if (defaultPrecision != 0) if (defaultPrecision != nullptr)
return; return;
defaultPrecision = new TPrecisionQualifier[EbtNumTypes]; defaultPrecision = new TPrecisionQualifier[EbtNumTypes];
@ -573,7 +573,7 @@ public:
{ {
// can be called for table level pops that didn't set the // can be called for table level pops that didn't set the
// defaults // defaults
if (defaultPrecision == 0 || p == 0) if (defaultPrecision == nullptr || p == nullptr)
return; return;
for (int t = 0; t < EbtNumTypes; ++t) for (int t = 0; t < EbtNumTypes; ++t)
@ -622,7 +622,7 @@ public:
// don't deallocate levels passed in from elsewhere // don't deallocate levels passed in from elsewhere
while (table.size() > adoptedLevels) while (table.size() > adoptedLevels)
pop(0); pop(nullptr);
} }
void adoptLevels(TSymbolTable& symTable) void adoptLevels(TSymbolTable& symTable)
@ -783,7 +783,7 @@ public:
// Normal find of a symbol, that can optionally say whether the symbol was found // Normal find of a symbol, that can optionally say whether the symbol was found
// at a built-in level or the current top-scope level. // at a built-in level or the current top-scope level.
TSymbol* find(const TString& name, bool* builtIn = 0, bool* currentScope = 0, int* thisDepthP = 0) TSymbol* find(const TString& name, bool* builtIn = nullptr, bool* currentScope = nullptr, int* thisDepthP = nullptr)
{ {
int level = currentLevel(); int level = currentLevel();
TSymbol* symbol; TSymbol* symbol;
@ -827,7 +827,7 @@ public:
++thisDepth; ++thisDepth;
symbol = table[level]->find(name); symbol = table[level]->find(name);
--level; --level;
} while (symbol == 0 && level >= 0); } while (symbol == nullptr && level >= 0);
if (! table[level + 1]->isThisLevel()) if (! table[level + 1]->isThisLevel())
thisDepth = 0; thisDepth = 0;

8
glslang/MachineIndependent/Versions.cpp
View File

@ -1066,8 +1066,8 @@ void TParseVersions::checkExtensionStage(const TSourceLoc& loc, const char * con
if (strcmp(extension, "GL_NV_mesh_shader") == 0) { if (strcmp(extension, "GL_NV_mesh_shader") == 0) {
requireStage(loc, (EShLanguageMask)(EShLangTaskMask | EShLangMeshMask | EShLangFragmentMask), requireStage(loc, (EShLanguageMask)(EShLangTaskMask | EShLangMeshMask | EShLangFragmentMask),
"#extension GL_NV_mesh_shader"); "#extension GL_NV_mesh_shader");
profileRequires(loc, ECoreProfile, 450, 0, "#extension GL_NV_mesh_shader"); profileRequires(loc, ECoreProfile, 450, nullptr, "#extension GL_NV_mesh_shader");
profileRequires(loc, EEsProfile, 320, 0, "#extension GL_NV_mesh_shader"); profileRequires(loc, EEsProfile, 320, nullptr, "#extension GL_NV_mesh_shader");
if (extensionTurnedOn(E_GL_EXT_mesh_shader)) { if (extensionTurnedOn(E_GL_EXT_mesh_shader)) {
error(loc, "GL_EXT_mesh_shader is already turned on, and not allowed with", "#extension", extension); error(loc, "GL_EXT_mesh_shader is already turned on, and not allowed with", "#extension", extension);
} }
@ -1075,8 +1075,8 @@ void TParseVersions::checkExtensionStage(const TSourceLoc& loc, const char * con
else if (strcmp(extension, "GL_EXT_mesh_shader") == 0) { else if (strcmp(extension, "GL_EXT_mesh_shader") == 0) {
requireStage(loc, (EShLanguageMask)(EShLangTaskMask | EShLangMeshMask | EShLangFragmentMask), requireStage(loc, (EShLanguageMask)(EShLangTaskMask | EShLangMeshMask | EShLangFragmentMask),
"#extension GL_EXT_mesh_shader"); "#extension GL_EXT_mesh_shader");
profileRequires(loc, ECoreProfile, 450, 0, "#extension GL_EXT_mesh_shader"); profileRequires(loc, ECoreProfile, 450, nullptr, "#extension GL_EXT_mesh_shader");
profileRequires(loc, EEsProfile, 320, 0, "#extension GL_EXT_mesh_shader"); profileRequires(loc, EEsProfile, 320, nullptr, "#extension GL_EXT_mesh_shader");
if (extensionTurnedOn(E_GL_NV_mesh_shader)) { if (extensionTurnedOn(E_GL_NV_mesh_shader)) {
error(loc, "GL_NV_mesh_shader is already turned on, and not allowed with", "#extension", extension); error(loc, "GL_NV_mesh_shader is already turned on, and not allowed with", "#extension", extension);
} }

184
glslang/MachineIndependent/glslang_tab.cpp
View File

@ -5446,7 +5446,7 @@ yyreduce:
case 31: /* function_call_header_with_parameters: function_call_header assignment_expression */ case 31: /* function_call_header_with_parameters: function_call_header assignment_expression */
#line 526 "MachineIndependent/glslang.y" #line 526 "MachineIndependent/glslang.y"
{ {
TParameter param = { 0, new TType }; TParameter param = { nullptr, new TType };
param.type->shallowCopy((yyvsp[0].interm.intermTypedNode)->getType()); param.type->shallowCopy((yyvsp[0].interm.intermTypedNode)->getType());
(yyvsp[-1].interm).function->addParameter(param); (yyvsp[-1].interm).function->addParameter(param);
(yyval.interm).function = (yyvsp[-1].interm).function; (yyval.interm).function = (yyvsp[-1].interm).function;
@ -5458,7 +5458,7 @@ yyreduce:
case 32: /* function_call_header_with_parameters: function_call_header_with_parameters COMMA assignment_expression */ case 32: /* function_call_header_with_parameters: function_call_header_with_parameters COMMA assignment_expression */
#line 533 "MachineIndependent/glslang.y" #line 533 "MachineIndependent/glslang.y"
{ {
TParameter param = { 0, new TType }; TParameter param = { nullptr, new TType };
param.type->shallowCopy((yyvsp[0].interm.intermTypedNode)->getType()); param.type->shallowCopy((yyvsp[0].interm.intermTypedNode)->getType());
(yyvsp[-2].interm).function->addParameter(param); (yyvsp[-2].interm).function->addParameter(param);
(yyval.interm).function = (yyvsp[-2].interm).function; (yyval.interm).function = (yyvsp[-2].interm).function;
@ -5479,7 +5479,7 @@ yyreduce:
#line 551 "MachineIndependent/glslang.y" #line 551 "MachineIndependent/glslang.y"
{ {
// Constructor // Constructor
(yyval.interm).intermNode = 0; (yyval.interm).intermNode = nullptr;
(yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type)); (yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type));
} }
#line 5486 "MachineIndependent/glslang_tab.cpp" #line 5486 "MachineIndependent/glslang_tab.cpp"
@ -5491,8 +5491,8 @@ yyreduce:
// //
// Should be a method or subroutine call, but we haven't recognized the arguments yet. // Should be a method or subroutine call, but we haven't recognized the arguments yet.
// //
(yyval.interm).function = 0; (yyval.interm).function = nullptr;
(yyval.interm).intermNode = 0; (yyval.interm).intermNode = nullptr;
TIntermMethod* method = (yyvsp[0].interm.intermTypedNode)->getAsMethodNode(); TIntermMethod* method = (yyvsp[0].interm.intermTypedNode)->getAsMethodNode();
if (method) { if (method) {
@ -5508,7 +5508,7 @@ yyreduce:
parseContext.error((yyvsp[0].interm.intermTypedNode)->getLoc(), "function call, method, or subroutine call expected", "", ""); parseContext.error((yyvsp[0].interm.intermTypedNode)->getLoc(), "function call, method, or subroutine call expected", "", "");
} }
if ((yyval.interm).function == 0) { if ((yyval.interm).function == nullptr) {
// error recover // error recover
TString* empty = NewPoolTString(""); TString* empty = NewPoolTString("");
(yyval.interm).function = new TFunction(empty, TType(EbtVoid), EOpNull); (yyval.interm).function = new TFunction(empty, TType(EbtVoid), EOpNull);
@ -5521,7 +5521,7 @@ yyreduce:
#line 584 "MachineIndependent/glslang.y" #line 584 "MachineIndependent/glslang.y"
{ {
// Constructor // Constructor
(yyval.interm).intermNode = 0; (yyval.interm).intermNode = nullptr;
(yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type)); (yyval.interm).function = parseContext.handleConstructorCall((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type));
} }
#line 5528 "MachineIndependent/glslang_tab.cpp" #line 5528 "MachineIndependent/glslang_tab.cpp"
@ -5612,7 +5612,7 @@ yyreduce:
#line 637 "MachineIndependent/glslang.y" #line 637 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "*", EOpMul, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "*", EOpMul, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
#line 5619 "MachineIndependent/glslang_tab.cpp" #line 5619 "MachineIndependent/glslang_tab.cpp"
@ -5622,7 +5622,7 @@ yyreduce:
#line 642 "MachineIndependent/glslang.y" #line 642 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "/", EOpDiv, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "/", EOpDiv, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
#line 5629 "MachineIndependent/glslang_tab.cpp" #line 5629 "MachineIndependent/glslang_tab.cpp"
@ -5633,7 +5633,7 @@ yyreduce:
{ {
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "%"); parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "%");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "%", EOpMod, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "%", EOpMod, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
#line 5640 "MachineIndependent/glslang_tab.cpp" #line 5640 "MachineIndependent/glslang_tab.cpp"
@ -5649,7 +5649,7 @@ yyreduce:
#line 657 "MachineIndependent/glslang.y" #line 657 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "+", EOpAdd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "+", EOpAdd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
#line 5656 "MachineIndependent/glslang_tab.cpp" #line 5656 "MachineIndependent/glslang_tab.cpp"
@ -5659,7 +5659,7 @@ yyreduce:
#line 662 "MachineIndependent/glslang.y" #line 662 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "-", EOpSub, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "-", EOpSub, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
#line 5666 "MachineIndependent/glslang_tab.cpp" #line 5666 "MachineIndependent/glslang_tab.cpp"
@ -5676,7 +5676,7 @@ yyreduce:
{ {
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bit shift left"); 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)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<<", EOpLeftShift, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
#line 5683 "MachineIndependent/glslang_tab.cpp" #line 5683 "MachineIndependent/glslang_tab.cpp"
@ -5687,7 +5687,7 @@ yyreduce:
{ {
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bit shift right"); 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)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">>", EOpRightShift, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
#line 5694 "MachineIndependent/glslang_tab.cpp" #line 5694 "MachineIndependent/glslang_tab.cpp"
@ -5703,7 +5703,7 @@ yyreduce:
#line 687 "MachineIndependent/glslang.y" #line 687 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<", EOpLessThan, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<", EOpLessThan, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc); (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
} }
#line 5710 "MachineIndependent/glslang_tab.cpp" #line 5710 "MachineIndependent/glslang_tab.cpp"
@ -5713,7 +5713,7 @@ yyreduce:
#line 692 "MachineIndependent/glslang.y" #line 692 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">", EOpGreaterThan, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">", EOpGreaterThan, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc); (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
} }
#line 5720 "MachineIndependent/glslang_tab.cpp" #line 5720 "MachineIndependent/glslang_tab.cpp"
@ -5723,7 +5723,7 @@ yyreduce:
#line 697 "MachineIndependent/glslang.y" #line 697 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<=", EOpLessThanEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "<=", EOpLessThanEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc); (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
} }
#line 5730 "MachineIndependent/glslang_tab.cpp" #line 5730 "MachineIndependent/glslang_tab.cpp"
@ -5733,7 +5733,7 @@ yyreduce:
#line 702 "MachineIndependent/glslang.y" #line 702 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">=", EOpGreaterThanEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, ">=", EOpGreaterThanEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc); (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
} }
#line 5740 "MachineIndependent/glslang_tab.cpp" #line 5740 "MachineIndependent/glslang_tab.cpp"
@ -5753,7 +5753,7 @@ yyreduce:
parseContext.specializationCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "=="); parseContext.specializationCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "==");
parseContext.referenceCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "=="); parseContext.referenceCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "==");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "==", EOpEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "==", EOpEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc); (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
} }
#line 5760 "MachineIndependent/glslang_tab.cpp" #line 5760 "MachineIndependent/glslang_tab.cpp"
@ -5767,7 +5767,7 @@ yyreduce:
parseContext.specializationCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "!="); parseContext.specializationCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "!=");
parseContext.referenceCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "!="); parseContext.referenceCheck((yyvsp[-1].lex).loc, (yyvsp[-2].interm.intermTypedNode)->getType(), "!=");
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "!=", EOpNotEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "!=", EOpNotEqual, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc); (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
} }
#line 5774 "MachineIndependent/glslang_tab.cpp" #line 5774 "MachineIndependent/glslang_tab.cpp"
@ -5784,7 +5784,7 @@ yyreduce:
{ {
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise and"); 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)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "&", EOpAnd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
#line 5791 "MachineIndependent/glslang_tab.cpp" #line 5791 "MachineIndependent/glslang_tab.cpp"
@ -5801,7 +5801,7 @@ yyreduce:
{ {
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise exclusive or"); 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)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "^", EOpExclusiveOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
#line 5808 "MachineIndependent/glslang_tab.cpp" #line 5808 "MachineIndependent/glslang_tab.cpp"
@ -5818,7 +5818,7 @@ yyreduce:
{ {
parseContext.fullIntegerCheck((yyvsp[-1].lex).loc, "bitwise inclusive or"); 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)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "|", EOpInclusiveOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
#line 5825 "MachineIndependent/glslang_tab.cpp" #line 5825 "MachineIndependent/glslang_tab.cpp"
@ -5834,7 +5834,7 @@ yyreduce:
#line 763 "MachineIndependent/glslang.y" #line 763 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "&&", EOpLogicalAnd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "&&", EOpLogicalAnd, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc); (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
} }
#line 5841 "MachineIndependent/glslang_tab.cpp" #line 5841 "MachineIndependent/glslang_tab.cpp"
@ -5850,7 +5850,7 @@ yyreduce:
#line 772 "MachineIndependent/glslang.y" #line 772 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "^^", EOpLogicalXor, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "^^", EOpLogicalXor, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc); (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
} }
#line 5857 "MachineIndependent/glslang_tab.cpp" #line 5857 "MachineIndependent/glslang_tab.cpp"
@ -5866,7 +5866,7 @@ yyreduce:
#line 781 "MachineIndependent/glslang.y" #line 781 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "||", EOpLogicalOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.handleBinaryMath((yyvsp[-1].lex).loc, "||", EOpLogicalOr, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) if ((yyval.interm.intermTypedNode) == nullptr)
(yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc); (yyval.interm.intermTypedNode) = parseContext.intermediate.addConstantUnion(false, (yyvsp[-1].lex).loc);
} }
#line 5873 "MachineIndependent/glslang_tab.cpp" #line 5873 "MachineIndependent/glslang_tab.cpp"
@ -5895,7 +5895,7 @@ yyreduce:
parseContext.rValueErrorCheck((yyvsp[-1].lex).loc, ":", (yyvsp[-2].interm.intermTypedNode)); parseContext.rValueErrorCheck((yyvsp[-1].lex).loc, ":", (yyvsp[-2].interm.intermTypedNode));
parseContext.rValueErrorCheck((yyvsp[-1].lex).loc, ":", (yyvsp[0].interm.intermTypedNode)); parseContext.rValueErrorCheck((yyvsp[-1].lex).loc, ":", (yyvsp[0].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.intermediate.addSelection((yyvsp[-5].interm.intermTypedNode), (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode), (yyvsp[-4].lex).loc); (yyval.interm.intermTypedNode) = parseContext.intermediate.addSelection((yyvsp[-5].interm.intermTypedNode), (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode), (yyvsp[-4].lex).loc);
if ((yyval.interm.intermTypedNode) == 0) { if ((yyval.interm.intermTypedNode) == nullptr) {
parseContext.binaryOpError((yyvsp[-4].lex).loc, ":", (yyvsp[-2].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()), (yyvsp[0].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs())); parseContext.binaryOpError((yyvsp[-4].lex).loc, ":", (yyvsp[-2].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()), (yyvsp[0].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()));
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
} }
@ -5919,7 +5919,7 @@ yyreduce:
parseContext.lValueErrorCheck((yyvsp[-1].interm).loc, "assign", (yyvsp[-2].interm.intermTypedNode)); parseContext.lValueErrorCheck((yyvsp[-1].interm).loc, "assign", (yyvsp[-2].interm.intermTypedNode));
parseContext.rValueErrorCheck((yyvsp[-1].interm).loc, "assign", (yyvsp[0].interm.intermTypedNode)); parseContext.rValueErrorCheck((yyvsp[-1].interm).loc, "assign", (yyvsp[0].interm.intermTypedNode));
(yyval.interm.intermTypedNode) = parseContext.addAssign((yyvsp[-1].interm).loc, (yyvsp[-1].interm).op, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)); (yyval.interm.intermTypedNode) = parseContext.addAssign((yyvsp[-1].interm).loc, (yyvsp[-1].interm).op, (yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode));
if ((yyval.interm.intermTypedNode) == 0) { if ((yyval.interm.intermTypedNode) == nullptr) {
parseContext.assignError((yyvsp[-1].interm).loc, "assign", (yyvsp[-2].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()), (yyvsp[0].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs())); parseContext.assignError((yyvsp[-1].interm).loc, "assign", (yyvsp[-2].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()), (yyvsp[0].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()));
(yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[-2].interm.intermTypedNode);
} }
@ -6040,7 +6040,7 @@ yyreduce:
{ {
parseContext.samplerConstructorLocationCheck((yyvsp[-1].lex).loc, ",", (yyvsp[0].interm.intermTypedNode)); 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); (yyval.interm.intermTypedNode) = parseContext.intermediate.addComma((yyvsp[-2].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode), (yyvsp[-1].lex).loc);
if ((yyval.interm.intermTypedNode) == 0) { if ((yyval.interm.intermTypedNode) == nullptr) {
parseContext.binaryOpError((yyvsp[-1].lex).loc, ",", (yyvsp[-2].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()), (yyvsp[0].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs())); parseContext.binaryOpError((yyvsp[-1].lex).loc, ",", (yyvsp[-2].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()), (yyvsp[0].interm.intermTypedNode)->getCompleteString(parseContext.intermediate.getEnhancedMsgs()));
(yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode); (yyval.interm.intermTypedNode) = (yyvsp[0].interm.intermTypedNode);
} }
@ -6061,7 +6061,7 @@ yyreduce:
#line 894 "MachineIndependent/glslang.y" #line 894 "MachineIndependent/glslang.y"
{ {
parseContext.handleFunctionDeclarator((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).function, true /* prototype */); parseContext.handleFunctionDeclarator((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).function, true /* prototype */);
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
// TODO: 4.0 functionality: subroutines: make the identifier a user type for this signature // TODO: 4.0 functionality: subroutines: make the identifier a user type for this signature
} }
#line 6068 "MachineIndependent/glslang_tab.cpp" #line 6068 "MachineIndependent/glslang_tab.cpp"
@ -6073,7 +6073,7 @@ yyreduce:
parseContext.requireExtensions((yyvsp[-1].interm).loc, 1, &E_GL_EXT_spirv_intrinsics, "SPIR-V instruction qualifier"); parseContext.requireExtensions((yyvsp[-1].interm).loc, 1, &E_GL_EXT_spirv_intrinsics, "SPIR-V instruction qualifier");
(yyvsp[-1].interm).function->setSpirvInstruction(*(yyvsp[-2].interm.spirvInst)); // Attach SPIR-V intruction qualifier (yyvsp[-1].interm).function->setSpirvInstruction(*(yyvsp[-2].interm.spirvInst)); // Attach SPIR-V intruction qualifier
parseContext.handleFunctionDeclarator((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).function, true /* prototype */); parseContext.handleFunctionDeclarator((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).function, true /* prototype */);
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
// TODO: 4.0 functionality: subroutines: make the identifier a user type for this signature // TODO: 4.0 functionality: subroutines: make the identifier a user type for this signature
} }
#line 6080 "MachineIndependent/glslang_tab.cpp" #line 6080 "MachineIndependent/glslang_tab.cpp"
@ -6084,7 +6084,7 @@ yyreduce:
{ {
parseContext.globalCheck((yyvsp[0].lex).loc, "SPIR-V execution mode qualifier"); parseContext.globalCheck((yyvsp[0].lex).loc, "SPIR-V execution mode qualifier");
parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_EXT_spirv_intrinsics, "SPIR-V execution mode qualifier"); parseContext.requireExtensions((yyvsp[0].lex).loc, 1, &E_GL_EXT_spirv_intrinsics, "SPIR-V execution mode qualifier");
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 6090 "MachineIndependent/glslang_tab.cpp" #line 6090 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -6102,11 +6102,11 @@ yyreduce:
case 98: /* declaration: PRECISION precision_qualifier type_specifier SEMICOLON */ case 98: /* declaration: PRECISION precision_qualifier type_specifier SEMICOLON */
#line 918 "MachineIndependent/glslang.y" #line 918 "MachineIndependent/glslang.y"
{ {
parseContext.profileRequires((yyvsp[-3].lex).loc, ENoProfile, 130, 0, "precision statement"); parseContext.profileRequires((yyvsp[-3].lex).loc, ENoProfile, 130, nullptr, "precision statement");
// lazy setting of the previous scope's defaults, has effect only the first time it is called in a particular scope // lazy setting of the previous scope's defaults, has effect only the first time it is called in a particular scope
parseContext.symbolTable.setPreviousDefaultPrecisions(&parseContext.defaultPrecision[0]); parseContext.symbolTable.setPreviousDefaultPrecisions(&parseContext.defaultPrecision[0]);
parseContext.setDefaultPrecision((yyvsp[-3].lex).loc, (yyvsp[-1].interm.type), (yyvsp[-2].interm.type).qualifier.precision); parseContext.setDefaultPrecision((yyvsp[-3].lex).loc, (yyvsp[-1].interm.type), (yyvsp[-2].interm.type).qualifier.precision);
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 6112 "MachineIndependent/glslang_tab.cpp" #line 6112 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -6115,7 +6115,7 @@ yyreduce:
#line 925 "MachineIndependent/glslang.y" #line 925 "MachineIndependent/glslang.y"
{ {
parseContext.declareBlock((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).typeList); parseContext.declareBlock((yyvsp[-1].interm).loc, *(yyvsp[-1].interm).typeList);
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 6121 "MachineIndependent/glslang_tab.cpp" #line 6121 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -6124,7 +6124,7 @@ yyreduce:
#line 929 "MachineIndependent/glslang.y" #line 929 "MachineIndependent/glslang.y"
{ {
parseContext.declareBlock((yyvsp[-2].interm).loc, *(yyvsp[-2].interm).typeList, (yyvsp[-1].lex).string); parseContext.declareBlock((yyvsp[-2].interm).loc, *(yyvsp[-2].interm).typeList, (yyvsp[-1].lex).string);
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 6130 "MachineIndependent/glslang_tab.cpp" #line 6130 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -6133,7 +6133,7 @@ yyreduce:
#line 933 "MachineIndependent/glslang.y" #line 933 "MachineIndependent/glslang.y"
{ {
parseContext.declareBlock((yyvsp[-3].interm).loc, *(yyvsp[-3].interm).typeList, (yyvsp[-2].lex).string, (yyvsp[-1].interm).arraySizes); parseContext.declareBlock((yyvsp[-3].interm).loc, *(yyvsp[-3].interm).typeList, (yyvsp[-2].lex).string, (yyvsp[-1].interm).arraySizes);
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 6139 "MachineIndependent/glslang_tab.cpp" #line 6139 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -6143,7 +6143,7 @@ yyreduce:
{ {
parseContext.globalQualifierFixCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier); parseContext.globalQualifierFixCheck((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type).qualifier);
parseContext.updateStandaloneQualifierDefaults((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type)); parseContext.updateStandaloneQualifierDefaults((yyvsp[-1].interm.type).loc, (yyvsp[-1].interm.type));
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 6149 "MachineIndependent/glslang_tab.cpp" #line 6149 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -6153,7 +6153,7 @@ yyreduce:
{ {
parseContext.checkNoShaderLayouts((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).shaderQualifiers); 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); parseContext.addQualifierToExisting((yyvsp[-2].interm.type).loc, (yyvsp[-2].interm.type).qualifier, *(yyvsp[-1].lex).string);
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 6159 "MachineIndependent/glslang_tab.cpp" #line 6159 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -6164,7 +6164,7 @@ yyreduce:
parseContext.checkNoShaderLayouts((yyvsp[-3].interm.type).loc, (yyvsp[-3].interm.type).shaderQualifiers); parseContext.checkNoShaderLayouts((yyvsp[-3].interm.type).loc, (yyvsp[-3].interm.type).shaderQualifiers);
(yyvsp[-1].interm.identifierList)->push_back((yyvsp[-2].lex).string); (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)); parseContext.addQualifierToExisting((yyvsp[-3].interm.type).loc, (yyvsp[-3].interm.type).qualifier, *(yyvsp[-1].interm.identifierList));
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 6170 "MachineIndependent/glslang_tab.cpp" #line 6170 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -6330,7 +6330,7 @@ yyreduce:
{ {
if ((yyvsp[-1].interm.type).arraySizes) { if ((yyvsp[-1].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-1].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type"); parseContext.profileRequires((yyvsp[-1].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
parseContext.profileRequires((yyvsp[-1].interm.type).loc, EEsProfile, 300, 0, "arrayed type"); parseContext.profileRequires((yyvsp[-1].interm.type).loc, EEsProfile, 300, nullptr, "arrayed type");
parseContext.arraySizeRequiredCheck((yyvsp[-1].interm.type).loc, *(yyvsp[-1].interm.type).arraySizes); parseContext.arraySizeRequiredCheck((yyvsp[-1].interm.type).loc, *(yyvsp[-1].interm.type).arraySizes);
} }
if ((yyvsp[-1].interm.type).basicType == EbtVoid) { if ((yyvsp[-1].interm.type).basicType == EbtVoid) {
@ -6350,7 +6350,7 @@ yyreduce:
{ {
if ((yyvsp[-2].interm.type).arraySizes) { if ((yyvsp[-2].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type"); parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, 0, "arrayed type"); parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, nullptr, "arrayed type");
parseContext.arraySizeRequiredCheck((yyvsp[-2].interm.type).loc, *(yyvsp[-2].interm.type).arraySizes); parseContext.arraySizeRequiredCheck((yyvsp[-2].interm.type).loc, *(yyvsp[-2].interm.type).arraySizes);
} }
TType* type = new TType((yyvsp[-2].interm.type)); TType* type = new TType((yyvsp[-2].interm.type));
@ -6427,7 +6427,7 @@ yyreduce:
case 124: /* parameter_type_specifier: type_specifier */ case 124: /* parameter_type_specifier: type_specifier */
#line 1146 "MachineIndependent/glslang.y" #line 1146 "MachineIndependent/glslang.y"
{ {
TParameter param = { 0, new TType((yyvsp[0].interm.type)) }; TParameter param = { nullptr, new TType((yyvsp[0].interm.type)) };
(yyval.interm).param = param; (yyval.interm).param = param;
if ((yyvsp[0].interm.type).arraySizes) if ((yyvsp[0].interm.type).arraySizes)
parseContext.arraySizeRequiredCheck((yyvsp[0].interm.type).loc, *(yyvsp[0].interm.type).arraySizes); parseContext.arraySizeRequiredCheck((yyvsp[0].interm.type).loc, *(yyvsp[0].interm.type).arraySizes);
@ -6475,7 +6475,7 @@ yyreduce:
#line 1171 "MachineIndependent/glslang.y" #line 1171 "MachineIndependent/glslang.y"
{ {
(yyval.interm).type = (yyvsp[-4].interm).type; (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)); TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-4].interm).type, nullptr, (yyvsp[0].interm.intermTypedNode));
(yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-4].interm).intermNode, initNode, (yyvsp[-1].lex).loc); (yyval.interm).intermNode = parseContext.intermediate.growAggregate((yyvsp[-4].interm).intermNode, initNode, (yyvsp[-1].lex).loc);
} }
#line 6482 "MachineIndependent/glslang_tab.cpp" #line 6482 "MachineIndependent/glslang_tab.cpp"
@ -6485,7 +6485,7 @@ yyreduce:
#line 1179 "MachineIndependent/glslang.y" #line 1179 "MachineIndependent/glslang.y"
{ {
(yyval.interm).type = (yyvsp[0].interm.type); (yyval.interm).type = (yyvsp[0].interm.type);
(yyval.interm).intermNode = 0; (yyval.interm).intermNode = nullptr;
parseContext.declareTypeDefaults((yyval.interm).loc, (yyval.interm).type); parseContext.declareTypeDefaults((yyval.interm).loc, (yyval.interm).type);
@ -6497,7 +6497,7 @@ yyreduce:
#line 1186 "MachineIndependent/glslang.y" #line 1186 "MachineIndependent/glslang.y"
{ {
(yyval.interm).type = (yyvsp[-1].interm.type); (yyval.interm).type = (yyvsp[-1].interm.type);
(yyval.interm).intermNode = 0; (yyval.interm).intermNode = nullptr;
parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-1].interm.type)); parseContext.declareVariable((yyvsp[0].lex).loc, *(yyvsp[0].lex).string, (yyvsp[-1].interm.type));
} }
#line 6504 "MachineIndependent/glslang_tab.cpp" #line 6504 "MachineIndependent/glslang_tab.cpp"
@ -6507,7 +6507,7 @@ yyreduce:
#line 1191 "MachineIndependent/glslang.y" #line 1191 "MachineIndependent/glslang.y"
{ {
(yyval.interm).type = (yyvsp[-2].interm.type); (yyval.interm).type = (yyvsp[-2].interm.type);
(yyval.interm).intermNode = 0; (yyval.interm).intermNode = nullptr;
parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-2].interm.type), (yyvsp[0].interm).arraySizes); parseContext.declareVariable((yyvsp[-1].lex).loc, *(yyvsp[-1].lex).string, (yyvsp[-2].interm.type), (yyvsp[0].interm).arraySizes);
} }
#line 6514 "MachineIndependent/glslang_tab.cpp" #line 6514 "MachineIndependent/glslang_tab.cpp"
@ -6518,7 +6518,7 @@ yyreduce:
{ {
(yyval.interm).type = (yyvsp[-4].interm.type); (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)); 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); (yyval.interm).intermNode = parseContext.intermediate.growAggregate(nullptr, initNode, (yyvsp[-1].lex).loc);
} }
#line 6524 "MachineIndependent/glslang_tab.cpp" #line 6524 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -6527,8 +6527,8 @@ yyreduce:
#line 1201 "MachineIndependent/glslang.y" #line 1201 "MachineIndependent/glslang.y"
{ {
(yyval.interm).type = (yyvsp[-3].interm.type); (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)); TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-3].interm.type), nullptr, (yyvsp[0].interm.intermTypedNode));
(yyval.interm).intermNode = parseContext.intermediate.growAggregate(0, initNode, (yyvsp[-1].lex).loc); (yyval.interm).intermNode = parseContext.intermediate.growAggregate(nullptr, initNode, (yyvsp[-1].lex).loc);
} }
#line 6534 "MachineIndependent/glslang_tab.cpp" #line 6534 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -6541,7 +6541,7 @@ yyreduce:
parseContext.globalQualifierTypeCheck((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type).qualifier, (yyval.interm.type)); parseContext.globalQualifierTypeCheck((yyvsp[0].interm.type).loc, (yyvsp[0].interm.type).qualifier, (yyval.interm.type));
if ((yyvsp[0].interm.type).arraySizes) { if ((yyvsp[0].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[0].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type"); parseContext.profileRequires((yyvsp[0].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
parseContext.profileRequires((yyvsp[0].interm.type).loc, EEsProfile, 300, 0, "arrayed type"); parseContext.profileRequires((yyvsp[0].interm.type).loc, EEsProfile, 300, nullptr, "arrayed type");
} }
parseContext.precisionQualifierCheck((yyval.interm.type).loc, (yyval.interm.type).basicType, (yyval.interm.type).qualifier); parseContext.precisionQualifierCheck((yyval.interm.type).loc, (yyval.interm.type).basicType, (yyval.interm.type).qualifier);
} }
@ -6556,7 +6556,7 @@ yyreduce:
if ((yyvsp[0].interm.type).arraySizes) { if ((yyvsp[0].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[0].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type"); parseContext.profileRequires((yyvsp[0].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
parseContext.profileRequires((yyvsp[0].interm.type).loc, EEsProfile, 300, 0, "arrayed type"); parseContext.profileRequires((yyvsp[0].interm.type).loc, EEsProfile, 300, nullptr, "arrayed type");
} }
if ((yyvsp[0].interm.type).arraySizes && parseContext.arrayQualifierError((yyvsp[0].interm.type).loc, (yyvsp[-1].interm.type).qualifier)) if ((yyvsp[0].interm.type).arraySizes && parseContext.arrayQualifierError((yyvsp[0].interm.type).loc, (yyvsp[-1].interm.type).qualifier))
@ -6581,7 +6581,7 @@ yyreduce:
#line 1247 "MachineIndependent/glslang.y" #line 1247 "MachineIndependent/glslang.y"
{ {
parseContext.globalCheck((yyvsp[0].lex).loc, "invariant"); parseContext.globalCheck((yyvsp[0].lex).loc, "invariant");
parseContext.profileRequires((yyval.interm.type).loc, ENoProfile, 120, 0, "invariant"); parseContext.profileRequires((yyval.interm.type).loc, ENoProfile, 120, nullptr, "invariant");
(yyval.interm.type).init((yyvsp[0].lex).loc); (yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.invariant = true; (yyval.interm.type).qualifier.invariant = true;
} }
@ -6592,8 +6592,8 @@ yyreduce:
#line 1256 "MachineIndependent/glslang.y" #line 1256 "MachineIndependent/glslang.y"
{ {
parseContext.globalCheck((yyvsp[0].lex).loc, "smooth"); parseContext.globalCheck((yyvsp[0].lex).loc, "smooth");
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "smooth"); parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "smooth");
parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, 0, "smooth"); parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, nullptr, "smooth");
(yyval.interm.type).init((yyvsp[0].lex).loc); (yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.smooth = true; (yyval.interm.type).qualifier.smooth = true;
} }
@ -6604,8 +6604,8 @@ yyreduce:
#line 1263 "MachineIndependent/glslang.y" #line 1263 "MachineIndependent/glslang.y"
{ {
parseContext.globalCheck((yyvsp[0].lex).loc, "flat"); parseContext.globalCheck((yyvsp[0].lex).loc, "flat");
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "flat"); parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "flat");
parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, 0, "flat"); parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, nullptr, "flat");
(yyval.interm.type).init((yyvsp[0].lex).loc); (yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.flat = true; (yyval.interm.type).qualifier.flat = true;
} }
@ -6617,7 +6617,7 @@ yyreduce:
{ {
parseContext.globalCheck((yyvsp[0].lex).loc, "noperspective"); parseContext.globalCheck((yyvsp[0].lex).loc, "noperspective");
parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 0, E_GL_NV_shader_noperspective_interpolation, "noperspective"); parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 0, E_GL_NV_shader_noperspective_interpolation, "noperspective");
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "noperspective"); parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "noperspective");
(yyval.interm.type).init((yyvsp[0].lex).loc); (yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.nopersp = true; (yyval.interm.type).qualifier.nopersp = true;
} }
@ -6945,8 +6945,8 @@ yyreduce:
case 172: /* storage_qualifier: CENTROID */ case 172: /* storage_qualifier: CENTROID */
#line 1466 "MachineIndependent/glslang.y" #line 1466 "MachineIndependent/glslang.y"
{ {
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 120, 0, "centroid"); parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 120, nullptr, "centroid");
parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, 0, "centroid"); parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 300, nullptr, "centroid");
parseContext.globalCheck((yyvsp[0].lex).loc, "centroid"); parseContext.globalCheck((yyvsp[0].lex).loc, "centroid");
(yyval.interm.type).init((yyvsp[0].lex).loc); (yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.centroid = true; (yyval.interm.type).qualifier.centroid = true;
@ -6969,7 +6969,7 @@ yyreduce:
{ {
parseContext.globalCheck((yyvsp[0].lex).loc, "shared"); parseContext.globalCheck((yyvsp[0].lex).loc, "shared");
parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, 430, E_GL_ARB_compute_shader, "shared"); parseContext.profileRequires((yyvsp[0].lex).loc, ECoreProfile | ECompatibilityProfile, 430, E_GL_ARB_compute_shader, "shared");
parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 310, 0, "shared"); parseContext.profileRequires((yyvsp[0].lex).loc, EEsProfile, 310, nullptr, "shared");
parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangComputeMask | EShLangMeshMask | EShLangTaskMask), "shared"); parseContext.requireStage((yyvsp[0].lex).loc, (EShLanguageMask)(EShLangComputeMask | EShLangMeshMask | EShLangTaskMask), "shared");
(yyval.interm.type).init((yyvsp[0].lex).loc); (yyval.interm.type).init((yyvsp[0].lex).loc);
(yyval.interm.type).qualifier.storage = EvqShared; (yyval.interm.type).qualifier.storage = EvqShared;
@ -7415,7 +7415,7 @@ yyreduce:
case 214: /* type_parameter_specifier_opt: %empty */ case 214: /* type_parameter_specifier_opt: %empty */
#line 1745 "MachineIndependent/glslang.y" #line 1745 "MachineIndependent/glslang.y"
{ {
(yyval.interm.typeParameters) = 0; (yyval.interm.typeParameters) = nullptr;
} }
#line 7421 "MachineIndependent/glslang_tab.cpp" #line 7421 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -10779,7 +10779,7 @@ yyreduce:
case 533: /* precision_qualifier: HIGH_PRECISION */ case 533: /* precision_qualifier: HIGH_PRECISION */
#line 3534 "MachineIndependent/glslang.y" #line 3534 "MachineIndependent/glslang.y"
{ {
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "highp precision qualifier"); parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "highp precision qualifier");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqHigh); parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqHigh);
} }
@ -10789,7 +10789,7 @@ yyreduce:
case 534: /* precision_qualifier: MEDIUM_PRECISION */ case 534: /* precision_qualifier: MEDIUM_PRECISION */
#line 3539 "MachineIndependent/glslang.y" #line 3539 "MachineIndependent/glslang.y"
{ {
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "mediump precision qualifier"); parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "mediump precision qualifier");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqMedium); parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqMedium);
} }
@ -10799,7 +10799,7 @@ yyreduce:
case 535: /* precision_qualifier: LOW_PRECISION */ case 535: /* precision_qualifier: LOW_PRECISION */
#line 3544 "MachineIndependent/glslang.y" #line 3544 "MachineIndependent/glslang.y"
{ {
parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, 0, "lowp precision qualifier"); parseContext.profileRequires((yyvsp[0].lex).loc, ENoProfile, 130, nullptr, "lowp precision qualifier");
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqLow); parseContext.handlePrecisionQualifier((yyvsp[0].lex).loc, (yyval.interm.type).qualifier, EpqLow);
} }
@ -10874,7 +10874,7 @@ yyreduce:
{ {
if ((yyvsp[-2].interm.type).arraySizes) { if ((yyvsp[-2].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type"); parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, 0, "arrayed type"); parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, nullptr, "arrayed type");
if (parseContext.isEsProfile()) if (parseContext.isEsProfile())
parseContext.arraySizeRequiredCheck((yyvsp[-2].interm.type).loc, *(yyvsp[-2].interm.type).arraySizes); parseContext.arraySizeRequiredCheck((yyvsp[-2].interm.type).loc, *(yyvsp[-2].interm.type).arraySizes);
} }
@ -10901,7 +10901,7 @@ yyreduce:
{ {
if ((yyvsp[-2].interm.type).arraySizes) { if ((yyvsp[-2].interm.type).arraySizes) {
parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type"); parseContext.profileRequires((yyvsp[-2].interm.type).loc, ENoProfile, 120, E_GL_3DL_array_objects, "arrayed type");
parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, 0, "arrayed type"); parseContext.profileRequires((yyvsp[-2].interm.type).loc, EEsProfile, 300, nullptr, "arrayed type");
if (parseContext.isEsProfile()) if (parseContext.isEsProfile())
parseContext.arraySizeRequiredCheck((yyvsp[-2].interm.type).loc, *(yyvsp[-2].interm.type).arraySizes); parseContext.arraySizeRequiredCheck((yyvsp[-2].interm.type).loc, *(yyvsp[-2].interm.type).arraySizes);
} }
@ -11009,7 +11009,7 @@ yyreduce:
case 552: /* initializer_list: initializer */ case 552: /* initializer_list: initializer */
#line 3691 "MachineIndependent/glslang.y" #line 3691 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = parseContext.intermediate.growAggregate(0, (yyvsp[0].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)->getLoc()); (yyval.interm.intermTypedNode) = parseContext.intermediate.growAggregate(nullptr, (yyvsp[0].interm.intermTypedNode), (yyvsp[0].interm.intermTypedNode)->getLoc());
} }
#line 11015 "MachineIndependent/glslang_tab.cpp" #line 11015 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11100,7 +11100,7 @@ yyreduce:
case 566: /* compound_statement: LEFT_BRACE RIGHT_BRACE */ case 566: /* compound_statement: LEFT_BRACE RIGHT_BRACE */
#line 3735 "MachineIndependent/glslang.y" #line 3735 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = 0; } { (yyval.interm.intermNode) = nullptr; }
#line 11105 "MachineIndependent/glslang_tab.cpp" #line 11105 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11185,7 +11185,7 @@ yyreduce:
case 576: /* compound_statement_no_new_scope: LEFT_BRACE RIGHT_BRACE */ case 576: /* compound_statement_no_new_scope: LEFT_BRACE RIGHT_BRACE */
#line 3778 "MachineIndependent/glslang.y" #line 3778 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 11191 "MachineIndependent/glslang_tab.cpp" #line 11191 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11206,8 +11206,8 @@ yyreduce:
(yyval.interm.intermNode) = parseContext.intermediate.makeAggregate((yyvsp[0].interm.intermNode)); (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 || if ((yyvsp[0].interm.intermNode) && (yyvsp[0].interm.intermNode)->getAsBranchNode() && ((yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpCase ||
(yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpDefault)) { (yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpDefault)) {
parseContext.wrapupSwitchSubsequence(0, (yyvsp[0].interm.intermNode)); parseContext.wrapupSwitchSubsequence(nullptr, (yyvsp[0].interm.intermNode));
(yyval.interm.intermNode) = 0; // start a fresh subsequence for what's after this case (yyval.interm.intermNode) = nullptr; // start a fresh subsequence for what's after this case
} }
} }
#line 11214 "MachineIndependent/glslang_tab.cpp" #line 11214 "MachineIndependent/glslang_tab.cpp"
@ -11218,8 +11218,8 @@ yyreduce:
{ {
if ((yyvsp[0].interm.intermNode) && (yyvsp[0].interm.intermNode)->getAsBranchNode() && ((yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpCase || if ((yyvsp[0].interm.intermNode) && (yyvsp[0].interm.intermNode)->getAsBranchNode() && ((yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpCase ||
(yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpDefault)) { (yyvsp[0].interm.intermNode)->getAsBranchNode()->getFlowOp() == EOpDefault)) {
parseContext.wrapupSwitchSubsequence((yyvsp[-1].interm.intermNode) ? (yyvsp[-1].interm.intermNode)->getAsAggregate() : 0, (yyvsp[0].interm.intermNode)); parseContext.wrapupSwitchSubsequence((yyvsp[-1].interm.intermNode) ? (yyvsp[-1].interm.intermNode)->getAsAggregate() : nullptr, (yyvsp[0].interm.intermNode));
(yyval.interm.intermNode) = 0; // start a fresh subsequence for what's after this case (yyval.interm.intermNode) = nullptr; // start a fresh subsequence for what's after this case
} else } else
(yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode)); (yyval.interm.intermNode) = parseContext.intermediate.growAggregate((yyvsp[-1].interm.intermNode), (yyvsp[0].interm.intermNode));
} }
@ -11228,7 +11228,7 @@ yyreduce:
case 580: /* expression_statement: SEMICOLON */ case 580: /* expression_statement: SEMICOLON */
#line 3808 "MachineIndependent/glslang.y" #line 3808 "MachineIndependent/glslang.y"
{ (yyval.interm.intermNode) = 0; } { (yyval.interm.intermNode) = nullptr; }
#line 11233 "MachineIndependent/glslang_tab.cpp" #line 11233 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11278,7 +11278,7 @@ yyreduce:
#line 3836 "MachineIndependent/glslang.y" #line 3836 "MachineIndependent/glslang.y"
{ {
(yyval.interm.nodePair).node1 = (yyvsp[0].interm.intermNode); (yyval.interm.nodePair).node1 = (yyvsp[0].interm.intermNode);
(yyval.interm.nodePair).node2 = 0; (yyval.interm.nodePair).node2 = nullptr;
} }
#line 11284 "MachineIndependent/glslang_tab.cpp" #line 11284 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11298,11 +11298,11 @@ yyreduce:
parseContext.boolCheck((yyvsp[-2].lex).loc, (yyvsp[-3].interm.type)); parseContext.boolCheck((yyvsp[-2].lex).loc, (yyvsp[-3].interm.type));
TType type((yyvsp[-3].interm.type)); TType 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)); TIntermNode* initNode = parseContext.declareVariable((yyvsp[-2].lex).loc, *(yyvsp[-2].lex).string, (yyvsp[-3].interm.type), nullptr, (yyvsp[0].interm.intermTypedNode));
if (initNode) if (initNode)
(yyval.interm.intermTypedNode) = initNode->getAsTyped(); (yyval.interm.intermTypedNode) = initNode->getAsTyped();
else else
(yyval.interm.intermTypedNode) = 0; (yyval.interm.intermTypedNode) = nullptr;
} }
#line 11308 "MachineIndependent/glslang_tab.cpp" #line 11308 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11341,7 +11341,7 @@ yyreduce:
case 592: /* switch_statement_nonattributed: SWITCH LEFT_PAREN expression RIGHT_PAREN $@9 LEFT_BRACE switch_statement_list RIGHT_BRACE */ case 592: /* switch_statement_nonattributed: SWITCH LEFT_PAREN expression RIGHT_PAREN $@9 LEFT_BRACE switch_statement_list RIGHT_BRACE */
#line 3881 "MachineIndependent/glslang.y" #line 3881 "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); (yyval.interm.intermNode) = parseContext.addSwitch((yyvsp[-7].lex).loc, (yyvsp[-5].interm.intermTypedNode), (yyvsp[-1].interm.intermNode) ? (yyvsp[-1].interm.intermNode)->getAsAggregate() : nullptr);
delete parseContext.switchSequenceStack.back(); delete parseContext.switchSequenceStack.back();
parseContext.switchSequenceStack.pop_back(); parseContext.switchSequenceStack.pop_back();
parseContext.switchLevel.pop_back(); parseContext.switchLevel.pop_back();
@ -11355,7 +11355,7 @@ yyreduce:
case 593: /* switch_statement_list: %empty */ case 593: /* switch_statement_list: %empty */
#line 3893 "MachineIndependent/glslang.y" #line 3893 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 11361 "MachineIndependent/glslang_tab.cpp" #line 11361 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11371,7 +11371,7 @@ yyreduce:
case 595: /* case_label: CASE expression COLON */ case 595: /* case_label: CASE expression COLON */
#line 3902 "MachineIndependent/glslang.y" #line 3902 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
if (parseContext.switchLevel.size() == 0) if (parseContext.switchLevel.size() == 0)
parseContext.error((yyvsp[-2].lex).loc, "cannot appear outside switch statement", "case", ""); parseContext.error((yyvsp[-2].lex).loc, "cannot appear outside switch statement", "case", "");
else if (parseContext.switchLevel.back() != parseContext.statementNestingLevel) else if (parseContext.switchLevel.back() != parseContext.statementNestingLevel)
@ -11388,7 +11388,7 @@ yyreduce:
case 596: /* case_label: DEFAULT COLON */ case 596: /* case_label: DEFAULT COLON */
#line 3914 "MachineIndependent/glslang.y" #line 3914 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
if (parseContext.switchLevel.size() == 0) if (parseContext.switchLevel.size() == 0)
parseContext.error((yyvsp[-1].lex).loc, "cannot appear outside switch statement", "default", ""); parseContext.error((yyvsp[-1].lex).loc, "cannot appear outside switch statement", "default", "");
else if (parseContext.switchLevel.back() != parseContext.statementNestingLevel) else if (parseContext.switchLevel.back() != parseContext.statementNestingLevel)
@ -11434,7 +11434,7 @@ yyreduce:
#line 3946 "MachineIndependent/glslang.y" #line 3946 "MachineIndependent/glslang.y"
{ {
parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]); 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); (yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[0].interm.intermNode), (yyvsp[-2].interm.intermTypedNode), nullptr, true, (yyvsp[-5].lex).loc);
--parseContext.loopNestingLevel; --parseContext.loopNestingLevel;
--parseContext.statementNestingLevel; --parseContext.statementNestingLevel;
--parseContext.controlFlowNestingLevel; --parseContext.controlFlowNestingLevel;
@ -11461,7 +11461,7 @@ yyreduce:
parseContext.boolCheck((yyvsp[0].lex).loc, (yyvsp[-2].interm.intermTypedNode)); parseContext.boolCheck((yyvsp[0].lex).loc, (yyvsp[-2].interm.intermTypedNode));
(yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[-5].interm.intermNode), (yyvsp[-2].interm.intermTypedNode), 0, false, (yyvsp[-4].lex).loc); (yyval.interm.intermNode) = parseContext.intermediate.addLoop((yyvsp[-5].interm.intermNode), (yyvsp[-2].interm.intermTypedNode), nullptr, false, (yyvsp[-4].lex).loc);
parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]); parseContext.symbolTable.pop(&parseContext.defaultPrecision[0]);
--parseContext.loopNestingLevel; --parseContext.loopNestingLevel;
--parseContext.statementNestingLevel; --parseContext.statementNestingLevel;
@ -11525,7 +11525,7 @@ yyreduce:
case 608: /* conditionopt: %empty */ case 608: /* conditionopt: %empty */
#line 4004 "MachineIndependent/glslang.y" #line 4004 "MachineIndependent/glslang.y"
{ {
(yyval.interm.intermTypedNode) = 0; (yyval.interm.intermTypedNode) = nullptr;
} }
#line 11531 "MachineIndependent/glslang_tab.cpp" #line 11531 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11534,7 +11534,7 @@ yyreduce:
#line 4010 "MachineIndependent/glslang.y" #line 4010 "MachineIndependent/glslang.y"
{ {
(yyval.interm.nodePair).node1 = (yyvsp[-1].interm.intermTypedNode); (yyval.interm.nodePair).node1 = (yyvsp[-1].interm.intermTypedNode);
(yyval.interm.nodePair).node2 = 0; (yyval.interm.nodePair).node2 = nullptr;
} }
#line 11540 "MachineIndependent/glslang_tab.cpp" #line 11540 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11826,7 +11826,7 @@ yyreduce:
#line 4190 "MachineIndependent/glslang.y" #line 4190 "MachineIndependent/glslang.y"
{ {
parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-1].lex).i); parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-1].lex).i);
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 11832 "MachineIndependent/glslang_tab.cpp" #line 11832 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11836,7 +11836,7 @@ yyreduce:
{ {
parseContext.intermediate.insertSpirvRequirement((yyvsp[-3].interm.spirvReq)); parseContext.intermediate.insertSpirvRequirement((yyvsp[-3].interm.spirvReq));
parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-1].lex).i); parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-1].lex).i);
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 11842 "MachineIndependent/glslang_tab.cpp" #line 11842 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11845,7 +11845,7 @@ yyreduce:
#line 4199 "MachineIndependent/glslang.y" #line 4199 "MachineIndependent/glslang.y"
{ {
parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate()); parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 11851 "MachineIndependent/glslang_tab.cpp" #line 11851 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11855,7 +11855,7 @@ yyreduce:
{ {
parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq)); parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq));
parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate()); parseContext.intermediate.insertSpirvExecutionMode((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 11861 "MachineIndependent/glslang_tab.cpp" #line 11861 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11864,7 +11864,7 @@ yyreduce:
#line 4208 "MachineIndependent/glslang.y" #line 4208 "MachineIndependent/glslang.y"
{ {
parseContext.intermediate.insertSpirvExecutionModeId((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate()); parseContext.intermediate.insertSpirvExecutionModeId((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 11870 "MachineIndependent/glslang_tab.cpp" #line 11870 "MachineIndependent/glslang_tab.cpp"
break; break;
@ -11874,7 +11874,7 @@ yyreduce:
{ {
parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq)); parseContext.intermediate.insertSpirvRequirement((yyvsp[-5].interm.spirvReq));
parseContext.intermediate.insertSpirvExecutionModeId((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate()); parseContext.intermediate.insertSpirvExecutionModeId((yyvsp[-3].lex).i, (yyvsp[-1].interm.intermNode)->getAsAggregate());
(yyval.interm.intermNode) = 0; (yyval.interm.intermNode) = nullptr;
} }
#line 11880 "MachineIndependent/glslang_tab.cpp" #line 11880 "MachineIndependent/glslang_tab.cpp"
break; break;

2
glslang/MachineIndependent/intermOut.cpp
View File

@ -1552,7 +1552,7 @@ void TIntermediate::output(TInfoSink& infoSink, bool tree)
break; break;
} }
if (treeRoot == 0 || ! tree) if (treeRoot == nullptr || ! tree)
return; return;
TOutputTraverser it(infoSink); TOutputTraverser it(infoSink);

2
glslang/MachineIndependent/linkValidate.cpp
View File

@ -1383,7 +1383,7 @@ void TIntermediate::checkCallGraphCycles(TInfoSink& infoSink)
TCall* newRoot; TCall* newRoot;
do { do {
// See if we have unvisited parts of the graph. // See if we have unvisited parts of the graph.
newRoot = 0; newRoot = nullptr;
for (TGraph::iterator call = callGraph.begin(); call != callGraph.end(); ++call) { for (TGraph::iterator call = callGraph.begin(); call != callGraph.end(); ++call) {
if (! call->visited) { if (! call->visited) {
newRoot = &(*call); newRoot = &(*call);

2
glslang/MachineIndependent/localintermediate.h
View File

@ -284,7 +284,7 @@ public:
explicit TIntermediate(EShLanguage l, int v = 0, EProfile p = ENoProfile) : explicit TIntermediate(EShLanguage l, int v = 0, EProfile p = ENoProfile) :
language(l), language(l),
profile(p), version(v), profile(p), version(v),
treeRoot(0), treeRoot(nullptr),
resources(TBuiltInResource{}), resources(TBuiltInResource{}),
numEntryPoints(0), numErrors(0), numPushConstants(0), recursive(false), numEntryPoints(0), numErrors(0), numPushConstants(0), recursive(false),
invertY(false), invertY(false),

2
glslang/MachineIndependent/parseConst.cpp
View File

@ -198,7 +198,7 @@ void TConstTraverser::visitConstantUnion(TIntermConstantUnion* node)
bool TIntermediate::parseConstTree(TIntermNode* root, TConstUnionArray unionArray, TOperator constructorType, const TType& t, bool singleConstantParam) bool TIntermediate::parseConstTree(TIntermNode* root, TConstUnionArray unionArray, TOperator constructorType, const TType& t, bool singleConstantParam)
{ {
if (root == 0) if (root == nullptr)
return false; return false;
TConstTraverser it(unionArray, singleConstantParam, constructorType, t); TConstTraverser it(unionArray, singleConstantParam, constructorType, t);

2
glslang/MachineIndependent/parseVersions.h
View File

@ -65,7 +65,7 @@ public:
infoSink(infoSink), version(version), infoSink(infoSink), version(version),
language(language), language(language),
spvVersion(spvVersion), spvVersion(spvVersion),
intermediate(interm), messages(messages), numErrors(0), currentScanner(0) { } intermediate(interm), messages(messages), numErrors(0), currentScanner(nullptr) { }
virtual ~TParseVersions() { } virtual ~TParseVersions() { }
void requireStage(const TSourceLoc&, EShLanguageMask, const char* featureDesc); void requireStage(const TSourceLoc&, EShLanguageMask, const char* featureDesc);
void requireStage(const TSourceLoc&, EShLanguage, const char* featureDesc); void requireStage(const TSourceLoc&, EShLanguage, const char* featureDesc);

2
glslang/MachineIndependent/preprocessor/PpContext.cpp
View File

@ -85,7 +85,7 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace glslang { namespace glslang {
TPpContext::TPpContext(TParseContextBase& pc, const std::string& rootFileName, TShader::Includer& inclr) : TPpContext::TPpContext(TParseContextBase& pc, const std::string& rootFileName, TShader::Includer& inclr) :
preamble(0), strings(0), previous_token('\n'), parseContext(pc), includer(inclr), inComment(false), preamble(nullptr), strings(nullptr), previous_token('\n'), parseContext(pc), includer(inclr), inComment(false),
rootFileName(rootFileName), rootFileName(rootFileName),
currentSourceFile(rootFileName), currentSourceFile(rootFileName),
disableEscapeSequences(false) disableEscapeSequences(false)

2
glslang/MachineIndependent/preprocessor/PpTokens.cpp
View File

@ -121,7 +121,7 @@ int TPpContext::TokenStream::getToken(TParseContextBase& parseContext, TPpToken
if (atom == '#') { if (atom == '#') {
if (peekToken('#')) { if (peekToken('#')) {
parseContext.requireProfile(ppToken->loc, ~EEsProfile, "token pasting (##)"); parseContext.requireProfile(ppToken->loc, ~EEsProfile, "token pasting (##)");
parseContext.profileRequires(ppToken->loc, ~EEsProfile, 130, 0, "token pasting (##)"); parseContext.profileRequires(ppToken->loc, ~EEsProfile, 130, nullptr, "token pasting (##)");
currentPos++; currentPos++;
atom = PpAtomPaste; atom = PpAtomPaste;
} }

2
glslang/MachineIndependent/propagateNoContraction.cpp
View File

@ -423,7 +423,7 @@ getSymbolToDefinitionMappingAndPreciseSymbolIDs(const glslang::TIntermediate& in
ReturnBranchNodeSet()); ReturnBranchNodeSet());
TIntermNode* root = intermediate.getTreeRoot(); TIntermNode* root = intermediate.getTreeRoot();
if (root == 0) if (root == nullptr)
return result_tuple; return result_tuple;
NodeMapping& symbol_definition_mapping = std::get<0>(result_tuple); NodeMapping& symbol_definition_mapping = std::get<0>(result_tuple);

2
glslang/MachineIndependent/reflection.cpp
View File

@ -682,7 +682,7 @@ public:
} }
// For a binary operation indexing into an aggregate, chase down the base of the aggregate. // For a binary operation indexing into an aggregate, chase down the base of the aggregate.
// Return 0 if the topology does not fit this situation. // Return nullptr if the topology does not fit this situation.
TIntermSymbol* findBase(const TIntermBinary* node) TIntermSymbol* findBase(const TIntermBinary* node)
{ {
TIntermSymbol *base = node->getLeft()->getAsSymbolNode(); TIntermSymbol *base = node->getLeft()->getAsSymbolNode();

2
glslang/OSDependent/Unix/ossource.cpp
View File

@ -76,7 +76,7 @@ OS_TLSIndex OS_AllocTLSIndex()
// //
// Create global pool key. // Create global pool key.
// //
if ((pthread_key_create(&pPoolIndex, NULL)) != 0) { if ((pthread_key_create(&pPoolIndex, nullptr)) != 0) {
assert(0 && "OS_AllocTLSIndex(): Unable to allocate Thread Local Storage"); assert(0 && "OS_AllocTLSIndex(): Unable to allocate Thread Local Storage");
return OS_INVALID_TLS_INDEX; return OS_INVALID_TLS_INDEX;
} }

4
glslang/OSDependent/Windows/ossource.cpp
View File

@ -113,7 +113,7 @@ HANDLE GlobalLock;
void InitGlobalLock() void InitGlobalLock()
{ {
GlobalLock = CreateMutex(0, false, 0); GlobalLock = CreateMutex(nullptr, false, nullptr);
} }
void GetGlobalLock() void GetGlobalLock()
@ -128,7 +128,7 @@ void ReleaseGlobalLock()
unsigned int __stdcall EnterGenericThread (void* entry) unsigned int __stdcall EnterGenericThread (void* entry)
{ {
return ((TThreadEntrypoint)entry)(0); return ((TThreadEntrypoint)entry)(nullptr);
} }
//#define DUMP_COUNTERS //#define DUMP_COUNTERS

2
glslang/OSDependent/osinclude.h
View File

@ -41,7 +41,7 @@ namespace glslang {
// Thread Local Storage Operations // Thread Local Storage Operations
// //
typedef void* OS_TLSIndex; typedef void* OS_TLSIndex;
#define OS_INVALID_TLS_INDEX ((void*)0) #define OS_INVALID_TLS_INDEX nullptr
OS_TLSIndex OS_AllocTLSIndex(); OS_TLSIndex OS_AllocTLSIndex();
bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue); bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue);