summaryrefslogtreecommitdiffstats
path: root/source/slang
diff options
context:
space:
mode:
Diffstat (limited to 'source/slang')
-rw-r--r--source/slang/slang-compiler.cpp2
-rw-r--r--source/slang/slang-diagnostics.cpp2
-rw-r--r--source/slang/slang-emit-c-like.cpp2
-rw-r--r--source/slang/slang-emit-cpp.cpp14
-rw-r--r--source/slang/slang-emit-cuda.cpp4
-rw-r--r--source/slang/slang-emit-glsl.cpp2
-rw-r--r--source/slang/slang-emit-hlsl.cpp2
-rw-r--r--source/slang/slang-hlsl-intrinsic-set.cpp4
-rw-r--r--source/slang/slang-ir-legalize-types.cpp4
-rw-r--r--source/slang/slang-ir-serialize-types.cpp4
-rw-r--r--source/slang/slang-ir-serialize.cpp4
-rw-r--r--source/slang/slang-ir.cpp6
-rw-r--r--source/slang/slang-lower-to-ir.cpp2
-rw-r--r--source/slang/slang-mangle.cpp2
-rw-r--r--source/slang/slang-parameter-binding.cpp14
-rw-r--r--source/slang/slang-reflection.cpp4
-rw-r--r--source/slang/slang-source-loc.cpp2
-rw-r--r--source/slang/slang-state-serialize.cpp2
18 files changed, 38 insertions, 38 deletions
diff --git a/source/slang/slang-compiler.cpp b/source/slang/slang-compiler.cpp
index 9797b1f1f..4880cc49d 100644
--- a/source/slang/slang-compiler.cpp
+++ b/source/slang/slang-compiler.cpp
@@ -695,7 +695,7 @@ namespace Slang
PlatformUtil::appendResult(res, builder);
}
- if (diagnostic.size() > 0)
+ if (diagnostic.getLength() > 0)
{
builder.Append(diagnostic);
if (!diagnostic.endsWith("\n"))
diff --git a/source/slang/slang-diagnostics.cpp b/source/slang/slang-diagnostics.cpp
index be799c3bd..99cae490e 100644
--- a/source/slang/slang-diagnostics.cpp
+++ b/source/slang/slang-diagnostics.cpp
@@ -328,7 +328,7 @@ void DiagnosticSink::diagnoseRaw(
if(writer)
{
// If so, pass the error string along to them
- writer->write(message.begin(), message.size());
+ writer->write(message.begin(), message.getLength());
}
else
{
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index 538ef369a..779e7eb25 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -373,7 +373,7 @@ bool CLikeSourceEmitter::isTargetIntrinsicModifierBetter(IRTargetIntrinsicDecora
// good) as `existing`.
//
SLANG_UNUSED(existing);
- return candidate->getTargetName().size() != 0;
+ return candidate->getTargetName().getLength() != 0;
}
void CLikeSourceEmitter::emitStringLiteral(String const& value)
diff --git a/source/slang/slang-emit-cpp.cpp b/source/slang/slang-emit-cpp.cpp
index 945c070d1..4c2e6032d 100644
--- a/source/slang/slang-emit-cpp.cpp
+++ b/source/slang/slang-emit-cpp.cpp
@@ -433,7 +433,7 @@ SlangResult CPPSourceEmitter::calcTypeName(IRType* type, CodeGenTarget target, S
UnownedStringSlice postFix = _getCTypeVecPostFix(elemType->op);
out << postFix;
- if (postFix.size() > 1)
+ if (postFix.getLength() > 1)
{
out << "_";
}
@@ -458,7 +458,7 @@ SlangResult CPPSourceEmitter::calcTypeName(IRType* type, CodeGenTarget target, S
out << "Mat";
const UnownedStringSlice postFix = _getCTypeVecPostFix(_getCType(elementType->op));
out << postFix;
- if (postFix.size() > 1)
+ if (postFix.getLength() > 1)
{
out << "_";
}
@@ -514,7 +514,7 @@ SlangResult CPPSourceEmitter::calcTypeName(IRType* type, CodeGenTarget target, S
// If _getResourceTypePrefix returns something, we assume can output any specialization after it in order.
{
UnownedStringSlice prefix = _getResourceTypePrefix(type->op);
- if (prefix.size() > 0)
+ if (prefix.getLength() > 0)
{
auto oldWriter = m_writer;
SourceManager* sourceManager = oldWriter->getSourceManager();
@@ -653,7 +653,7 @@ static IRBasicType* _getElementType(IRType* type)
static bool _isOperator(const UnownedStringSlice& funcName)
{
- if (funcName.size() > 0)
+ if (funcName.getLength() > 0)
{
const char c = funcName[0];
return !((c >= 'a' && c <='z') || (c >= 'A' && c <= 'Z') || c == '_');
@@ -665,7 +665,7 @@ void CPPSourceEmitter::_emitAryDefinition(const HLSLIntrinsic* specOp)
{
auto info = HLSLIntrinsic::getInfo(specOp->op);
auto funcName = info.funcName;
- SLANG_ASSERT(funcName.size() > 0);
+ SLANG_ASSERT(funcName.getLength() > 0);
const bool isOperator = _isOperator(funcName);
@@ -1700,7 +1700,7 @@ SlangResult CPPSourceEmitter::calcFuncName(const HLSLIntrinsic* specOp, StringBu
}
const auto& info = HLSLIntrinsic::getInfo(specOp->op);
- if (info.funcName.size())
+ if (info.funcName.getLength())
{
if (!_isOperator(info.funcName))
{
@@ -2518,7 +2518,7 @@ void CPPSourceEmitter::_emitInitAxisValues(const Int sizeAlongAxis[kThreadGroupA
builder.Clear();
const char elem[2] = { s_elemNames[i], 0 };
builder << mulName << "." << elem << " * " << sizeAlongAxis[i];
- if (addName.size() > 0)
+ if (addName.getLength() > 0)
{
builder << " + " << addName << "." << elem;
}
diff --git a/source/slang/slang-emit-cuda.cpp b/source/slang/slang-emit-cuda.cpp
index 262a67784..3531d55db 100644
--- a/source/slang/slang-emit-cuda.cpp
+++ b/source/slang/slang-emit-cuda.cpp
@@ -161,7 +161,7 @@ SlangResult CUDASourceEmitter::calcScalarFuncName(HLSLIntrinsic::Op op, IRBasicT
default: break;
}
- if (funcName.size())
+ if (funcName.getLength())
{
outBuilder << funcName;
if (type->op == kIROp_FloatType)
@@ -219,7 +219,7 @@ SlangResult CUDASourceEmitter::calcTypeName(IRType* type, CodeGenTarget target,
const IROp elemType = vecType->getElementType()->op;
UnownedStringSlice prefix = getVectorPrefix(elemType);
- if (prefix.size() <= 0)
+ if (prefix.getLength() <= 0)
{
return SLANG_FAIL;
}
diff --git a/source/slang/slang-emit-glsl.cpp b/source/slang/slang-emit-glsl.cpp
index cd11e2ac4..ae7a4130f 100644
--- a/source/slang/slang-emit-glsl.cpp
+++ b/source/slang/slang-emit-glsl.cpp
@@ -1609,7 +1609,7 @@ void GLSLSourceEmitter::emitInterpolationModifiersImpl(IRInst* varInst, IRType*
auto decoration = (IRInterpolationModeDecoration*)dd;
const UnownedStringSlice slice = _getInterpolationModifierText(decoration->getMode());
- if (slice.size())
+ if (slice.getLength())
{
m_writer->emit(slice);
m_writer->emitChar(' ');
diff --git a/source/slang/slang-emit-hlsl.cpp b/source/slang/slang-emit-hlsl.cpp
index 1d4b6a317..a0e6e872d 100644
--- a/source/slang/slang-emit-hlsl.cpp
+++ b/source/slang/slang-emit-hlsl.cpp
@@ -773,7 +773,7 @@ void HLSLSourceEmitter::emitInterpolationModifiersImpl(IRInst* varInst, IRType*
auto decoration = (IRInterpolationModeDecoration*)dd;
UnownedStringSlice modeText = _getInterpolationModifierText(decoration->getMode());
- if (modeText.size() > 0)
+ if (modeText.getLength() > 0)
{
m_writer->emit(modeText);
m_writer->emitChar(' ');
diff --git a/source/slang/slang-hlsl-intrinsic-set.cpp b/source/slang/slang-hlsl-intrinsic-set.cpp
index 7500e799a..936181d83 100644
--- a/source/slang/slang-hlsl-intrinsic-set.cpp
+++ b/source/slang/slang-hlsl-intrinsic-set.cpp
@@ -401,7 +401,7 @@ HLSLIntrinsicOpLookup::HLSLIntrinsicOpLookup():
const auto& info = HLSLIntrinsic::getInfo(Op(i));
UnownedStringSlice slice = info.funcName;
- if (slice.size() > 0 && slice[0] >= 'a' && slice[0] <= 'z')
+ if (slice.getLength() > 0 && slice[0] >= 'a' && slice[0] <= 'z')
{
auto handle = m_slicePool.add(slice);
Index index = Index(handle);
@@ -478,7 +478,7 @@ HLSLIntrinsic::Op HLSLIntrinsicOpLookup::getOpFromTargetDecoration(IRInst* inIns
// original HLSL name, which has a target of ""
//
// It's not 100% clear this covers all the cases, but for now lets go with that
- if (decor->getTargetName().size() == 0)
+ if (decor->getTargetName().getLength() == 0)
{
Op op = getOpByName(decor->getDefinition());
if (op != Op::Invalid)
diff --git a/source/slang/slang-ir-legalize-types.cpp b/source/slang/slang-ir-legalize-types.cpp
index f9c78a021..3a1471f98 100644
--- a/source/slang/slang-ir-legalize-types.cpp
+++ b/source/slang/slang-ir-legalize-types.cpp
@@ -1652,7 +1652,7 @@ static LegalVal declareSimpleVar(
builder->addLayoutDecoration(irVar, varLayout);
}
- if( nameHint.size() )
+ if( nameHint.getLength() )
{
context->builder->addNameHintDecoration(irVar, nameHint);
}
@@ -2308,7 +2308,7 @@ static LegalVal declareVars(
UnownedStringSlice fieldNameHint;
String joinedNameHintStorage;
- if( nameHint.size() )
+ if( nameHint.getLength() )
{
if( auto fieldNameHintDecoration = ee.key->findDecoration<IRNameHintDecoration>() )
{
diff --git a/source/slang/slang-ir-serialize-types.cpp b/source/slang/slang-ir-serialize-types.cpp
index 10e2776b2..a9d9baae0 100644
--- a/source/slang/slang-ir-serialize-types.cpp
+++ b/source/slang/slang-ir-serialize-types.cpp
@@ -176,7 +176,7 @@ StringRepresentation* StringRepresentationCache::getStringRepresentation(Handle
}
const UnownedStringSlice slice = getStringSlice(handle);
- const UInt size = slice.size();
+ const UInt size = slice.getLength();
StringRepresentation* stringRep = StringRepresentation::createWithCapacityAndLength(size, size);
memcpy(stringRep->getData(), slice.begin(), size);
@@ -208,7 +208,7 @@ char* StringRepresentationCache::getCStr(Handle handle)
stringTable.clear();
for (const auto& slice : slices)
{
- const int len = int(slice.size());
+ const int len = int(slice.getLength());
// We need to write into the the string array
char prefixBytes[6];
diff --git a/source/slang/slang-ir-serialize.cpp b/source/slang/slang-ir-serialize.cpp
index 5d78f76f8..4588816f7 100644
--- a/source/slang/slang-ir-serialize.cpp
+++ b/source/slang/slang-ir-serialize.cpp
@@ -91,7 +91,7 @@ void IRSerialWriter::_addDebugSourceLocRun(SourceLoc sourceLoc, uint32_t startIn
if (!pool.isDefaultHandle(entry.m_pathHandle))
{
UnownedStringSlice slice = pool.getSlice(entry.m_pathHandle);
- SLANG_ASSERT(slice.size() > 0);
+ SLANG_ASSERT(slice.getLength() > 0);
adjustedLineInfo.m_pathStringIndex = Ser::StringIndex(m_debugStringSlicePool.add(slice));
}
@@ -1161,7 +1161,7 @@ static int _calcFixSourceLoc(const IRSerialData::DebugSourceInfo& info, SourceVi
const UnownedStringSlice slice = m_stringRepresentationCache.getStringSlice(StringHandle(srcInst.m_payload.m_stringIndices[0]));
- const size_t sliceSize = slice.size();
+ const size_t sliceSize = slice.getLength();
const size_t instSize = prefixSize + SLANG_OFFSET_OF(IRConstant::StringValue, chars) + sliceSize;
irConst = static_cast<IRConstant*>(createEmptyInstWithSize(module, op, instSize));
diff --git a/source/slang/slang-ir.cpp b/source/slang/slang-ir.cpp
index 62bdb171a..6e1b6fe83 100644
--- a/source/slang/slang-ir.cpp
+++ b/source/slang/slang-ir.cpp
@@ -1773,7 +1773,7 @@ namespace Slang
case kIROp_StringLit:
{
const UnownedStringSlice slice = getStringSlice();
- return combineHash(code, Slang::GetHashCode(slice.begin(), slice.size()));
+ return combineHash(code, Slang::GetHashCode(slice.begin(), slice.getLength()));
}
default:
{
@@ -1837,7 +1837,7 @@ namespace Slang
{
const UnownedStringSlice slice = keyInst.getStringSlice();
- const size_t sliceSize = slice.size();
+ const size_t sliceSize = slice.getLength();
const size_t instSize = prefixSize + offsetof(IRConstant::StringValue, chars) + sliceSize;
irValue = static_cast<IRConstant*>(createInstWithSizeImpl(builder, keyInst.op, keyInst.getFullType(), instSize));
@@ -1910,7 +1910,7 @@ namespace Slang
IRConstant::StringSliceValue& dstSlice = keyInst.value.transitoryStringVal;
dstSlice.chars = const_cast<char*>(inSlice.begin());
- dstSlice.numChars = uint32_t(inSlice.size());
+ dstSlice.numChars = uint32_t(inSlice.getLength());
return static_cast<IRStringLit*>(findOrEmitConstant(this, keyInst));
}
diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp
index 3cd3f73e3..04fab31ee 100644
--- a/source/slang/slang-lower-to-ir.cpp
+++ b/source/slang/slang-lower-to-ir.cpp
@@ -5847,7 +5847,7 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo>
//
if(targetMod->targetToken.type == TokenType::Unknown)
return;
- else if(targetMod->targetToken.Content.size() == 0)
+ else if(targetMod->targetToken.Content.getLength() == 0)
return;
}
}
diff --git a/source/slang/slang-mangle.cpp b/source/slang/slang-mangle.cpp
index 5d9320f3d..dfb55404e 100644
--- a/source/slang/slang-mangle.cpp
+++ b/source/slang/slang-mangle.cpp
@@ -481,7 +481,7 @@ namespace Slang
String getHashedName(const UnownedStringSlice& mangledName)
{
- uint64_t hash = GetHashCode64(mangledName.begin(), mangledName.size());
+ uint64_t hash = GetHashCode64(mangledName.begin(), mangledName.getLength());
StringBuilder builder;
builder << "_Sh";
diff --git a/source/slang/slang-parameter-binding.cpp b/source/slang/slang-parameter-binding.cpp
index 0268e1850..786433836 100644
--- a/source/slang/slang-parameter-binding.cpp
+++ b/source/slang/slang-parameter-binding.cpp
@@ -453,7 +453,7 @@ static void splitNameAndIndex(
LayoutResourceKind findRegisterClassFromName(UnownedStringSlice const& registerClassName)
{
- switch( registerClassName.size() )
+ switch( registerClassName.getLength() )
{
case 1:
switch (*registerClassName.begin())
@@ -491,7 +491,7 @@ LayoutSemanticInfo ExtractLayoutSemanticInfo(
info.kind = LayoutResourceKind::None;
UnownedStringSlice registerName = semantic->registerName.Content;
- if (registerName.size() == 0)
+ if (registerName.getLength() == 0)
return info;
// The register name is expected to be in the form:
@@ -517,7 +517,7 @@ LayoutSemanticInfo ExtractLayoutSemanticInfo(
// For a `register` semantic, the register index is not optional (unlike
// how it works for varying input/output semantics).
- if( registerIndexDigits.size() == 0 )
+ if( registerIndexDigits.getLength() == 0 )
{
getSink(context)->diagnose(semantic->registerName, Diagnostics::expectedARegisterIndex, registerClassName);
}
@@ -534,7 +534,7 @@ LayoutSemanticInfo ExtractLayoutSemanticInfo(
if( auto registerSemantic = as<HLSLRegisterSemantic>(semantic) )
{
auto const& spaceName = registerSemantic->spaceName.Content;
- if(spaceName.size() != 0)
+ if(spaceName.getLength() != 0)
{
UnownedStringSlice spaceSpelling;
UnownedStringSlice spaceDigits;
@@ -548,7 +548,7 @@ LayoutSemanticInfo ExtractLayoutSemanticInfo(
{
getSink(context)->diagnose(registerSemantic->spaceName, Diagnostics::expectedSpace, spaceSpelling);
}
- else if( spaceDigits.size() == 0 )
+ else if( spaceDigits.getLength() == 0 )
{
getSink(context)->diagnose(registerSemantic->spaceName, Diagnostics::expectedSpaceIndex);
}
@@ -564,7 +564,7 @@ LayoutSemanticInfo ExtractLayoutSemanticInfo(
}
// TODO: handle component mask part of things...
- if( semantic->componentMask.Content.size() != 0 )
+ if( semantic->componentMask.Content.getLength() != 0 )
{
getSink(context)->diagnose(semantic->componentMask, Diagnostics::componentMaskNotSupported);
}
@@ -1340,7 +1340,7 @@ SimpleSemanticInfo decomposeSimpleSemantic(
// look for a trailing sequence of decimal digits
// at the end of the composed name
- UInt length = composedName.size();
+ UInt length = composedName.getLength();
UInt indexLoc = length;
while( indexLoc > 0 )
{
diff --git a/source/slang/slang-reflection.cpp b/source/slang/slang-reflection.cpp
index 037bc2d97..fe709222b 100644
--- a/source/slang/slang-reflection.cpp
+++ b/source/slang/slang-reflection.cpp
@@ -183,7 +183,7 @@ SLANG_API const char* spReflectionUserAttribute_GetArgumentValueString(SlangRefl
if (auto cexpr = as<StringLiteralExpr>(userAttr->args[index]))
{
if (bufLen)
- *bufLen = cexpr->token.Content.size();
+ *bufLen = cexpr->token.Content.getLength();
return cexpr->token.Content.begin();
}
return nullptr;
@@ -1564,7 +1564,7 @@ SLANG_API const char* spReflection_getHashedString(
auto slices = programLayout->hashedStringLiteralPool.getAdded();
auto slice = slices[Index(index)];
- *outCount = slice.size();
+ *outCount = slice.getLength();
return slice.begin();
}
diff --git a/source/slang/slang-source-loc.cpp b/source/slang/slang-source-loc.cpp
index 72f921369..ef45c42b0 100644
--- a/source/slang/slang-source-loc.cpp
+++ b/source/slang/slang-source-loc.cpp
@@ -359,7 +359,7 @@ SourceManager::~SourceManager()
UnownedStringSlice SourceManager::allocateStringSlice(const UnownedStringSlice& slice)
{
- const UInt numChars = slice.size();
+ const UInt numChars = slice.getLength();
char* dst = (char*)m_memoryArena.allocate(numChars);
::memcpy(dst, slice.begin(), numChars);
diff --git a/source/slang/slang-state-serialize.cpp b/source/slang/slang-state-serialize.cpp
index e98c309f8..9122b80fd 100644
--- a/source/slang/slang-state-serialize.cpp
+++ b/source/slang/slang-state-serialize.cpp
@@ -1400,7 +1400,7 @@ static SlangResult _calcCommandLine(OffsetBase& base, StateSerializeUtil::Reques
{
UnownedStringSlice contents = base.asRaw(file->contents)->getSlice();
- SLANG_RETURN_ON_FAIL(fileSystem->saveFile(base.asRaw(file->uniqueName)->getCstr(), contents.begin(), contents.size()));
+ SLANG_RETURN_ON_FAIL(fileSystem->saveFile(base.asRaw(file->uniqueName)->getCstr(), contents.begin(), contents.getLength()));
OffsetString* originalName = nullptr;
if (file->canonicalPath)
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-04 01:25:13 +0000