summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-emit-glsl.cpp
diff options
context:
space:
mode:
authorArielG-NV <159081215+ArielG-NV@users.noreply.github.com>2024-06-26 09:37:18 -0400
committerGitHub <noreply@github.com>2024-06-26 09:37:18 -0400
commite1d0ef2002d7b0f459cf689ec1f8e37c4ff2afba (patch)
treeaf4ab4fdd522a26458b56d4e642962f086630b21 /source/slang/slang-emit-glsl.cpp
parent969dd4cc7246bfe89103efcb00f399606e804e98 (diff)
Expand upon existing `ImageSubscript` support (Metal, GLSL, SPIRV) (#4408)
* Add additional `ImageSubscript` features: 1. Added ImageSubscript support for Metal & a test case * Merge GLSL/SPIRV/Metal `ImageSubscript` legalization pass 2. Added multisample support to glsl/spirv/metal for when using ImageSubscript * Added in this PR since the overhaul of the code merges together GLSL/SPIRV/Metal implementation 3. Fixed minor metal texture `Load`/`Read` bugs * [HLSL methods of access do not support subscript accessor for texture cube array](https://learn.microsoft.com/en-us/windows/win32/direct3dhlsl/texturecubearray) * removed swizzling of uint/int/float * other odd bugs which were causing compile errors note: Compute tests do not work due to what seems to be the GFX backend (causes crash without error report). The tests are disabled. * disable LOD with texture 1d seems that LOD for 1d textures need to be a compile time constant as per an error metal throws * syntax error in hlsl.meta * static_assert alone with intrinsic_asm error provides cleaner errors Note: `static_assert` seems to be unstable and not be fully respected (still require `intrinsic_asm` to avoid a stdlib compile error) * change comment to `// lod is not supported for 1D texture * add `static_assert` in related code gen paths * address review * address review * add asserts as per review comment, NOTE: unclear if these should be release 'asserts' as well
Diffstat (limited to 'source/slang/slang-emit-glsl.cpp')
-rw-r--r--source/slang/slang-emit-glsl.cpp22
1 files changed, 17 insertions, 5 deletions
diff --git a/source/slang/slang-emit-glsl.cpp b/source/slang/slang-emit-glsl.cpp
index 2a7f22905..b6c3c0d67 100644
--- a/source/slang/slang-emit-glsl.cpp
+++ b/source/slang/slang-emit-glsl.cpp
@@ -2021,21 +2021,33 @@ bool GLSLSourceEmitter::tryEmitInstExprImpl(IRInst* inst, const EmitOpInfo& inOu
}
case kIROp_ImageLoad:
{
+ auto imageOp = as<IRImageLoad>(inst);
m_writer->emit("imageLoad(");
- emitOperand(inst->getOperand(0), getInfo(EmitOp::General));
+ emitOperand(imageOp->getImage(), getInfo(EmitOp::General));
m_writer->emit(",");
- emitOperand(inst->getOperand(1), getInfo(EmitOp::General));
+ emitOperand(imageOp->getCoord(), getInfo(EmitOp::General));
+ if (imageOp->hasAuxCoord1())
+ {
+ m_writer->emit(",");
+ emitOperand(imageOp->getAuxCoord1(), getInfo(EmitOp::General));
+ }
m_writer->emit(")");
return true;
}
case kIROp_ImageStore:
{
+ auto imageOp = as<IRImageStore>(inst);
m_writer->emit("imageStore(");
- emitOperand(inst->getOperand(0), getInfo(EmitOp::General));
+ emitOperand(imageOp->getImage(), getInfo(EmitOp::General));
m_writer->emit(",");
- emitOperand(inst->getOperand(1), getInfo(EmitOp::General));
+ emitOperand(imageOp->getCoord(), getInfo(EmitOp::General));
+ if (imageOp->hasAuxCoord1())
+ {
+ m_writer->emit(",");
+ emitOperand(imageOp->getAuxCoord1(), getInfo(EmitOp::General));
+ }
m_writer->emit(",");
- emitOperand(inst->getOperand(2), getInfo(EmitOp::General));
+ emitOperand(imageOp->getValue(), getInfo(EmitOp::General));
m_writer->emit(")");
return true;
}