Non-functional changes: Typo in error message and in comment, remove unneeded…

Non-functional changes: Typo in error message and in comment, remove unneeded arguments, separate constructor-op mapping from handling constructors. git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23389 e7fa87d3-cd2b-0410-9028-fcbf551c1848

Non-functional changes: Typo in error message and in comment, remove unneeded…
98c2ef25 · John Kessenich · 816e9bc9 · 98c2ef25 · 98c2ef25 · 98c2ef25
Commit 98c2ef25 authored Oct 05, 2013 by John Kessenich
28 changed files
--- a/Test/baseResults/330.frag.out
+++ b/Test/baseResults/330.frag.out
-Warning, version 330 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.
 WARNING: 0:6: varying deprecated in version 130; may be removed in future release
 0:? Sequence
 0:8  Function Definition: main( (void)

--- a/Test/baseResults/330comp.frag.out
+++ b/Test/baseResults/330comp.frag.out
-Warning, version 330 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.
 0:? Sequence
 0:8  Function Definition: main( (void)
 0:8    Function Parameters: 

--- a/Test/baseResults/400.frag.out
+++ b/Test/baseResults/400.frag.out
-Warning, version 330 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:11: 'variable indexing sampler array' : not supported for this version or the enabled extensions 
 ERROR: 1 compilation errors.  No code generated.


--- a/Test/baseResults/400.geom.out
+++ b/Test/baseResults/400.geom.out
-Warning, version 400 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 400 is not yet complete; some version-specific features are present, but many are missing.
 0:? Sequence
 0:3  Function Definition: main( (void)
 0:3    Function Parameters: 

--- a/Test/baseResults/400.tesc.out
+++ b/Test/baseResults/400.tesc.out
-Warning, version 400 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 400 is not yet complete; some version-specific features are present, but many are missing.
 0:? Sequence
 0:3  Function Definition: main( (void)
 0:3    Function Parameters: 

--- a/Test/baseResults/400.tese.out
+++ b/Test/baseResults/400.tese.out
-Warning, version 400 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 400 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:5: 'barrier' : no matching overloaded function found 
 ERROR: 1 compilation errors.  No code generated.


--- a/Test/baseResults/420.tese.out
+++ b/Test/baseResults/420.tese.out
-Warning, version 420 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 420 is not yet complete; some version-specific features are present, but many are missing.
 0:? Sequence
 0:3  Function Definition: main( (void)
 0:3    Function Parameters: 

--- a/Test/baseResults/420.vert.out
+++ b/Test/baseResults/420.vert.out
-Warning, version 420 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 420 is not yet complete; some version-specific features are present, but many are missing.
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release
 ERROR: 0:3: 'varying' : no longer supported in core profile; removed in version 420
 ERROR: 0:7: '' : vertex input cannot be further qualified 

--- a/Test/baseResults/430.comp.out
+++ b/Test/baseResults/430.comp.out
-Warning, version 430 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
 0:? Sequence
 0:3  Function Definition: main( (void)
 0:3    Function Parameters: 

--- a/Test/baseResults/430scope.vert.out
+++ b/Test/baseResults/430scope.vert.out
-Warning, version 430 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:5: 'a' : redefinition 
 ERROR: 0:17: 'b' : illegal redeclaration 
 ERROR: 0:19: 'f' : redefinition 

--- a/Test/baseResults/comment.frag.out
+++ b/Test/baseResults/comment.frag.out
-Warning, version 430 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
 0:? Sequence
 0:17  Function Definition: main( (void)
 0:17    Function Parameters: 

--- a/Test/baseResults/constErrors.frag.out
+++ b/Test/baseResults/constErrors.frag.out
-Warning, version 330 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:14: '=' :  assigning non-constant to 'const int'
 ERROR: 0:17: '' : constant expression required 
 ERROR: 0:17: '' : array size must be a constant integer expression 

--- a/Test/baseResults/constFold.frag.out
+++ b/Test/baseResults/constFold.frag.out
-Warning, version 430 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
 0:? Sequence
 0:28  Function Definition: main( (void)
 0:28    Function Parameters: 

--- a/Test/baseResults/dce.frag.out
+++ b/Test/baseResults/dce.frag.out
-Warning, version 400 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 400 is not yet complete; some version-specific features are present, but many are missing.
 0:? Sequence
 0:5  Sequence
 0:5    move second child to first child (int)

--- a/Test/baseResults/mains1.frag.out
+++ b/Test/baseResults/mains1.frag.out
@@ -16,7 +16,7 @@ Warning, version 110 is not yet complete; most features are present, but a few a

 noMain1.geom
 ERROR: #version: geometry shaders require non-es profile and version 150 or above
-Warning, version 150 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 1 compilation errors.  No code generated.


@@ -26,7 +26,7 @@ ERROR: node is still EOpNull!
 0:?   Linker Objects

 noMain2.geom
-Warning, version 150 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.

 0:? Sequence
 0:3  Function Definition: bar( (void)

--- a/Test/baseResults/matrix2.frag.out
+++ b/Test/baseResults/matrix2.frag.out
-Warning, version 150 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release
 WARNING: 0:13: varying deprecated in version 130; may be removed in future release
 WARNING: 0:15: varying deprecated in version 130; may be removed in future release

--- a/Test/baseResults/newTexture.frag.out
+++ b/Test/baseResults/newTexture.frag.out
-Warning, version 430 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
 0:? Sequence
 0:34  Function Definition: main( (void)
 0:34    Function Parameters: 

--- a/Test/baseResults/numeral.frag.out
+++ b/Test/baseResults/numeral.frag.out
-Warning, version 400 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 400 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:14: '' : octal literal digit too large 
 ERROR: 0:15: '' : octal literal digit too large 
 ERROR: 0:16: '' : octal literal digit too large 

--- a/Test/baseResults/recurse1.vert.out
+++ b/Test/baseResults/recurse1.vert.out
 recurse1.vert
-Warning, version 330 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.

 0:? Sequence
 0:3  Function Definition: main( (void)
@@ -69,7 +69,7 @@ Warning, version 330 is not yet complete; some version-specific are present, but
 0:?     'gl_InstanceID' (gl_InstanceId int)

 recurse1.frag
-Warning, version 330 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.

 0:? Sequence
 0:5  Function Definition: main( (void)
@@ -104,7 +104,7 @@ Warning, version 330 is not yet complete; some version-specific are present, but
 0:?   Linker Objects

 recurse2.frag
-Warning, version 330 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 330 is not yet complete; some version-specific features are present, but many are missing.

 0:? Sequence
 0:9  Function Definition: cbar(i1; (float)

--- a/Test/baseResults/simpleFunctionCall.frag.out
+++ b/Test/baseResults/simpleFunctionCall.frag.out
-Warning, version 150 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release
 0:? Sequence
 0:7  Function Definition: foo( (4-component vector of float)

--- a/Test/baseResults/specExamples.frag.out
+++ b/Test/baseResults/specExamples.frag.out
-Warning, version 430 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:6: '=' :  cannot convert from 'const uint' to 'int'
 ERROR: 0:20: '' : numeric literal too big 
 ERROR: 0:21: '' : hexidecimal literal too big 

--- a/Test/baseResults/specExamples.vert.out
+++ b/Test/baseResults/specExamples.vert.out
-Warning, version 430 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:5: 'Vertex' : only uniform interface blocks are supported 
 ERROR: 0:10: 'Vertex2' : only uniform interface blocks are supported 
 ERROR: 0:23: 'transforms' : redeclaration of array with size 

--- a/Test/baseResults/versionsClean.vert.out
+++ b/Test/baseResults/versionsClean.vert.out
-Warning, version 420 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 420 is not yet complete; some version-specific features are present, but many are missing.
 0:? Sequence
 0:40  Function Definition: main( (void)
 0:40    Function Parameters: 

--- a/Test/baseResults/versionsErrors.vert.out
+++ b/Test/baseResults/versionsErrors.vert.out
-Warning, version 420 is not yet complete; some version-specific are present, but many are missing.
+Warning, version 420 is not yet complete; some version-specific features are present, but many are missing.
 WARNING: 0:38: attribute deprecated in version 130; may be removed in future release
 ERROR: 0:38: 'attribute' : no longer supported in core profile; removed in version 420
 ERROR: 0:45: 'discard' : not supported in this stage: vertex

--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -321,7 +321,7 @@ TIntermTyped* TIntermediate::addBuiltInFunctionCall(TSourceLoc loc, TOperator op
 // This is the safe way to change the operator on an aggregate, as it
 // does lots of error checking and fixing.  Especially for establishing
 // a function call's operation on it's set of parameters.  Sequences
-// of instructions are also aggregates, but they just direnctly set
+// of instructions are also aggregates, but they just directly set
 // their operator to EOpSequence.
 //
 // Returns an aggregate node, which could be the one passed in if
@@ -629,7 +629,7 @@ TIntermAggregate* TIntermediate::growAggregate(TIntermNode* left, TIntermNode* r
    TIntermAggregate* aggNode = 0;
    if (left)
        aggNode = left->getAsAggregate();
-    if (!aggNode || aggNode->getOp() != EOpNull) {
+    if (! aggNode || aggNode->getOp() != EOpNull) {
        aggNode = new TIntermAggregate;
        if (left)
            aggNode->getSequence().push_back(left);
@@ -645,7 +645,7 @@ TIntermAggregate* TIntermediate::growAggregate(TIntermNode* left, TIntermNode* r
 {
    TIntermAggregate* aggNode = growAggregate(left, right);
    if (aggNode)
-    aggNode->setLoc(loc);
+        aggNode->setLoc(loc);

    return aggNode;
 }

--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
--- a/glslang/MachineIndependent/ParseHelper.h
+++ b/glslang/MachineIndependent/ParseHelper.h
@@ -111,7 +111,7 @@ public:
    void precisionQualifierCheck(TSourceLoc, TPublicType&);
    void parameterSamplerCheck(TSourceLoc, TStorageQualifier qualifier, const TType& type);
    bool containsSampler(const TType& type);
-    TVariable* redeclareBuiltin(TSourceLoc, const TString&, const TType&, bool& newDeclaration);
+    TVariable* redeclareBuiltin(TSourceLoc, const TString&, bool& newDeclaration);
    void paramCheck(TSourceLoc, TStorageQualifier qualifier, TType* type);
    void nestedBlockCheck(TSourceLoc);
    void nestedStructCheck(TSourceLoc);
@@ -165,7 +165,8 @@ protected:
    void nonInitConstCheck(TSourceLoc, TString& identifier, TType& type);
    TVariable* declareNonArray(TSourceLoc, TString& identifier, TType&, bool& newDeclaration);
    void declareArray(TSourceLoc, TString& identifier, const TType&, TVariable*&, bool& newDeclaration);
-    TIntermNode* executeInitializer(TSourceLoc, TString& identifier, TType&, TIntermTyped* initializer, TVariable* variable);
+    TIntermNode* executeInitializer(TSourceLoc, TString& identifier, TIntermTyped* initializer, TVariable* variable);
+    TOperator mapTypeToConstructorOp(const TType&);

 public:
    //

--- a/glslang/MachineIndependent/ShaderLang.cpp
+++ b/glslang/MachineIndependent/ShaderLang.cpp
@@ -389,7 +389,7 @@ bool DeduceVersionProfile(TInfoSink& infoSink, EShLanguage stage, bool versionNo
        infoSink.info << "Warning, version " << version << " is not yet complete; most features are present, but a few are missing.\n";
        break;
    default:
-        infoSink.info << "Warning, version " << version << " is not yet complete; some version-specific are present, but many are missing.\n";
+        infoSink.info << "Warning, version " << version << " is not yet complete; some version-specific features are present, but many are missing.\n";
        break;
    }