From 0b61643bf82e2dd44317f6ff83b1a088e337610f Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 8 Oct 2019 14:29:15 -0400 Subject: 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 --- source/slang/slang-emit-glsl.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/slang/slang-emit-glsl.cpp') 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()) + if (auto decor = irFunc->findDecoration()) { 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"); -- cgit v1.2.3