From 146c343f967fdc23f9627a0b9afa58ba2e80449d Mon Sep 17 00:00:00 2001 From: jsmall-nvidia 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 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tools/render-test/cpu-memory-binding.cpp') 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; } -- cgit v1.2.3