glslang front-end: Don't emit blank lines for empty info logs. From Andrew Woloszyn <awoloszyn@google.com>.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31531 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2015-06-19 05:14:19 +00:00
parent 2f21fccee9
commit 6626cadbad
119 changed files with 16 additions and 257 deletions

View File

@ -589,6 +589,15 @@ CompileShaders(void*)
const char* GlslStd450DebugNames[GLSL_STD_450::Count];
// Outputs the given string, but only if it is non-null and non-empty.
// This prevents erroneous newlines from appearing.
void puts_if_non_empty(const char* str)
{
if (str && str[0]) {
puts(str);
}
}
//
// For linking mode: Will independently parse each item in the worklist, but then put them
// in the same program and link them together.
@ -635,9 +644,9 @@ void CompileAndLinkShaders()
program.addShader(shader);
if (! (Options & EOptionSuppressInfolog)) {
puts(workItem->name.c_str());
puts(shader->getInfoLog());
puts(shader->getInfoDebugLog());
puts_if_non_empty(workItem->name.c_str());
puts_if_non_empty(shader->getInfoLog());
puts_if_non_empty(shader->getInfoDebugLog());
}
FreeFileData(shaderStrings);
@ -651,8 +660,8 @@ void CompileAndLinkShaders()
LinkFailed = true;
if (! (Options & EOptionSuppressInfolog)) {
puts(program.getInfoLog());
puts(program.getInfoDebugLog());
puts_if_non_empty(program.getInfoLog());
puts_if_non_empty(program.getInfoDebugLog());
}
if (Options & EOptionDumpReflection) {
@ -760,8 +769,8 @@ int C_DECL main(int argc, char* argv[])
for (int w = 0; w < NumWorkItems; ++w) {
if (Work[w]) {
if (printShaderNames)
puts(Work[w]->name.c_str());
puts(Work[w]->results.c_str());
puts_if_non_empty(Work[w]->name.c_str());
puts_if_non_empty(Work[w]->results.c_str());
delete Work[w];
}
}

View File

@ -1,5 +1,4 @@
100Limits.vert
Shader version: 100
0:? Sequence
0:15 Function Definition: foo(f1; (global void)

View File

@ -1,5 +1,4 @@
150.tesc
Shader version: 150
Requested GL_ARB_tessellation_shader
vertices = 4

View File

@ -1,5 +1,4 @@
300link.frag
Shader version: 300
0:? Sequence
0:8 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
300link2.frag
Shader version: 300
0:? Sequence
0:9 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
300link3.frag
Shader version: 300
0:? Sequence
0:7 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
330comp.frag
Shader version: 330
0:? Sequence
0:8 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
Operations.frag
Shader version: 130
0:? Sequence
0:15 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
always-discard.frag
Shader version: 110
0:? Sequence
0:4 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
always-discard2.frag
Shader version: 110
0:? Sequence
0:4 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
conditionalDiscard.frag
Shader version: 110
0:? Sequence
0:6 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
conversion.frag
Shader version: 130
0:? Sequence
0:33 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
deepRvalue.frag
Shader version: 120
0:? Sequence
0:5 Sequence

View File

@ -1,5 +1,4 @@
discard-dce.frag
Shader version: 110
0:? Sequence
0:4 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
doWhileLoop.frag
Shader version: 110
0:? Sequence
0:7 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
earlyReturnDiscard.frag
Shader version: 110
0:? Sequence
0:19 Function Definition: main( (global void)

View File

@ -1,17 +1,14 @@
empty.frag
Shader version: 100
0:? Sequence
0:? Linker Objects
empty2.frag
Shader version: 100
0:? Sequence
0:? Linker Objects
empty3.frag
Shader version: 110
0:? Sequence
0:? Linker Objects

View File

@ -1,5 +1,4 @@
flowControl.frag
Shader version: 120
0:? Sequence
0:10 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
forLoop.frag
Shader version: 130
0:? Sequence
0:10 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
forwardRef.frag
Shader version: 110
0:? Sequence
0:11 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
length.frag
Shader version: 120
0:? Sequence
0:11 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
link1.frag
Shader version: 130
0:? Sequence
0:8 Sequence
@ -80,7 +79,6 @@ Shader version: 130
0:? 3.900000
link2.frag
Shader version: 130
Requested GL_OES_standard_derivatives
Requested GL_OES_texture_3D
@ -152,7 +150,6 @@ Requested GL_OES_texture_3D
0:? 3.900000
link3.frag
Shader version: 300
Requested GL_OES_EGL_image_external
Requested GL_OES_standard_derivatives

View File

@ -1,5 +1,4 @@
mains1.frag
Shader version: 110
0:? Sequence
0:3 Function Definition: main( (global void)
@ -7,7 +6,6 @@ Shader version: 110
0:? Linker Objects
mains2.frag
Shader version: 110
0:? Sequence
0:3 Function Definition: main( (global void)
@ -30,7 +28,6 @@ ERROR: node is still EOpNull!
0:? Linker Objects
noMain2.geom
Shader version: 150
invocations = 0
max_vertices = 0

View File

@ -1,5 +1,4 @@
noMain.vert
Shader version: 300
0:? Sequence
0:3 Function Definition: foo( (global void)

View File

@ -1,5 +1,4 @@
nonSquare.vert
Shader version: 120
0:? Sequence
0:15 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
pointCoord.frag
Shader version: 100
0:? Sequence
0:5 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
prepost.frag
Shader version: 140
0:? Sequence
0:3 Function Definition: main( (global void)

View File

@ -14,5 +14,3 @@ void main(){
gl_Position = vec4(3 + 2 + 2 * 4 + 2 + 3 * 2);
}

View File

@ -14,5 +14,3 @@
int main(){
}

View File

@ -10,5 +10,3 @@
int main(){
}

View File

@ -19,5 +19,3 @@ int main(){
gl_Position = vec4(4 + 3 + 3);
}

View File

@ -22,5 +22,3 @@ void main(){
#line 1

View File

@ -10,5 +10,3 @@
int main(){
}

View File

@ -21,5 +21,3 @@ int main(){
gl_Position = vec4(fn(3));
}

View File

@ -1,5 +1,4 @@
recurse1.vert
Shader version: 330
0:? Sequence
0:3 Function Definition: main( (global void)
@ -69,7 +68,6 @@ Shader version: 330
0:? 'gl_InstanceID' (gl_InstanceId int InstanceId)
recurse1.frag
Shader version: 330
0:? Sequence
0:5 Function Definition: main( (global void)
@ -157,7 +155,6 @@ Shader version: 330
0:? Linker Objects
recurse2.frag
Shader version: 330
0:? Sequence
0:9 Function Definition: cbar(i1; (global float)

View File

@ -2,11 +2,9 @@ reflection.vert
Warning, version 440 is not yet complete; most version-specific features are present, but some are missing.
Linked vertex stage:
Uniform reflection:
image_ui2D: offset -1, type 9063, size 1, index -1
sampler_2D: offset -1, type 8b5e, size 1, index -1

View File

@ -1,5 +1,4 @@
sample.frag
Shader version: 110
0:? Sequence
0:38 Function Definition: main( (global void)

View File

@ -1,5 +1,4 @@
sample.vert
Shader version: 110
0:? Sequence
0:38 Function Definition: main( (global void)

View File

@ -1,11 +1,8 @@
spv.100ops.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 48

View File

@ -2,9 +2,7 @@ spv.130.frag
WARNING: 0:34: '#extension' : extension is only partially supported: GL_ARB_gpu_shader5
Linked fragment stage:
Missing functionality: texture gather

View File

@ -1,11 +1,8 @@
spv.140.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 90

View File

@ -1,11 +1,8 @@
spv.150.geom
Linked geometry stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 72

View File

@ -1,11 +1,8 @@
spv.150.vert
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 53

View File

@ -1,11 +1,8 @@
spv.300BuiltIns.vert
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 41

View File

@ -1,11 +1,8 @@
spv.300layout.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 38

View File

@ -1,9 +1,6 @@
spv.300layout.vert
Linked vertex stage:
Missing functionality: binary operation on matrix

View File

@ -1,11 +1,8 @@
spv.300layoutp.vert
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 112

View File

@ -2,9 +2,7 @@ spv.310.comp
Warning, version 310 is not yet complete; most version-specific features are present, but some are missing.
Linked compute stage:
Missing functionality: Unsized array

View File

@ -1,11 +1,8 @@
spv.330.geom
Linked geometry stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 33

View File

@ -2,9 +2,7 @@ spv.400.frag
Warning, version 400 is not yet complete; most version-specific features are present, but some are missing.
Linked fragment stage:
Missing functionality: texture gather

View File

@ -2,11 +2,9 @@ spv.400.tesc
Warning, version 400 is not yet complete; most version-specific features are present, but some are missing.
Linked tessellation control stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 89

View File

@ -2,11 +2,9 @@ spv.400.tese
Warning, version 400 is not yet complete; most version-specific features are present, but some are missing.
Linked tessellation evaluation stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 99

View File

@ -2,9 +2,7 @@ spv.420.geom
Warning, version 420 is not yet complete; most version-specific features are present, but some are missing.
Linked geometry stage:
Missing functionality: texture gather

View File

@ -2,11 +2,9 @@ spv.430.vert
Warning, version 430 is not yet complete; most version-specific features are present, but some are missing.
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 62

View File

@ -1,11 +1,8 @@
spv.Operations.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 399

View File

@ -2,11 +2,9 @@ spv.accessChain.frag
Warning, version 420 is not yet complete; most version-specific features are present, but some are missing.
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 198

View File

@ -3,9 +3,7 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
WARNING: 0:6: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
Missing functionality: Composite comparison of non-vectors

View File

@ -1,11 +1,8 @@
spv.always-discard.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 81

View File

@ -1,11 +1,8 @@
spv.always-discard2.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 37

View File

@ -1,11 +1,8 @@
spv.conditionalDiscard.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 36

View File

@ -1,11 +1,8 @@
spv.conversion.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 444

View File

@ -2,11 +2,9 @@ spv.dataOut.frag
WARNING: 0:3: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 21

View File

@ -2,11 +2,9 @@ spv.dataOutIndirect.frag
WARNING: 0:3: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 23

View File

@ -3,11 +3,9 @@ WARNING: 0:3: attribute deprecated in version 130; may be removed in future rele
WARNING: 0:4: varying deprecated in version 130; may be removed in future release
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 39

View File

@ -1,9 +1,6 @@
spv.deepRvalue.frag
Linked fragment stage:
Missing functionality: binary operation on matrix

View File

@ -3,11 +3,9 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
WARNING: 0:4: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 19

View File

@ -1,11 +1,8 @@
spv.discard-dce.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 81

View File

@ -1,11 +1,8 @@
spv.do-simple.vert
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 26

View File

@ -1,11 +1,8 @@
spv.do-while-continue-break.vert
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 48

View File

@ -1,11 +1,8 @@
spv.doWhileLoop.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 34

View File

@ -2,11 +2,9 @@ spv.double.comp
Warning, version 430 is not yet complete; most version-specific features are present, but some are missing.
Linked compute stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 63

View File

@ -1,11 +1,8 @@
spv.earlyReturnDiscard.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 112

View File

@ -1,11 +1,8 @@
spv.flowControl.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 42

View File

@ -1,11 +1,8 @@
spv.for-continue-break.vert
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 49

View File

@ -1,11 +1,8 @@
spv.for-simple.vert
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 26

View File

@ -1,11 +1,8 @@
spv.forLoop.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 123

View File

@ -1,11 +1,8 @@
spv.forwardFun.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 59

View File

@ -2,11 +2,9 @@ spv.functionCall.frag
WARNING: 0:4: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 76

View File

@ -2,11 +2,9 @@ spv.functionSemantics.frag
Warning, version 400 is not yet complete; most version-specific features are present, but some are missing.
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 159

View File

@ -1,11 +1,8 @@
spv.length.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 34

View File

@ -3,11 +3,9 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
WARNING: 0:5: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 134

View File

@ -2,11 +2,9 @@ spv.loops.frag
WARNING: 0:14: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 737

View File

@ -2,11 +2,9 @@ spv.loopsArtificial.frag
WARNING: 0:14: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 192

View File

@ -1,11 +1,8 @@
spv.matFun.vert
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 94

View File

@ -4,9 +4,7 @@ WARNING: 0:17: varying deprecated in version 130; may be removed in future relea
WARNING: 0:22: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
Missing functionality: Composite comparison of non-vectors

View File

@ -4,9 +4,7 @@ WARNING: 0:13: varying deprecated in version 130; may be removed in future relea
WARNING: 0:15: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
Missing functionality: binary operation on matrix

View File

@ -2,9 +2,7 @@ spv.newTexture.frag
Warning, version 430 is not yet complete; most version-specific features are present, but some are missing.
Linked fragment stage:
Missing functionality: texel fetch

View File

@ -1,11 +1,8 @@
spv.nonSquare.vert
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 91

View File

@ -1,11 +1,8 @@
spv.precision.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 111

View File

@ -1,11 +1,8 @@
spv.prepost.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 97

View File

@ -2,11 +2,9 @@ spv.qualifiers.vert
Warning, version 430 is not yet complete; most version-specific features are present, but some are missing.
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 26

View File

@ -2,11 +2,9 @@ spv.set.vert
Warning, version 450 is not yet complete; most version-specific features are present, but some are missing.
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 25

View File

@ -2,11 +2,9 @@ spv.simpleFunctionCall.frag
WARNING: 0:4: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 23

View File

@ -1,11 +1,8 @@
spv.simpleMat.vert
Linked vertex stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 44

View File

@ -2,11 +2,9 @@ spv.structAssignment.frag
WARNING: 0:4: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 50

View File

@ -2,11 +2,9 @@ spv.structDeref.frag
WARNING: 0:4: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 120

View File

@ -2,11 +2,9 @@ spv.structure.frag
WARNING: 0:3: varying deprecated in version 130; may be removed in future release
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 61

View File

@ -4,11 +4,9 @@ WARNING: 0:134: 'switch' : last case/default label not followed by statements
WARNING: 0:139: 'switch' : last case/default label not followed by statements
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 261

View File

@ -1,11 +1,8 @@
spv.swizzle.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 112

View File

@ -1,11 +1,8 @@
spv.test.frag
Linked fragment stage:
// Module Version 99
// Generated by (magic number): 51a00bb
// Id's are bound by 54

Some files were not shown because too many files have changed in this diff Show More