Merge pull request #1523 from sparmarNV/fix-SPV_NV_mesh_shader

Allow redeclaration of builtin interface blocks in mesh shader
This commit is contained in:
John Kessenich
2018-10-04 23:46:21 -06:00
committed by GitHub
13 changed files with 875 additions and 305 deletions

View File

@@ -1257,6 +1257,8 @@ int C_DECL main(int argc, char* argv[])
// .rchit = ray closest hit
// .rmiss = ray miss
// .rcall = ray callable
// .mesh = mesh
// .task = task
// Additionally, the file names may end in .<stage>.glsl and .<stage>.hlsl
// where <stage> is one of the stages listed above.
//
@@ -1395,7 +1397,7 @@ void usage()
" .rahit for a ray any hit shader\n"
" .rchit for a ray closest hit shader\n"
" .rmiss for a ray miss shader\n"
" .rcall for a ray callable shader"
" .rcall for a ray callable shader\n"
#endif
" .glsl for .vert.glsl, .tesc.glsl, ..., .comp.glsl compound suffixes\n"
" .hlsl for .vert.hlsl, .tesc.hlsl, ..., .comp.hlsl compound suffixes\n"