diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-10-08 14:29:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-08 14:29:15 -0400 |
| commit | 0b61643bf82e2dd44317f6ff83b1a088e337610f (patch) | |
| tree | 17ba46b9c42fdea9f9ac380215c51cc40740b0b5 /source/slang/slang-emit-glsl.cpp | |
| parent | c61d529d9aec30dd80e0e915cfad01d42be7e153 (diff) | |
Fixed from Review of Entry Point decoration #1068 (#1072)
* Remove typo around GeometryPrimitiveTypeDecoration
* * GeometryPrimitiveTypeDecoration -> GeometryInputPrimitiveTypeDecoration (to try and closer match meaning and the Modifier name)
* Remove a small problem around definition of IRGeometryPrimitiveTypeDecoration
* Fix comment around IRStreamOutputTypeDecoration
Diffstat (limited to 'source/slang/slang-emit-glsl.cpp')
| -rw-r--r-- | source/slang/slang-emit-glsl.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/slang/slang-emit-glsl.cpp b/source/slang/slang-emit-glsl.cpp index 280eafd70..abaa89e08 100644 --- a/source/slang/slang-emit-glsl.cpp +++ b/source/slang/slang-emit-glsl.cpp @@ -699,15 +699,15 @@ void GLSLSourceEmitter::emitEntryPointAttributesImpl(IRFunc* irFunc, IREntryPoin // These decorations were moved from the parameters to the entry point by ir-glsl-legalize. // The actual parameters have become potentially multiple global parameters. - if (auto decor = irFunc->findDecoration<IRGeometryPrimitiveTypeDecoration>()) + if (auto decor = irFunc->findDecoration<IRGeometryInputPrimitiveTypeDecoration>()) { switch (decor->op) { - case kIROp_TrianglePrimitiveTypeDecoration: m_writer->emit("layout(triangles) in;\n"); break; - case kIROp_LinePrimitiveTypeDecoration: m_writer->emit("layout(lines) in;\n"); break; - case kIROp_LineAdjPrimitiveTypeDecoration: m_writer->emit("layout(lines_adjacency) in;\n"); break; - case kIROp_PointPrimitiveTypeDecoration: m_writer->emit("layout(points) in;\n"); break; - case kIROp_TriangleAdjPrimitiveTypeDecoration: m_writer->emit("layout(triangles_adjacency) in;\n"); break; + case kIROp_TriangleInputPrimitiveTypeDecoration: m_writer->emit("layout(triangles) in;\n"); break; + case kIROp_LineInputPrimitiveTypeDecoration: m_writer->emit("layout(lines) in;\n"); break; + case kIROp_LineAdjInputPrimitiveTypeDecoration: m_writer->emit("layout(lines_adjacency) in;\n"); break; + case kIROp_PointInputPrimitiveTypeDecoration: m_writer->emit("layout(points) in;\n"); break; + case kIROp_TriangleAdjInputPrimitiveTypeDecoration: m_writer->emit("layout(triangles_adjacency) in;\n"); break; default: { SLANG_ASSERT(!"Unknown primitive type"); |
