Skip to content

G
glslang
Commit 7f689beb by Neslisah Torosdagli
Options

const rayFlag defs used in the test cases in stead of numerical values

parent 65c81bf2
Showing with 141 additions and 146 deletions
Test/baseResults/rayQuery-decls.rgen.out
rayQuery-decls.rgen
// Module Version 10000
// Generated by (magic number): 80008
// Id's are bound by 127
// Id's are bound by 130
Capability RayQueryProvisionalKHR
Capability RayTracingNV
......@@ -40,8 +40,8 @@ rayQuery-decls.rgen
Name 86 "rayQuery0a"
Name 89 "rayQuery0c"
Name 96 "rtas"
Name 106 "rayQuery1c"
Name 126 "g_rayQueryUnused"
Name 107 "rayQuery1c"
Name 129 "g_rayQueryUnused"
Decorate 12(gl_LaunchIDNV) BuiltIn LaunchIdKHR
Decorate 17(gl_LaunchSizeNV) BuiltIn LaunchSizeKHR
MemberDecorate 45(Ray) 0 Offset 0
......@@ -99,7 +99,10 @@ rayQuery-decls.rgen
94: TypeAccelerationStructureKHR
95: TypePointer UniformConstant 94
96(rtas): 95(ptr) Variable UniformConstant
117: 6(int) Constant 3
98: 6(int) Constant 16
109: 6(int) Constant 32
119: 6(int) Constant 3
120: 6(int) Constant 64
4(main): 2 Function None 3
5: Label
38(index): 37(ptr) Variable Function
......@@ -108,8 +111,8 @@ rayQuery-decls.rgen
81(rayQuery0b): 80(ptr) Variable Function
86(rayQuery0a): 80(ptr) Variable Function
89(rayQuery0c): 80(ptr) Variable Function
106(rayQuery1c): 80(ptr) Variable Function
126(g_rayQueryUnused): 80(ptr) Variable Function
107(rayQuery1c): 80(ptr) Variable Function
129(g_rayQueryUnused): 80(ptr) Variable Function
39: 6(int) FunctionCall 8(launchIndex()
Store 38(index) 39
52: 6(int) Load 38(index)
......@@ -143,35 +146,35 @@ rayQuery-decls.rgen
93: 69 Load 92
Store 89(rayQuery0c) 93
97: 94 Load 96(rtas)
98: 57(ptr) AccessChain 44(ray) 51
99: 41(fvec3) Load 98
100: 61(ptr) AccessChain 44(ray) 60
101: 40(float) Load 100
102: 57(ptr) AccessChain 44(ray) 64
103: 41(fvec3) Load 102
104: 61(ptr) AccessChain 44(ray) 67
105: 40(float) Load 104
RayQueryInitializeKHR 89(rayQuery0c) 97 22 13 99 101 103 105
107: 94 Load 96(rtas)
108: 57(ptr) AccessChain 44(ray) 51
109: 41(fvec3) Load 108
110: 61(ptr) AccessChain 44(ray) 60
111: 40(float) Load 110
112: 57(ptr) AccessChain 44(ray) 64
113: 41(fvec3) Load 112
114: 61(ptr) AccessChain 44(ray) 67
115: 40(float) Load 114
RayQueryInitializeKHR 106(rayQuery1c) 107 22 22 109 111 113 115
116: 94 Load 96(rtas)
118: 57(ptr) AccessChain 44(ray) 51
119: 41(fvec3) Load 118
120: 61(ptr) AccessChain 44(ray) 60
121: 40(float) Load 120
122: 57(ptr) AccessChain 44(ray) 64
123: 41(fvec3) Load 122
124: 61(ptr) AccessChain 44(ray) 67
125: 40(float) Load 124
RayQueryInitializeKHR 106(rayQuery1c) 116 117 70 119 121 123 125
99: 57(ptr) AccessChain 44(ray) 51
100: 41(fvec3) Load 99
101: 61(ptr) AccessChain 44(ray) 60
102: 40(float) Load 101
103: 57(ptr) AccessChain 44(ray) 64
104: 41(fvec3) Load 103
105: 61(ptr) AccessChain 44(ray) 67
106: 40(float) Load 105
RayQueryInitializeKHR 89(rayQuery0c) 97 22 98 100 102 104 106
108: 94 Load 96(rtas)
110: 57(ptr) AccessChain 44(ray) 51
111: 41(fvec3) Load 110
112: 61(ptr) AccessChain 44(ray) 60
113: 40(float) Load 112
114: 57(ptr) AccessChain 44(ray) 64
115: 41(fvec3) Load 114
116: 61(ptr) AccessChain 44(ray) 67
117: 40(float) Load 116
RayQueryInitializeKHR 107(rayQuery1c) 108 22 109 111 113 115 117
118: 94 Load 96(rtas)
121: 57(ptr) AccessChain 44(ray) 51
122: 41(fvec3) Load 121
123: 61(ptr) AccessChain 44(ray) 60
124: 40(float) Load 123
125: 57(ptr) AccessChain 44(ray) 64
126: 41(fvec3) Load 125
127: 61(ptr) AccessChain 44(ray) 67
128: 40(float) Load 127
RayQueryInitializeKHR 107(rayQuery1c) 118 119 120 122 124 126 128
Return
FunctionEnd
8(launchIndex(): 6(int) Function None 7
......
Test/rayQuery-allOps.Error.rgen
......@@ -39,7 +39,7 @@ void main()
{
Ray ray = makeRayDesc();
rayQueryEXT rayQuery;
rayQueryInitializeEXT(rayQuery, rtas, 0, 0xFF, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery, rtas, gl_RayFlagsNoneEXT, 0xFF, ray.pos, ray.tmin, ray.dir, ray.tmax);
mat4x3 _mat4x3;
mat3x4 _mat3x4;
......
Test/rayQuery-allOps.comp
......@@ -37,9 +37,9 @@ Ray makeRayDesc()
void main()
{
Ray ray;// = makeRayDesc();
Ray ray = makeRayDesc();
rayQueryEXT rayQuery;
rayQueryInitializeEXT(rayQuery, rtas, 0, 0xFF, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery, rtas, gl_RayFlagsNoneEXT, 0xFF, ray.pos, ray.tmin, ray.dir, ray.tmax);
mat4x3 _mat4x3;
mat3x4 _mat3x4;
......
Test/rayQuery-allOps.frag
......@@ -37,9 +37,9 @@ Ray makeRayDesc()
void main()
{
Ray ray;// = makeRayDesc();
Ray ray = makeRayDesc();
rayQueryEXT rayQuery;
rayQueryInitializeEXT(rayQuery, rtas, 0, 0xFF, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery, rtas, gl_RayFlagsNoneEXT, 0xFF, ray.pos, ray.tmin, ray.dir, ray.tmax);
mat4x3 _mat4x3;
mat3x4 _mat3x4;
......
Test/rayQuery-allOps.rgen
......@@ -37,9 +37,9 @@ Ray makeRayDesc()
void main()
{
Ray ray;// = makeRayDesc();
Ray ray = makeRayDesc();
rayQueryEXT rayQuery;
rayQueryInitializeEXT(rayQuery, rtas, 0, 0xFF, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery, rtas, gl_RayFlagsNoneEXT, 0xFF, ray.pos, ray.tmin, ray.dir, ray.tmax);
mat4x3 _mat4x3;
mat3x4 _mat3x4;
......
Test/rayQuery-array-2d-dynamic.rgen
......@@ -20,7 +20,7 @@ uint launchIndex()
void doInitialize(rayQueryEXT rayQuery, Ray ray)
{
rayQueryInitializeEXT(rayQuery, rtas, 0, 1, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery, rtas, gl_RayFlagsNoneEXT, gl_RayFlagsCullBackFacingTrianglesEXT, ray.pos, ray.tmin, ray.dir, ray.tmax);
}
int C;
......@@ -31,6 +31,6 @@ void main()
Ray ray = rays[index];
rayQueryEXT rayQuery[2];
doInitialize(rayQuery[0], rays[index]);
rayQueryInitializeEXT(rayQuery[1], rtas, 1, 2, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery[1], rtas, gl_RayFlagsOpaqueEXT, gl_RayFlagsCullFrontFacingTrianglesEXT, ray.pos, ray.tmin, ray.dir, ray.tmax);
doInitialize(rayQuery[C], ray);
}
Test/rayQuery-committed.Error.rgen
......@@ -39,7 +39,7 @@ void main()
bool committed_true = true;
bool committed_false = false;
rayQueryInitializeEXT(rayQuery, rtas, 1, 2, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery, rtas, gl_RayFlagsOpaqueEXT, gl_RayFlagsCullBackFacingTrianglesEXT, ray.pos, ray.tmin, ray.dir, ray.tmax);
while (rayQueryProceedEXT(rayQuery))
{
mat4x3 mat_o2w;
......
Test/rayQuery-decls.rgen
......@@ -41,13 +41,13 @@ void main()
rayQueryEXT rayQuery0c = g_rayQueryArray[idx];
// rayQuery0a is the one actually used here
rayQueryInitializeEXT(rayQuery0c, rtas, gl_RayFlagsOpaqueEXT, 2, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery0c, rtas, gl_RayFlagsOpaqueEXT, gl_RayFlagsCullBackFacingTrianglesEXT, ray.pos, ray.tmin, ray.dir, ray.tmax);
// AllocateRayQuery occurs here, rather than next to allocas
// Should not be extray allocate, since above should allocate and copy
rayQueryEXT rayQuery1c;
// update the rayFlags as RAY_FLAG_FORCE_OPAQUE
rayQueryInitializeEXT(rayQuery1c, rtas, gl_RayFlagsOpaqueEXT, 1, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery1c, rtas, gl_RayFlagsOpaqueEXT, gl_RayFlagsCullFrontFacingTrianglesEXT, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery1c, rtas, 3, 4, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery1c, rtas, gl_RayFlagsOpaqueEXT|gl_RayFlagsNoOpaqueEXT, gl_RayFlagsCullOpaqueEXT, ray.pos, ray.tmin, ray.dir, ray.tmax);
}
Test/rayQuery-initialize.rgen
......@@ -20,7 +20,7 @@ uint launchIndex()
void doInitialize(rayQueryEXT rayQuery, Ray ray)
{
rayQueryInitializeEXT(rayQuery, rtas, 0, 1, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery, rtas, gl_RayFlagsNoneEXT, gl_RayFlagsCullBackFacingTrianglesEXT, ray.pos, ray.tmin, ray.dir, ray.tmax);
}
void main()
......@@ -29,5 +29,5 @@ void main()
Ray ray = rays[index];
rayQueryEXT rayQuery;
doInitialize(rayQuery, ray);
rayQueryInitializeEXT(rayQuery, rtas, 1, 2, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery, rtas, gl_RayFlagsOpaqueEXT, gl_RayFlagsCullFrontFacingTrianglesEXT, ray.pos, ray.tmin, ray.dir, ray.tmax);
}
Test/rayQuery-no-cse.rgen
......@@ -20,7 +20,7 @@ uint launchIndex()
void doInitialize(rayQueryEXT rayQuery, Ray ray)
{
rayQueryInitializeEXT(rayQuery, rtas, 0, 1, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery, rtas, gl_RayFlagsNoneEXT, gl_RayFlagsCullBackFacingTrianglesEXT, ray.pos, ray.tmin, ray.dir, ray.tmax);
}
void main()
......@@ -30,6 +30,6 @@ void main()
rayQueryEXT rayQuery1;
rayQueryEXT rayQuery2;
doInitialize(rayQuery1, ray);
rayQueryInitializeEXT(rayQuery1, rtas, 1, 2, ray.pos, ray.tmin, ray.dir, ray.tmax);
rayQueryInitializeEXT(rayQuery1, rtas, gl_RayFlagsOpaqueEXT, gl_RayFlagsCullFrontFacingTrianglesEXT, ray.pos, ray.tmin, ray.dir, ray.tmax);
doInitialize(rayQuery2, ray);
}
glslang/MachineIndependent/Initialize.cpp
......@@ -5573,24 +5573,14 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
commonBuiltins.append(constRayQueryIntersection);
commonBuiltins.append(constRayFlags);
stageBuiltins[EShLangRayGen].append(rayGenDecls);
stageBuiltins[EShLangRayGen].append(constRayFlags);
stageBuiltins[EShLangIntersect].append(intersectDecls);
stageBuiltins[EShLangIntersect].append(constRayFlags);
stageBuiltins[EShLangAnyHit].append(hitDecls);
stageBuiltins[EShLangAnyHit].append(constRayFlags);
stageBuiltins[EShLangClosestHit].append(hitDecls);
stageBuiltins[EShLangClosestHit].append(constRayFlags);
stageBuiltins[EShLangMiss].append(missDecls);
stageBuiltins[EShLangMiss].append(constRayFlags);
stageBuiltins[EShLangCallable].append(callableDecls);
stageBuiltins[EShLangCallable].append(constRayFlags);
}
if ((profile != EEsProfile && version >= 140)) {
......
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