From 146c343f967fdc23f9627a0b9afa58ba2e80449d Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Tue, 3 Sep 2019 17:41:23 -0400
Subject: Make CPUMemoryBinding::Location use a ctor. (#1042)

---
 tools/render-test/cpu-memory-binding.cpp |  9 +++++----
 tools/render-test/cpu-memory-binding.h   | 14 ++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'tools')

diff --git a/tools/render-test/cpu-memory-binding.cpp b/tools/render-test/cpu-memory-binding.cpp
index 2b2fed167..7760c5919 100644
--- a/tools/render-test/cpu-memory-binding.cpp
+++ b/tools/render-test/cpu-memory-binding.cpp
@@ -244,12 +244,13 @@ CPUMemoryBinding::Location CPUMemoryBinding::find(const char* name)
     auto varLayout = getParameterByName(name);
     if (varLayout)
     {
-        return Location::make(varLayout->getTypeLayout(), m_rootBuffer.m_data + varLayout->getOffset());
+        return Location(varLayout->getTypeLayout(), m_rootBuffer.m_data + varLayout->getOffset());
     }
+
     varLayout = getEntryPointParameterByName(name);
     if (varLayout)
     {
-        return Location::make(varLayout->getTypeLayout(), m_entryPointBuffer.m_data + varLayout->getOffset());
+        return Location(varLayout->getTypeLayout(), m_entryPointBuffer.m_data + varLayout->getOffset());
     }
     return Location();
 }
@@ -286,7 +287,7 @@ CPUMemoryBinding::Location CPUMemoryBinding::Location::toField(const char* name)
                 auto field = typeLayout->getFieldByIndex(ff);
                 if (strcmp(field->getName(), name) == 0)
                 {
-                    return make(field->getTypeLayout(), cur + field->getOffset());
+                    return Location(field->getTypeLayout(), cur + field->getOffset());
                 }
             }
         }
@@ -320,7 +321,7 @@ CPUMemoryBinding::Location CPUMemoryBinding::Location::toIndex(int index) const
                 return Location();
             }
 
-            return Location::make(elementTypeLayout, cur + elementStride * index);
+            return Location(elementTypeLayout, cur + elementStride * index);
         }
         default: break;
     }
diff --git a/tools/render-test/cpu-memory-binding.h b/tools/render-test/cpu-memory-binding.h
index 994dacacd..36bc15c6b 100644
--- a/tools/render-test/cpu-memory-binding.h
+++ b/tools/render-test/cpu-memory-binding.h
@@ -27,16 +27,14 @@ struct CPUMemoryBinding
         slang::TypeLayoutReflection* getTypeLayout() const { return m_typeLayout; }
         uint8_t* getPtr() const { return m_cur; }
 
-        Location():m_cur(nullptr) {}
-
-        static Location make(slang::TypeLayoutReflection* typeLayout, uint8_t* ptr)
+        SLANG_FORCE_INLINE Location():m_typeLayout(nullptr), m_cur(nullptr) {}
+      
+        SLANG_FORCE_INLINE Location(slang::TypeLayoutReflection* typeLayout, uint8_t* ptr):
+            m_typeLayout(typeLayout),
+            m_cur(ptr)
         {
-            Location loc;
-            loc.m_typeLayout = typeLayout;
-            loc.m_cur = ptr;
-            return loc;
         }
-
+        
     protected:
         slang::TypeLayoutReflection* m_typeLayout;
         uint8_t* m_cur;
-- 
cgit v1.2.3