From 7b7c095b37e85ca3a8f55eff1c3d9643d467b8e0 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 25 Apr 2023 10:43:29 -0400 Subject: Dictionary using lowerCamel (#2835) * #include an absolute path didn't work - because paths were taken to always be relative. * WIP lowerCamel Dictionary. * WIP more lowerCamel fixes for Dictionary. * Add/Remove/Clear * GetValue/Contains * Fix tabs in dictionary. Count -> getCount * Fix fields with caps. * Key -> key Value -> value Use m_ for members where appropriate. Use lowerCamel in linked list. * Some small fixes/improvements to Dictionary. * Kick CI. --- source/slang/slang-type-layout.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source/slang/slang-type-layout.cpp') diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp index 3da0cc95a..90ab89ab1 100644 --- a/source/slang/slang-type-layout.cpp +++ b/source/slang/slang-type-layout.cpp @@ -1822,15 +1822,15 @@ RefPtr applyOffsetToTypeLayout( newStructTypeLayout->fields.add(newField); - mapOldFieldToNew.Add(oldField.Ptr(), newField.Ptr()); + mapOldFieldToNew.add(oldField.Ptr(), newField.Ptr()); } for (auto entry : oldStructTypeLayout->mapVarToLayout) { VarLayout* newFieldLayout = nullptr; - if (mapOldFieldToNew.TryGetValue(entry.Value.Ptr(), newFieldLayout)) + if (mapOldFieldToNew.tryGetValue(entry.value.Ptr(), newFieldLayout)) { - newStructTypeLayout->mapVarToLayout.Add(entry.Key, newFieldLayout); + newStructTypeLayout->mapVarToLayout.add(entry.key, newFieldLayout); } } @@ -2734,7 +2734,7 @@ Type* findGlobalGenericSpecializationArg( GlobalGenericParamDecl* decl) { Val* arg = nullptr; - context.programLayout->globalGenericArgs.TryGetValue(decl, arg); + context.programLayout->globalGenericArgs.tryGetValue(decl, arg); return as(arg); } @@ -2984,17 +2984,17 @@ static RefPtr maybeAdjustLayoutForArrayElementType( adjustedStructTypeLayout->fields.add(adjustedField); - mapOriginalFieldToAdjusted.Add(originalField, adjustedField); + mapOriginalFieldToAdjusted.add(originalField, adjustedField); } for( auto p : originalStructTypeLayout->mapVarToLayout ) { - VarDeclBase* key = p.Key; - RefPtr originalVal = p.Value; + VarDeclBase* key = p.key; + RefPtr originalVal = p.value; RefPtr adjustedVal; - if( mapOriginalFieldToAdjusted.TryGetValue(originalVal, adjustedVal) ) + if( mapOriginalFieldToAdjusted.tryGetValue(originalVal, adjustedVal) ) { - adjustedStructTypeLayout->mapVarToLayout.Add(key, adjustedVal); + adjustedStructTypeLayout->mapVarToLayout.add(key, adjustedVal); } } @@ -3123,7 +3123,7 @@ RefPtr StructTypeLayoutBuilder::addField( if( field ) { - m_typeLayout->mapVarToLayout.Add(field.getDecl(), fieldLayout); + m_typeLayout->mapVarToLayout.add(field.getDecl(), fieldLayout); } // Set up uniform offset information, if there is any uniform data in the field -- cgit v1.2.3