summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/gfx/d3d11/render-d3d11.cpp39
-rw-r--r--tools/gfx/vulkan/render-vk.cpp32
2 files changed, 42 insertions, 29 deletions
diff --git a/tools/gfx/d3d11/render-d3d11.cpp b/tools/gfx/d3d11/render-d3d11.cpp
index 415e0b833..6f6ba4faf 100644
--- a/tools/gfx/d3d11/render-d3d11.cpp
+++ b/tools/gfx/d3d11/render-d3d11.cpp
@@ -550,6 +550,18 @@ protected:
}
}
+ /// Create an offset based on size/stride information in the given Slang `typeLayout`
+ SimpleBindingOffset(slang::TypeLayoutReflection* typeLayout)
+ {
+ if(typeLayout)
+ {
+ cbv = (uint32_t) typeLayout->getSize(SLANG_PARAMETER_CATEGORY_CONSTANT_BUFFER);
+ srv = (uint32_t) typeLayout->getSize(SLANG_PARAMETER_CATEGORY_SHADER_RESOURCE);
+ uav = (uint32_t) typeLayout->getSize(SLANG_PARAMETER_CATEGORY_UNORDERED_ACCESS);
+ sampler = (uint32_t) typeLayout->getSize(SLANG_PARAMETER_CATEGORY_SAMPLER_STATE);
+ }
+ }
+
/// Add any values in the given `offset`
void operator+=(SimpleBindingOffset const& offset)
{
@@ -594,6 +606,12 @@ protected:
, pending(varLayout->getPendingDataLayout())
{}
+ /// Create an offset based on size/stride information in the given Slang `typeLayout`
+ BindingOffset(slang::TypeLayoutReflection* typeLayout)
+ : SimpleBindingOffset(typeLayout)
+ , pending(typeLayout->getPendingDataTypeLayout())
+ {}
+
/// Add any values in the given `offset`
void operator+=(SimpleBindingOffset const& offset)
{
@@ -673,16 +691,17 @@ protected:
};
/// Stride information for a sub-object range
- struct SubObjectRangeStride
+ struct SubObjectRangeStride : BindingOffset
{
SubObjectRangeStride()
{}
SubObjectRangeStride(slang::TypeLayoutReflection* typeLayout)
+ : BindingOffset(typeLayout)
{
if(auto pendingLayout = typeLayout->getPendingDataTypeLayout())
{
- pendingOrdinaryData = (uint32_t) pendingLayout->getSize(SLANG_PARAMETER_CATEGORY_UNIFORM);
+ pendingOrdinaryData = (uint32_t) typeLayout->getStride();
}
}
@@ -1747,6 +1766,11 @@ protected:
BindingOffset rangeOffset = offset;
rangeOffset += subObjectRange.offset;
+ // Similarly, the "stride" between consecutive objects in
+ // the range was also pre-computed.
+ //
+ BindingOffset rangeStride = subObjectRange.stride;
+
switch(bindingRange.bindingType)
{
// For D3D11-compatible compilation targets, the Slang compiler
@@ -1765,8 +1789,7 @@ protected:
//
subObject->bindAsConstantBuffer(context, objOffset, subObjectLayout);
- // TODO: We need to update `objOffset` by the stride for
- // this range.
+ objOffset += rangeStride;
}
}
break;
@@ -1782,15 +1805,15 @@ protected:
// As a result, the offset for the first object in the range
// will come from the `pending` part of the range's offset.
//
- BindingOffset objOffset = BindingOffset(rangeOffset.pending);
+ SimpleBindingOffset objOffset = rangeOffset.pending;
+ SimpleBindingOffset objStride = rangeStride.pending;
for(Index i = 0; i < count; ++i)
{
auto subObject = m_objects[ baseIndex + i ];
- subObject->bindAsValue(context, objOffset, subObjectLayout);
+ subObject->bindAsValue(context, BindingOffset(objOffset), subObjectLayout);
- // TODO: We need to update `objOffset` by the stride for
- // this range.
+ objOffset += objStride;
}
}
break;
diff --git a/tools/gfx/vulkan/render-vk.cpp b/tools/gfx/vulkan/render-vk.cpp
index a0860f0e5..f330d95a8 100644
--- a/tools/gfx/vulkan/render-vk.cpp
+++ b/tools/gfx/vulkan/render-vk.cpp
@@ -853,7 +853,7 @@ public:
};
/// Stride information for a sub-object range
- struct SubObjectRangeStride
+ struct SubObjectRangeStride : BindingOffset
{
SubObjectRangeStride()
{}
@@ -862,7 +862,7 @@ public:
{
if(auto pendingLayout = typeLayout->getPendingDataTypeLayout())
{
- pendingOrdinaryData = (uint32_t) pendingLayout->getSize(SLANG_PARAMETER_CATEGORY_UNIFORM);
+ pendingOrdinaryData = (uint32_t) pendingLayout->getStride();
}
}
@@ -3095,6 +3095,8 @@ public:
BindingOffset rangeOffset = offset;
rangeOffset += subObjectRange.offset;
+ BindingOffset rangeStride = subObjectRange.stride;
+
switch( bindingRangeInfo.bindingType )
{
case slang::BindingType::ConstantBuffer:
@@ -3114,12 +3116,7 @@ public:
// sure to increment the offset for each subsequent object
// by the appropriate stride.
//
- // TODO: We should pre-compute these and simply have
- // `subObjectRange.stride` to go with `subObjectRange.offset`.
- //
- objOffset.binding += subObjectLayout->getTotalBindingCount();
- objOffset.childSet += subObjectLayout->getChildDescriptorSetCount();
- objOffset.pushConstantRange += subObjectLayout->getTotalPushConstantRangeCount();
+ objOffset += rangeStride;
}
}
break;
@@ -3135,12 +3132,7 @@ public:
ShaderObjectImpl* subObject = m_objects[baseIndex + i];
subObject->bindAsParameterBlock(encoder, context, objOffset, subObjectLayout);
- // The logic for striding from one sub-object to another is also
- // different, given the differences in how constant buffers and
- // parameter blocks are allocated.
- //
- objOffset.childSet += subObjectLayout->getChildDescriptorSetCount();
- objOffset.pushConstantRange += subObjectLayout->getTotalPushConstantRangeCount();
+ objOffset += rangeStride;
}
}
break;
@@ -3153,14 +3145,15 @@ public:
//
if( subObjectLayout )
{
- // Second, the offset where we want to start bindign for existential-type
+ // Second, the offset where we want to start binding for existential-type
// ranges is a bit different, because we don't wnat to bind at the "primary"
// offset that got passed down, but instead at the "pending" offset.
//
// For the purposes of nested binding, what used to be the pending offset
// will now be used as the primary offset.
//
- BindingOffset objOffset = BindingOffset(rangeOffset.pending);
+ SimpleBindingOffset objOffset = rangeOffset.pending;
+ SimpleBindingOffset objStride = rangeStride.pending;
for (uint32_t i = 0; i < count; ++i)
{
// An existential-type sub-object is always bound just as a value,
@@ -3170,11 +3163,8 @@ public:
// already.
//
ShaderObjectImpl* subObject = m_objects[baseIndex + i];
- subObject->bindAsValue(encoder, context, objOffset, subObjectLayout);
-
- objOffset.binding += subObjectLayout->getTotalBindingCount();
- objOffset.childSet += subObjectLayout->getChildDescriptorSetCount();
- objOffset.pushConstantRange += subObjectLayout->getTotalPushConstantRangeCount();
+ subObject->bindAsValue(encoder, context, BindingOffset(objOffset), subObjectLayout);
+ objOffset += objStride;
}
}
break;
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-05 01:09:33 +0000