Merge pull request #1897 from dj2/unused
Comment out unused params; Fix type warning.
This commit is contained in:
		
						commit
						fe0b2bd694
					
				@ -357,7 +357,7 @@ void AddTabledBuiltin(TString& decls, const BuiltInFunction& function)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// See if the tabled versioning information allows the current version.
 | 
					// See if the tabled versioning information allows the current version.
 | 
				
			||||||
bool ValidVersion(const BuiltInFunction& function, int version, EProfile profile, const SpvVersion& spvVersion)
 | 
					bool ValidVersion(const BuiltInFunction& function, int version, EProfile profile, const SpvVersion& /* spVersion */)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
#ifdef GLSLANG_WEB
 | 
					#ifdef GLSLANG_WEB
 | 
				
			||||||
    // all entries in table are valid
 | 
					    // all entries in table are valid
 | 
				
			||||||
@ -417,8 +417,7 @@ void TBuiltIns::addTabledBuiltins(int version, EProfile profile, const SpvVersio
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Relate all tables of built-ins to the AST operators.
 | 
					// Relate all tables of built-ins to the AST operators.
 | 
				
			||||||
void TBuiltIns::relateTabledBuiltins(int version, EProfile profile, const SpvVersion& spvVersion, EShLanguage stage,
 | 
					void TBuiltIns::relateTabledBuiltins(int /* version */, EProfile /* profile */, const SpvVersion& /* spvVersion */, EShLanguage /* stage */, TSymbolTable& symbolTable)
 | 
				
			||||||
    TSymbolTable& symbolTable)
 | 
					 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    RelateTabledBuiltins(BaseFunctions, symbolTable);
 | 
					    RelateTabledBuiltins(BaseFunctions, symbolTable);
 | 
				
			||||||
    RelateTabledBuiltins(DerivativeFunctions, symbolTable);
 | 
					    RelateTabledBuiltins(DerivativeFunctions, symbolTable);
 | 
				
			||||||
@ -6287,7 +6286,7 @@ void TBuiltIns::add2ndGenerationSamplingImaging(int version, EProfile profile, c
 | 
				
			|||||||
                            continue;
 | 
					                            continue;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        // Loop over the bTypes
 | 
					                        // Loop over the bTypes
 | 
				
			||||||
                        for (int bType = 0; bType < sizeof(bTypes)/sizeof(TBasicType); ++bType) {
 | 
					                        for (size_t bType = 0; bType < sizeof(bTypes)/sizeof(TBasicType); ++bType) {
 | 
				
			||||||
#ifndef GLSLANG_WEB
 | 
					#ifndef GLSLANG_WEB
 | 
				
			||||||
                            if (bTypes[bType] == EbtFloat16 && (profile == EEsProfile || version < 450))
 | 
					                            if (bTypes[bType] == EbtFloat16 && (profile == EEsProfile || version < 450))
 | 
				
			||||||
                                continue;
 | 
					                                continue;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user