diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-04-29 17:03:46 -0400 |
|---|---|---|
| committer | Tim Foley <tfoleyNV@users.noreply.github.com> | 2019-04-29 14:03:46 -0700 |
| commit | 4880789e3003441732cca4471091563f36531635 (patch) | |
| tree | 8e0d3ed58a561373b35729d24787afe6b39732e3 /tools/render-test/render-test-main.cpp | |
| parent | ded340beb4b5197b559626acc39920abb2d39e77 (diff) | |
String/List closer to conventions, and use Index type (#959)
* List made members m_
Tweaked types to closer match conventions.
* Use asserts for checking conditions on List.
Other small improvements.
* List<T>.Count() -> getSize()
* List<T>
Add -> add
First -> getFirst
Last -> getLast
RemoveLast -> removeLast
ReleaseBuffer -> detachBuffer
GetArrayView -> getArrayView
* List<T>::
AddRange -> addRange
Capacity -> getCapacity
Insert -> insert
InsertRange -> insertRange
AddRange -> addRange
RemoveRange -> removeRange
RemoveAt -> removeAt
Remove -> remove
Reverse -> reverse
FastRemove -> fastRemove
FastRemoveAt -> fastRemoveAt
Clear -> clear
* List<T>
FreeBuffer -> _deallocateBuffer
Free -> clearAndDeallocate
SwapWith -> swapWith
* List<T>
SetSize -> setSize
Reserve -> reserve
GrowToSize growToSize
* UnsafeShrinkToSize -> unsafeShrinkToSize
Compress -> compress
FindLast -> findLastIndex
FindLast -> findLastIndex
Simplify Contains
* List<T>
Removed m_allocator (wasn't used)
Swap -> swapElements
Sort -> sort
Contains -> contains
ForEach -> forEach
QuickSort -> quickSort
InsertionSort -> insertionSort
BinarySearch -> binarySearch
Max -> calcMax
Min -> calcMin
* Initializer::Initialize -> initialize
List<T>::
Allocate -> _allocate
Init -> _init
IndexOf -> indexOf
* * Put #include <assert.h> in common.h, and remove unneeded inclusions
* Small refactor of ArrayView - remove stride as not used
* getSize -> getCount
setSize -> setCount
unsafeShrinkToSize->unsafeShrinkToCount
growToSize -> growToCount
m_size -> m_count
* Some tidy up around Allocator.
* Use Index type on List.
* Refactor of IntSet.
First tentative look at using Index.
* Made Index an Int
Did preliminary fixes.
Made String use Index.
* Partial refactor of String.
* String::Buffer -> getBuffer
ToWString -> toWString
* Small improvements to String.
String::
Buffer() -> getBuffer()
Equals() -> equals
* Try to use Index where appropriate.
* Fix warnings on windows x86 builds.
Diffstat (limited to 'tools/render-test/render-test-main.cpp')
| -rw-r--r-- | tools/render-test/render-test-main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp index 34e041473..f82e03ad5 100644 --- a/tools/render-test/render-test-main.cpp +++ b/tools/render-test/render-test-main.cpp @@ -351,8 +351,8 @@ Result RenderTestApp::initializeShaders(ShaderCompiler* shaderCompiler) fseek(sourceFile, 0, SEEK_SET); List<char> sourceText; - sourceText.SetSize(sourceSize + 1); - fread(sourceText.Buffer(), sourceSize, 1, sourceFile); + sourceText.setCount(sourceSize + 1); + fread(sourceText.getBuffer(), sourceSize, 1, sourceFile); fclose(sourceFile); sourceText[sourceSize] = 0; @@ -366,12 +366,12 @@ Result RenderTestApp::initializeShaders(ShaderCompiler* shaderCompiler) m_shaderInputLayout.numRenderTargets = 0; break; } - m_shaderInputLayout.Parse(sourceText.Buffer()); + m_shaderInputLayout.Parse(sourceText.getBuffer()); ShaderCompileRequest::SourceInfo sourceInfo; sourceInfo.path = sourcePath; - sourceInfo.dataBegin = sourceText.Buffer(); - sourceInfo.dataEnd = sourceText.Buffer() + sourceSize; + sourceInfo.dataBegin = sourceText.getBuffer(); + sourceInfo.dataEnd = sourceText.getBuffer() + sourceSize; ShaderCompileRequest compileRequest; compileRequest.source = sourceInfo; @@ -558,7 +558,7 @@ SLANG_TEST_TOOL_API SlangResult innerMain(Slang::StdWriters* stdWriters, SlangSe StringBuilder rendererName; rendererName << "[" << RendererUtil::toText(gOptions.rendererType) << "] "; - if (gOptions.adapter.Length()) + if (gOptions.adapter.getLength()) { rendererName << "'" << gOptions.adapter << "'"; } @@ -568,7 +568,7 @@ SLANG_TEST_TOOL_API SlangResult innerMain(Slang::StdWriters* stdWriters, SlangSe { if (!gOptions.onlyStartup) { - fprintf(stderr, "Unable to create renderer %s\n", rendererName.Buffer()); + fprintf(stderr, "Unable to create renderer %s\n", rendererName.getBuffer()); } return SLANG_FAIL; } @@ -584,7 +584,7 @@ SLANG_TEST_TOOL_API SlangResult innerMain(Slang::StdWriters* stdWriters, SlangSe { if (!gOptions.onlyStartup) { - fprintf(stderr, "Unable to initialize renderer %s\n", rendererName.Buffer()); + fprintf(stderr, "Unable to initialize renderer %s\n", rendererName.getBuffer()); } return res; } |
