diff options
| author | azhirnov <zh1dron@gmail.com> | 2021-03-02 16:12:56 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 00:38:13 +0000 |
| commit | d06d513d27f742f422c9ebaeae2d265833c7251e (patch) | |
| tree | 9c8e5db07732316b58b0d6ba9cbf65df337fa64f /Graphics/ShaderTools | |
| parent | RunTimeResourceArray test: added samplers (diff) | |
| download | DiligentCore-d06d513d27f742f422c9ebaeae2d265833c7251e.tar.gz DiligentCore-d06d513d27f742f422c9ebaeae2d265833c7251e.zip | |
DXBC resource remapper: added support for runtime-sized array
Diffstat (limited to 'Graphics/ShaderTools')
| -rw-r--r-- | Graphics/ShaderTools/src/DXBCUtils.cpp | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/Graphics/ShaderTools/src/DXBCUtils.cpp b/Graphics/ShaderTools/src/DXBCUtils.cpp index 1dcbbd94..dc12886f 100644 --- a/Graphics/ShaderTools/src/DXBCUtils.cpp +++ b/Graphics/ShaderTools/src/DXBCUtils.cpp @@ -924,6 +924,7 @@ private: ShaderChunkHeader const& Header; ResourceBindingPerType const& BindingsPerType; + static constexpr Uint32 RuntimeSizedArraySize = ~0u; private: void RemapResourceOperand(const OperandToken& Operand, Uint32* Token, const void* Finish); @@ -1159,12 +1160,14 @@ void ShaderBytecodeRemapper::RemapResourceBindingSM51(const OpcodeToken& Opcode, VERIFY_EXPR(Info->BindPoint == Token[2]); VERIFY_EXPR(Info->Type == ShaderResType::CBV); - if (Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) + if (Token[3] != RuntimeSizedArraySize && Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) LOG_ERROR_AND_THROW("Invalid cbuffer bind point (", Token[3], "), expected (", Info->SrcBindPoint + Info->ArraySize - 1, ")."); if (Info->SrcSpace != Token[5]) LOG_ERROR_AND_THROW("Invalid cbuffer register space (", Token[5], "), expected (", Info->SrcSpace, ")."); - Token[3] = Info->BindPoint + Info->ArraySize - 1; + if (Token[3] != RuntimeSizedArraySize) + Token[3] = Info->BindPoint + Info->ArraySize - 1; + Token[5] = Info->Space; break; } @@ -1193,12 +1196,14 @@ void ShaderBytecodeRemapper::RemapResourceBindingSM51(const OpcodeToken& Opcode, VERIFY_EXPR(Info->BindPoint == Token[2]); VERIFY_EXPR(Info->Type == ShaderResType::Sampler); - if (Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) + if (Token[3] != RuntimeSizedArraySize && Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) LOG_ERROR_AND_THROW("Invalid sampler bind point (", Token[3], "), expected (", Info->SrcBindPoint + Info->ArraySize - 1, ")."); if (Info->SrcSpace != Token[4]) LOG_ERROR_AND_THROW("Invalid sampler register space (", Token[4], "), expected (", Info->SrcSpace, ")."); - Token[3] = Info->BindPoint + Info->ArraySize - 1; + if (Token[3] != RuntimeSizedArraySize) + Token[3] = Info->BindPoint + Info->ArraySize - 1; + Token[4] = Info->Space; break; } @@ -1230,12 +1235,14 @@ void ShaderBytecodeRemapper::RemapResourceBindingSM51(const OpcodeToken& Opcode, VERIFY_EXPR(Info->BindPoint == Token[2]); VERIFY_EXPR(Info->Type == ShaderResType::SRV); - if (Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) + if (Token[3] != RuntimeSizedArraySize && Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) LOG_ERROR_AND_THROW("Invalid texture bind point (", Token[3], "), expected (", Info->SrcBindPoint + Info->ArraySize - 1, ")."); if (Info->SrcSpace != Token[5]) LOG_ERROR_AND_THROW("Invalid texture register space (", Token[5], "), expected (", Info->SrcSpace, ")."); - Token[3] = Info->BindPoint + Info->ArraySize - 1; + if (Token[3] != RuntimeSizedArraySize) + Token[3] = Info->BindPoint + Info->ArraySize - 1; + Token[5] = Info->Space; break; } @@ -1263,12 +1270,14 @@ void ShaderBytecodeRemapper::RemapResourceBindingSM51(const OpcodeToken& Opcode, VERIFY_EXPR(Info->BindPoint == Token[2]); VERIFY_EXPR(Info->Type == ShaderResType::SRV); - if (Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) + if (Token[3] != RuntimeSizedArraySize && Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) LOG_ERROR_AND_THROW("Invalid texture bind point (", Token[3], "), expected (", Info->SrcBindPoint + Info->ArraySize - 1, ")."); if (Info->SrcSpace != Token[4]) LOG_ERROR_AND_THROW("Invalid texture register space (", Token[4], "), expected (", Info->SrcSpace, ")."); - Token[3] = Info->BindPoint + Info->ArraySize - 1; + if (Token[3] != RuntimeSizedArraySize) + Token[3] = Info->BindPoint + Info->ArraySize - 1; + Token[4] = Info->Space; break; } @@ -1300,12 +1309,14 @@ void ShaderBytecodeRemapper::RemapResourceBindingSM51(const OpcodeToken& Opcode, VERIFY_EXPR(Info->BindPoint == Token[2]); VERIFY_EXPR(Info->Type == ShaderResType::UAV); - if (Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) + if (Token[3] != RuntimeSizedArraySize && Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) LOG_ERROR_AND_THROW("Invalid UAV bind point (", Token[3], "), expected (", Info->SrcBindPoint + Info->ArraySize - 1, ")."); if (Info->SrcSpace != Token[5]) LOG_ERROR_AND_THROW("Invalid UAV register space (", Token[5], "), expected (", Info->SrcSpace, ")."); - Token[3] = Info->BindPoint + Info->ArraySize - 1; + if (Token[3] != RuntimeSizedArraySize) + Token[3] = Info->BindPoint + Info->ArraySize - 1; + Token[5] = Info->Space; break; } @@ -1333,12 +1344,14 @@ void ShaderBytecodeRemapper::RemapResourceBindingSM51(const OpcodeToken& Opcode, VERIFY_EXPR(Info->BindPoint == Token[2]); VERIFY_EXPR(Info->Type == ShaderResType::UAV); - if (Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) + if (Token[3] != RuntimeSizedArraySize && Token[3] != Info->SrcBindPoint + Info->ArraySize - 1) LOG_ERROR_AND_THROW("Invalid UAV bind point (", Token[3], "), expected (", Info->SrcBindPoint + Info->ArraySize - 1, ")."); if (Info->SrcSpace != Token[4]) LOG_ERROR_AND_THROW("Invalid UAV register space (", Token[4], "), expected (", Info->SrcSpace, ")."); - Token[3] = Info->BindPoint + Info->ArraySize - 1; + if (Token[3] != RuntimeSizedArraySize) + Token[3] = Info->BindPoint + Info->ArraySize - 1; + Token[4] = Info->Space; break; } |