Fix min base alignment (#2075)

Fixes #2073 * Added a test
KhronosGroup · Nov 16, 2018 · 28d8d7b · 28d8d7b
1 parent d7cd120
commit 28d8d7b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/source/val/validate_decorations.cpp b/source/val/validate_decorations.cpp
@@ -156,7 +156,8 @@ uint32_t getBaseAlignment(uint32_t member_id, bool roundUp,
                           ValidationState_t& vstate) {
   const auto inst = vstate.FindDef(member_id);
   const auto& words = inst->words();
-  uint32_t baseAlignment = 0;
+  // Minimal alignment is byte-aligned.
+  uint32_t baseAlignment = 1;
   switch (inst->opcode()) {
     case SpvOpTypeInt:
     case SpvOpTypeFloat:

diff --git a/test/val/val_decoration_test.cpp b/test/val/val_decoration_test.cpp
@@ -3391,6 +3391,34 @@ OpMemberDecorate %outer 0 Offset 0
                 "rules: member 1 at offset 1 is not aligned to 4"));
 }
 
+TEST_F(ValidateDecorations, EmptyStructAtNonZeroOffsetGood) {
+  const std::string spirv = R"(
+OpCapability Shader
+OpMemoryModel Logical GLSL450
+OpEntryPoint GLCompute %main "main"
+OpExecutionMode %main LocalSize 1 1 1
+OpDecorate %struct Block
+OpMemberDecorate %struct 0 Offset 0
+OpMemberDecorate %struct 1 Offset 16
+OpDecorate %var DescriptorSet 0
+OpDecorate %var Binding 0
+%void = OpTypeVoid
+%float = OpTypeFloat 32
+%empty = OpTypeStruct
+%struct = OpTypeStruct %float %empty
+%ptr_struct_ubo = OpTypePointer Uniform %struct
+%var = OpVariable %ptr_struct_ubo Uniform
+%voidfn = OpTypeFunction %void
+%main = OpFunction %void None %voidfn
+%entry = OpLabel
+OpReturn
+OpFunctionEnd
+)";
+
+  CompileSuccessfully(spirv);
+  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions());
+}
+
 }  // namespace
 }  // namespace val
 }  // namespace spvtools