summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/slang/slang-emit-c-like.cpp51
-rw-r--r--source/slang/slang-emit-c-like.h2
-rw-r--r--source/slang/slang-emit-cpp.cpp14
-rw-r--r--source/slang/slang-ir-inst-defs.h2
-rw-r--r--source/slang/slang-ir-insts.h6
-rw-r--r--source/slang/slang-lower-to-ir.cpp6
6 files changed, 38 insertions, 43 deletions
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index 63e80615e..6b828085e 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -600,6 +600,25 @@ String CLikeSourceEmitter::generateName(IRInst* inst)
return String(intrinsicDecoration->getDefinition());
}
+ auto entryPointDecor = inst->findDecoration<IREntryPointDecoration>();
+ if (entryPointDecor)
+ {
+ if (getSourceStyle() == SourceStyle::GLSL)
+ {
+ // GLSL will always need to use `main` as the
+ // name for an entry-point function, but other
+ // targets should try to use the original name.
+ //
+ // TODO: always use the original name, and
+ // use the appropriate options for glslang to
+ // make it support a non-`main` name.
+ //
+ return "main";
+ }
+
+ return entryPointDecor->getName()->getStringSlice();
+ }
+
// If we have a name hint on the instruction, then we will try to use that
// to provide the actual name in the output code.
//
@@ -2448,34 +2467,6 @@ bool CLikeSourceEmitter::isDefinition(IRFunc* func)
return func->getFirstBlock() != nullptr;
}
-String CLikeSourceEmitter::getFuncName(IRFunc* func)
-{
- if (auto entryPointLayout = asEntryPoint(func))
- {
- // GLSL will always need to use `main` as the
- // name for an entry-point function, but other
- // targets should try to use the original name.
- //
- // TODO: always use the original name, and
- // use the appropriate options for glslang to
- // make it support a non-`main` name.
- //
- if (getSourceStyle() != SourceStyle::GLSL)
- {
- return getText(entryPointLayout->getFuncDecl()->getName());
- }
-
- //
-
- return "main";
- }
- else
- {
- return getName(func);
- }
-}
-
-
void CLikeSourceEmitter::emitEntryPointAttributes(IRFunc* irFunc, IREntryPointDecoration* entryPointDecor)
{
emitEntryPointAttributesImpl(irFunc, entryPointDecor);
@@ -2549,7 +2540,7 @@ void CLikeSourceEmitter::emitSimpleFuncImpl(IRFunc* func)
emitEntryPointAttributes(func, entryPointDecor);
}
- auto name = getFuncName(func);
+ auto name = getName(func);
emitType(resultType, name);
@@ -2657,7 +2648,7 @@ void CLikeSourceEmitter::emitFuncDecl(IRFunc* func)
auto funcType = func->getDataType();
auto resultType = func->getResultType();
- auto name = getFuncName(func);
+ auto name = getName(func);
emitType(resultType, name);
diff --git a/source/slang/slang-emit-c-like.h b/source/slang/slang-emit-c-like.h
index 1460135a5..1f0a6c818 100644
--- a/source/slang/slang-emit-c-like.h
+++ b/source/slang/slang-emit-c-like.h
@@ -239,8 +239,6 @@ public:
// Is an IR function a definition? (otherwise it is a declaration)
bool isDefinition(IRFunc* func);
- String getFuncName(IRFunc* func);
-
void emitEntryPointAttributes(IRFunc* irFunc, IREntryPointDecoration* entryPointDecor);
void emitPhiVarDecls(IRFunc* func);
diff --git a/source/slang/slang-emit-cpp.cpp b/source/slang/slang-emit-cpp.cpp
index 916444d3e..2aea0cae9 100644
--- a/source/slang/slang-emit-cpp.cpp
+++ b/source/slang/slang-emit-cpp.cpp
@@ -1939,15 +1939,14 @@ void CPPSourceEmitter::emitSimpleFuncImpl(IRFunc* func)
{
auto resultType = func->getResultType();
- auto name = getFuncName(func);
+ auto name = getName(func);
// Deal with decorations that need
// to be emitted as attributes
// We are going to ignore the parameters passed and just pass in the Context
- auto entryPointLayout = asEntryPoint(func);
- if (entryPointLayout)
+ if (IREntryPointDecoration* entryPointDecor = func->findDecoration<IREntryPointDecoration>())
{
StringBuilder prefixName;
prefixName << "_" << name;
@@ -2809,8 +2808,9 @@ void CPPSourceEmitter::emitModuleImpl(IRModule* module)
{
IRFunc* func = as<IRFunc>(action.inst);
- auto entryPointLayout = asEntryPoint(func);
- if (entryPointLayout && entryPointLayout->profile.GetStage() == Stage::Compute)
+ IREntryPointDecoration* entryPointDecor = func->findDecoration<IREntryPointDecoration>();
+
+ if (entryPointDecor && entryPointDecor->getProfile().GetStage() == Stage::Compute)
{
// https://docs.microsoft.com/en-us/windows/win32/direct3dhlsl/sv-dispatchthreadid
// SV_DispatchThreadID is the sum of SV_GroupID * numthreads and GroupThreadID.
@@ -2818,7 +2818,7 @@ void CPPSourceEmitter::emitModuleImpl(IRModule* module)
Int groupThreadSize[kThreadGroupAxisCount];
getComputeThreadGroupSize(func, groupThreadSize);
- String funcName = getFuncName(func);
+ String funcName = getName(func);
{
StringBuilder builder;
@@ -2852,7 +2852,7 @@ void CPPSourceEmitter::emitModuleImpl(IRModule* module)
// Emit the group version which runs for all elements in *single* thread group
{
StringBuilder builder;
- builder << getFuncName(func);
+ builder << getName(func);
builder << "_Group";
String groupFuncName = builder;
diff --git a/source/slang/slang-ir-inst-defs.h b/source/slang/slang-ir-inst-defs.h
index 26df8a5e3..3912a3915 100644
--- a/source/slang/slang-ir-inst-defs.h
+++ b/source/slang/slang-ir-inst-defs.h
@@ -434,7 +434,7 @@ INST(HighLevelDeclDecoration, highLevelDecl, 1, 0)
INST(StreamOutputTypeDecoration, streamOutputTypeDecoration, 1, 0)
/// An `[entryPoint]` decoration marks a function that represents a shader entry point
- INST(EntryPointDecoration, entryPoint, 1, 0)
+ INST(EntryPointDecoration, entryPoint, 2, 0)
/// Used to mark parameters that are moved from entry point parameters to global params as coming from the entry point.
INST(EntryPointParamDecoration, entryPointParam, 0, 0)
diff --git a/source/slang/slang-ir-insts.h b/source/slang/slang-ir-insts.h
index f8cb3a4ea..ec327b1a9 100644
--- a/source/slang/slang-ir-insts.h
+++ b/source/slang/slang-ir-insts.h
@@ -294,6 +294,8 @@ struct IREntryPointDecoration : IRDecoration
IRIntLit* getProfileInst() { return cast<IRIntLit>(getOperand(0)); }
Profile getProfile() { return Profile(Profile::RawVal(GetIntVal(getProfileInst()))); }
+
+ IRStringLit* getName() { return cast<IRStringLit>(getOperand(1)); }
};
struct IRGeometryInputPrimitiveTypeDecoration: IRDecoration
@@ -1400,9 +1402,9 @@ struct IRBuilder
addDecoration(value, kIROp_ExportDecoration, getStringValue(mangledName));
}
- void addEntryPointDecoration(IRInst* value, Profile profile)
+ void addEntryPointDecoration(IRInst* value, Profile profile, UnownedStringSlice const& name)
{
- addDecoration(value, kIROp_EntryPointDecoration, getIntValue(getIntType(), profile.raw));
+ addDecoration(value, kIROp_EntryPointDecoration, getIntValue(getIntType(), profile.raw), getStringValue(name));
}
void addKeepAliveDecoration(IRInst* value)
diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp
index 08b8cb1bd..50ac6948b 100644
--- a/source/slang/slang-lower-to-ir.cpp
+++ b/source/slang/slang-lower-to-ir.cpp
@@ -6338,7 +6338,11 @@ static void lowerFrontEndEntryPointToIR(
{
instToDecorate = findGenericReturnVal(irGeneric);
}
- builder->addEntryPointDecoration(instToDecorate, entryPoint->getProfile());
+
+ {
+ Name* entryPointName = entryPoint->getFuncDecl()->getName();
+ builder->addEntryPointDecoration(instToDecorate, entryPoint->getProfile(), entryPointName->text.getUnownedSlice());
+ }
// Go through the entry point parameters creating decorations from layout as appropriate
{
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 20:07:43 +0000