diff --git a/Test/hlsl.structbuffer.frag b/Test/hlsl.structbuffer.frag index 4eb6912bf42ccd297f5bb21c4fad1d782bbb490f..dd522a697707f2c8c7474c67bca42ce9d1846136 100644 --- a/Test/hlsl.structbuffer.frag +++ b/Test/hlsl.structbuffer.frag @@ -5,7 +5,7 @@ struct sb_t bool test2; }; // stride = 20 -StructuredBuffer<sb_t> sbuf : register(c10); +StructuredBuffer<sb_t> sbuf : register(t10); StructuredBuffer<float> sbuf2; float4 main(uint pos : FOO) : SV_Target0 diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index ac2943284dffeef1fd1ad2b57051abeb61e0d118..6ce182dee0793c5dd84213991bad31ba1b937ac1 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -6066,13 +6066,22 @@ void HlslParseContext::handleRegister(const TSourceLoc& loc, TQualifier& qualifi } } - // TODO: learn what all these really mean and how they interact with regNumber and subComponent + // more information about register types see + // https://docs.microsoft.com/en-us/windows/desktop/direct3dhlsl/dx-graphics-hlsl-variable-register const std::vector<std::string>& resourceInfo = intermediate.getResourceSetBinding(); switch (std::tolower(desc[0])) { + case 'c': + // c register is the register slot in the global const buffer + // each slot is a vector of 4 32 bit components + qualifier.layoutOffset = regNumber * 4 * 4; + break; + // const buffer register slot case 'b': + // textrues and structured buffers case 't': - case 'c': + // samplers case 's': + // uav resources case 'u': // if nothing else has set the binding, do so now // (other mechanisms override this one)