Skip to content

G
glslang
Commit 59420fd3 by John Kessenich
Options

SPV: Move to deterministic results for OpEntryPoint, for test stability across platforms.

parent 7ba6341a
Showing with 31 additions and 31 deletions
SPIRV/GlslangToSpv.cpp
......@@ -134,7 +134,7 @@ protected:
bool inMain;
bool mainTerminated;
bool linkageOnly; // true when visiting the set of objects in the AST present only for establishing interface, whether or not they were statically used
std::unordered_set<spv::Id> iOSet; // all input/output variables from either static use or declaration of interface
std::set<spv::Id> iOSet; // all input/output variables from either static use or declaration of interface
const glslang::TIntermediate* glslangIntermediate;
spv::Id stdBuiltins;
......
Test/baseResults/spv.130.frag.out
......@@ -12,7 +12,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 185 17 68 79 187 99 173 184 186
EntryPoint Fragment 4 "main" 17 68 79 99 173 184 185 186 187
ExecutionMode 4 OriginLowerLeft
Source GLSL 130
SourceExtension "GL_ARB_gpu_shader5"
......
Test/baseResults/spv.150.geom.out
......@@ -10,7 +10,7 @@ Linked geometry stage:
Capability Geometry
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Geometry 4 "main" 18 10 29 49 33 47 51 70
EntryPoint Geometry 4 "main" 10 18 29 33 47 49 51 70
ExecutionMode 4 InputTrianglesAdjacency
ExecutionMode 4 Invocations 1
ExecutionMode 4 OutputTriangleStrip
......
Test/baseResults/spv.150.vert.out
......@@ -10,7 +10,7 @@ Linked vertex stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 13 49 17 39 48
EntryPoint Vertex 4 "main" 13 17 39 48 49
Source GLSL 150
Name 4 "main"
Name 11 "gl_PerVertex"
......
Test/baseResults/spv.300BuiltIns.vert.out
......@@ -10,7 +10,7 @@ Linked vertex stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 11 39 23 33 25
EntryPoint Vertex 4 "main" 11 23 25 33 39
Source ESSL 300
Name 4 "main"
Name 8 "i"
......
Test/baseResults/spv.300layout.vert.out
......@@ -10,7 +10,7 @@ Linked vertex stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 129 121 9 99 163 11 109 101 164
EntryPoint Vertex 4 "main" 9 11 99 101 109 121 129 163 164
Source ESSL 300
Name 4 "main"
Name 9 "pos"
......
Test/baseResults/spv.300layoutp.vert.out
......@@ -10,7 +10,7 @@ Linked vertex stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 81 9 73 51 115 11 61 53 116
EntryPoint Vertex 4 "main" 9 11 51 53 61 73 81 115 116
Source ESSL 300
Name 4 "main"
Name 9 "pos"
......
Test/baseResults/spv.400.frag.out
......@@ -12,7 +12,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 11 44 50 96 56 117 69 119
EntryPoint Fragment 4 "main" 11 44 50 56 69 96 117 119
ExecutionMode 4 OriginLowerLeft
Source GLSL 400
SourceExtension "GL_ARB_separate_shader_objects"
......
Test/baseResults/spv.400.tesc.out
......@@ -12,7 +12,7 @@ Linked tessellation control stage:
Capability Tessellation
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint TessellationControl 4 "main" 79 87 23 40 83 43 46 52 66 73 84 88 91 92
EntryPoint TessellationControl 4 "main" 23 40 43 46 52 66 73 79 83 84 87 88 91 92
ExecutionMode 4 OutputVertices 4
Source GLSL 400
SourceExtension "GL_ARB_separate_shader_objects"
......
Test/baseResults/spv.400.tese.out
......@@ -12,7 +12,7 @@ Linked tessellation evaluation stage:
Capability Tessellation
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint TessellationEvaluation 4 "main" 77 61 53 21 38 81 41 47 68 82 86 90 93 94 97
EntryPoint TessellationEvaluation 4 "main" 21 38 41 47 53 61 68 77 81 82 86 90 93 94 97
ExecutionMode 4 Triangles
ExecutionMode 4 SpacingFractionalOdd
ExecutionMode 4 VertexOrderCcw
......
Test/baseResults/spv.420.geom.out
......@@ -12,7 +12,7 @@ Linked geometry stage:
Capability Geometry
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Geometry 4 "main" 46 14 23 28 33
EntryPoint Geometry 4 "main" 14 23 28 33 46
ExecutionMode 4 Triangles
ExecutionMode 4 Invocations 4
ExecutionMode 4 OutputLineStrip
......
Test/baseResults/spv.430.vert.out
......@@ -12,7 +12,7 @@ Linked vertex stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 44 12 23 34 61 45 62
EntryPoint Vertex 4 "main" 12 23 34 44 45 61 62
Source GLSL 430
Name 4 "main"
Name 10 "gl_PerVertex"
......
Test/baseResults/spv.bool.vert.out
......@@ -12,7 +12,7 @@ Linked vertex stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 47 23 48
EntryPoint Vertex 4 "main" 23 47 48
Source GLSL 450
Name 4 "main"
Name 10 "foo(b1;"
......
Test/baseResults/spv.conversion.frag.out
......@@ -10,7 +10,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 448 39 454 446 157 53 322 450 452
EntryPoint Fragment 4 "main" 39 53 157 322 446 448 450 452 454
ExecutionMode 4 OriginLowerLeft
Source GLSL 130
Name 4 "main"
......
Test/baseResults/spv.earlyReturnDiscard.frag.out
......@@ -10,7 +10,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 107 11 18
EntryPoint Fragment 4 "main" 11 18 107
ExecutionMode 4 OriginLowerLeft
Source GLSL 110
Name 4 "main"
......
Test/baseResults/spv.forLoop.frag.out
......@@ -10,7 +10,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 35 11 97
EntryPoint Fragment 4 "main" 11 35 97
ExecutionMode 4 OriginLowerLeft
Source GLSL 130
Name 4 "main"
......
Test/baseResults/spv.intOps.vert.out
......@@ -12,7 +12,7 @@ Linked vertex stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 121 9 47 15 21 26 83 67 100 142 146 156 173 182 247 268 269
EntryPoint Vertex 4 "main" 9 15 21 26 47 67 83 100 121 142 146 156 173 182 247 268 269
Source ESSL 310
Name 4 "main"
Name 9 "iout"
......
Test/baseResults/spv.interpOps.frag.out
......@@ -12,7 +12,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 13 24 41 33 99
EntryPoint Fragment 4 "main" 13 24 33 41 99
ExecutionMode 4 OriginLowerLeft
Source GLSL 450
Name 4 "main"
......
Test/baseResults/spv.localAggregates.frag.out
......@@ -13,7 +13,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 96 40 106
EntryPoint Fragment 4 "main" 40 96 106
ExecutionMode 4 OriginLowerLeft
Source GLSL 130
Name 4 "main"
......
Test/baseResults/spv.matrix.frag.out
......@@ -10,7 +10,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 148 140 28 12 166 14
EntryPoint Fragment 4 "main" 12 14 28 140 148 166
ExecutionMode 4 OriginLowerLeft
Source GLSL 130
Name 4 "main"
......
Test/baseResults/spv.matrix2.frag.out
......@@ -10,7 +10,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 12 16 173 37 150 38 65 87 139 210 211 212
EntryPoint Fragment 4 "main" 12 16 37 38 65 87 139 150 173 210 211 212
ExecutionMode 4 OriginLowerLeft
Source GLSL 150
Name 4 "main"
......
Test/baseResults/spv.newTexture.frag.out
......@@ -12,7 +12,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 17 81 26 29 55 247 84 91 277
EntryPoint Fragment 4 "main" 17 26 29 55 81 84 91 247 277
ExecutionMode 4 OriginLowerLeft
Source GLSL 430
Name 4 "main"
......
Test/baseResults/spv.nonSquare.vert.out
......@@ -10,7 +10,7 @@ Linked vertex stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 28 12 55
EntryPoint Vertex 4 "main" 12 28 55
Source GLSL 120
Name 4 "main"
Name 9 "a"
......
Test/baseResults/spv.precision.frag.out
......@@ -10,7 +10,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 71 23 57 59
EntryPoint Fragment 4 "main" 23 57 59 71
ExecutionMode 4 OriginLowerLeft
Source ESSL 300
Name 4 "main"
......
Test/baseResults/spv.qualifiers.vert.out
......@@ -12,7 +12,7 @@ Linked vertex stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 17 9 19 11 13 23 15 24
EntryPoint Vertex 4 "main" 9 11 13 15 17 19 23 24
Source GLSL 430
Name 4 "main"
Name 9 "outVc"
......
Test/baseResults/spv.shiftOps.frag.out
......@@ -12,7 +12,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 25 9
EntryPoint Fragment 4 "main" 9 25
ExecutionMode 4 OriginLowerLeft
Source GLSL 450
Name 4 "main"
......
Test/baseResults/spv.simpleMat.vert.out
......@@ -10,7 +10,7 @@ Linked vertex stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 41 9 23 15 19 34 40
EntryPoint Vertex 4 "main" 9 15 19 23 34 40 41
Source GLSL 330
Name 4 "main"
Name 9 "glPos"
......
Test/baseResults/spv.test.frag.out
......@@ -12,7 +12,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 44 20 38
EntryPoint Fragment 4 "main" 20 38 44
ExecutionMode 4 OriginLowerLeft
Source GLSL 400
Name 4 "main"
......
Test/baseResults/spv.types.frag.out
......@@ -10,7 +10,7 @@ Linked fragment stage:
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 134 94 104 168 144 154 114 164 124
EntryPoint Fragment 4 "main" 94 104 114 124 134 144 154 164 168
ExecutionMode 4 OriginLowerLeft
Source GLSL 130
Name 4 "main"
......
glslang/Include/revision.h
......@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "SPIRV99.861"
#define GLSLANG_DATE "20-Dec-2015"
#define GLSLANG_REVISION "SPIRV99.862"
#define GLSLANG_DATE "21-Dec-2015"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment