From 4fd0448d7341e57e355d4414ca60e786001d40a9 Mon Sep 17 00:00:00 2001
From: Tim Foley <tfoleyNV@users.noreply.github.com>
Date: Thu, 24 Oct 2019 08:32:01 -0700
Subject: Address review comments on IR layout PR (#1091)

These were meant to be merged into #1084, but I failed to push the changes to the server.
---
 source/slang/slang-emit-c-like.cpp | 4 ++--
 source/slang/slang-emit-c-like.h   | 9 +--------
 source/slang/slang-emit-hlsl.cpp   | 4 ++--
 3 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'source')

diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index a983a7a73..a84e398ac 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -2182,7 +2182,7 @@ void CLikeSourceEmitter::_emitInst(IRInst* inst)
     }
 }
 
-void CLikeSourceEmitter::emitSemantics(IRVarLayout* varLayout)
+void CLikeSourceEmitter::emitSemanticsUsingVarLayout(IRVarLayout* varLayout)
 {
     if(auto semanticAttr = varLayout->findAttr<IRSemanticAttr>())
     {
@@ -2192,7 +2192,7 @@ void CLikeSourceEmitter::emitSemantics(IRVarLayout* varLayout)
         //
         // The original rationale for switching to uppercase was
         // canonicalization for reflection (users can't accidentally
-        // write code that works for `COLOR` but not for `COLOR`),
+        // write code that works for `COLOR` but not for `Color`),
         // but it would probably be more ideal for our output code
         // to give the semantic name as close to how it was originally spelled
         // spelled as possible.
diff --git a/source/slang/slang-emit-c-like.h b/source/slang/slang-emit-c-like.h
index 7b7ab5da6..2b2e0d199 100644
--- a/source/slang/slang-emit-c-like.h
+++ b/source/slang/slang-emit-c-like.h
@@ -206,15 +206,8 @@ public:
 
     void emitInst(IRInst* inst);
 
-    // TODO: When this signature switched from `VarLayout` to `IRVarLayout`
-    // it became possible to get confused beetween this overload and the
-    // one that takes a base `IRInst`. We should probably be careful and
-    // rename one of the other of the `emitSemantics()` functions to avoid
-    // confusion.
-    //
-    void emitSemantics(IRVarLayout* varLayout);
-
     void emitSemantics(IRInst* inst);
+    void emitSemanticsUsingVarLayout(IRVarLayout* varLayout);
 
     static IRVarLayout* getVarLayout(IRInst* var);
 
diff --git a/source/slang/slang-emit-hlsl.cpp b/source/slang/slang-emit-hlsl.cpp
index 9d2334dc3..240ef6ad0 100644
--- a/source/slang/slang-emit-hlsl.cpp
+++ b/source/slang/slang-emit-hlsl.cpp
@@ -648,13 +648,13 @@ void HLSLSourceEmitter::emitSemanticsImpl(IRInst* inst)
         auto layout = layoutDecoration->getLayout();
         if (auto varLayout = as<IRVarLayout>(layout))
         {
-            emitSemantics(varLayout);
+            emitSemanticsUsingVarLayout(varLayout);
         }
         else if (auto entryPointLayout = as<IREntryPointLayout>(layout))
         {
             if (auto resultLayout = entryPointLayout->getResultLayout())
             {
-                emitSemantics(resultLayout);
+                emitSemanticsUsingVarLayout(resultLayout);
             }
         }
     }
-- 
cgit v1.2.3