summaryrefslogtreecommitdiff
path: root/source/slang/slang-emit-c-like.cpp
diff options
context:
space:
mode:
authorEllie Hermaszewska <ellieh@nvidia.com>2023-09-12 11:13:11 +0800
committerGitHub <noreply@github.com>2023-09-11 20:13:11 -0700
commit09854a4596019ddb3bb315b8836b5c88e718cdc7 (patch)
tree1556ae3e00da0fac91343f159b52cee1231a7fab /source/slang/slang-emit-c-like.cpp
parent87bb0b503544f1b8c6ec818e25c695b31cda24b7 (diff)
Add Mesh and Task shader support to GFX (#3190)
* Bump vulkan headers Also just use vulkan-headers as a submodule * Add drawMeshTasks to gfx graphics pipelines * Add DispatchMesh overload with no payload, with GLSL intrinsic * Require spirv 1.4 for mesh shaders * Add vulkan mesh shader feature discovery * Add mesh shader stage bits to vk-util * Add mesh and task shader support to render-test * Add mesh and task tests * Preserve "payload" specifier in task shaders * Add mesh shader pipeline support to gfx * Add TODO * Add numThreads attribute for amplification stage * Add payload to task shader test * Drop dependency on d3dx12 * Allow passing payloads from task to mesh shaders * regenerate vs projects * check DispatchMesh name correctly * Add mesh shader tests to failing tests * Detect wave-ops feature on vulkan * Add fuse-product to expected failures This fails because the global varaible `count` is not initialized * Add required extension to WaveMaskMatch SPIR-V impl * Remove meshShader member from pipeline desc * Identify mesh shader support on d3d12
Diffstat (limited to 'source/slang/slang-emit-c-like.cpp')
-rw-r--r--source/slang/slang-emit-c-like.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index a8080851f..fa6fd2b43 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -1638,11 +1638,14 @@ void CLikeSourceEmitter::emitArgs(IRInst* inst)
m_writer->emit(")");
}
-void CLikeSourceEmitter::emitRateQualifiers(IRInst* value)
+void CLikeSourceEmitter::emitRateQualifiersAndAddressSpace(IRInst* value)
{
- if (IRRate* rate = value->getRate())
+ const auto rate = value->getRate();
+ const auto ptrTy = composeGetters<IRPtrTypeBase>(value, &IRInst::getDataType);
+ const auto addressSpace = ptrTy ? ptrTy->getAddressSpace() : -1;
+ if (rate || addressSpace != -1)
{
- emitRateQualifiersImpl(rate);
+ emitRateQualifiersAndAddressSpaceImpl(rate, addressSpace);
}
}
@@ -1657,7 +1660,7 @@ void CLikeSourceEmitter::emitInstResultDecl(IRInst* inst)
emitTempModifiers(inst);
- emitRateQualifiers(inst);
+ emitRateQualifiersAndAddressSpace(inst);
if(as<IRModuleInst>(inst->getParent()))
{
@@ -3138,7 +3141,7 @@ void CLikeSourceEmitter::emitSimpleFuncParamImpl(IRParam* param)
|| layout->usesResourceKind(LayoutResourceKind::VaryingOutput))
{
emitInterpolationModifiers(param, paramType, layout);
- emitMeshOutputModifiers(param);
+ emitMeshShaderModifiers(param);
}
}
@@ -3514,9 +3517,9 @@ void CLikeSourceEmitter::emitInterpolationModifiers(IRInst* varInst, IRType* val
emitInterpolationModifiersImpl(varInst, valueType, layout);
}
-void CLikeSourceEmitter::emitMeshOutputModifiers(IRInst* varInst)
+void CLikeSourceEmitter::emitMeshShaderModifiers(IRInst* varInst)
{
- emitMeshOutputModifiersImpl(varInst);
+ emitMeshShaderModifiersImpl(varInst);
}
/// Emit modifiers that should apply even for a declaration of an SSA temporary.
@@ -3547,7 +3550,7 @@ void CLikeSourceEmitter::emitVarModifiers(IRVarLayout* layout, IRInst* varDecl,
|| layout->usesResourceKind(LayoutResourceKind::VaryingOutput))
{
emitInterpolationModifiers(varDecl, varType, layout);
- emitMeshOutputModifiers(varDecl);
+ emitMeshShaderModifiers(varDecl);
}
// Output target specific qualifiers
@@ -3643,7 +3646,7 @@ void CLikeSourceEmitter::emitVar(IRVar* varDecl)
break;
}
#endif
- emitRateQualifiers(varDecl);
+ emitRateQualifiersAndAddressSpace(varDecl);
emitType(varType, getName(varDecl));
@@ -3725,7 +3728,7 @@ void CLikeSourceEmitter::emitGlobalVar(IRGlobalVar* varDecl)
emitVarModifiers(layout, varDecl, varType);
- emitRateQualifiers(varDecl);
+ emitRateQualifiersAndAddressSpace(varDecl);
emitType(varType, getName(varDecl));
// TODO: These shouldn't be needed for ordinary
@@ -3788,7 +3791,7 @@ void CLikeSourceEmitter::emitGlobalParam(IRGlobalParam* varDecl)
emitVarModifiers(layout, varDecl, varType);
- emitRateQualifiers(varDecl);
+ emitRateQualifiersAndAddressSpace(varDecl);
emitType(varType, getName(varDecl));
emitSemantics(varDecl);