encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShaderModule: Validate the push_constant block size

This commit is contained in:
Corentin Wallez 2017-07-20 11:03:02 -04:00 committed by Corentin Wallez
parent c8377da79b
commit 86b2894103
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/ShaderModule.cpp
View File

@ -62,7 +62,6 @@ namespace backend {
uint32_t offset = compiler.get_member_decoration(blockType.self, i, spv::DecorationOffset); uint32_t offset = compiler.get_member_decoration(blockType.self, i, spv::DecorationOffset);
ASSERT(offset % 4 == 0); ASSERT(offset % 4 == 0);
offset /= 4; offset /= 4;
ASSERT(offset < kMaxPushConstants);
auto memberType = compiler.get_type(blockType.member_types[i]); auto memberType = compiler.get_type(blockType.member_types[i]);
PushConstantType constantType; PushConstantType constantType;
@ -75,9 +74,22 @@ namespace backend {
constantType = PushConstantType::Float; constantType = PushConstantType::Float;
} }
// TODO(cwallez@chromium.org): check for overflows and make the logic better take into account
// things like the array of types with padding.
uint32_t size = memberType.vecsize * memberType.columns;
// Handle unidimensional arrays
if (!memberType.array.empty()) {
size *= memberType.array[0];
}
if (offset + size > kMaxPushConstants) {
device->HandleError("Push constant block too big in the SPIRV");
return;
}
pushConstants.mask.set(offset); pushConstants.mask.set(offset);
pushConstants.names[offset] = interfaceBlock.name + "." + compiler.get_member_name(blockType.self, i); pushConstants.names[offset] = interfaceBlock.name + "." + compiler.get_member_name(blockType.self, i);
pushConstants.sizes[offset] = memberType.vecsize * memberType.columns; pushConstants.sizes[offset] = size;
pushConstants.types[offset] = constantType; pushConstants.types[offset] = constantType;
} }
} }