encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-17 08:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add src/utils/math.h

Browse Source 
Move the RoundUp() and IsPowerOfTwo() methods from Resolver.cc to this file.

Add tests

Change-Id: Ib7af53dfa5e69083ec4fc2484da92a84c9468818
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/44682
Auto-Submit: Ben Clayton <bclayton@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
Ben Clayton
2021-03-15 13:37:41 +00:00
committed by Commit Bot service account
parent d614dd5d12
commit a75205265e
5 changed files with 114 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/resolver/resolver.cc
View File

@@ -38,6 +38,7 @@
#include "src/semantic/struct.h"
#include "src/semantic/variable.h"
#include "src/type/access_control_type.h"
#include "src/utils/math.h"
namespace tint {
namespace resolver {
@@ -62,20 +63,6 @@ class ScopedAssignment {
T old_value_;
};
/// Rounds `value` to the next multiple of `alignment`
/// Assumes `alignment` is positive.
template <typename T>
T RoundUp(T alignment, T value) {
return ((value + alignment - 1) / alignment) * alignment;
}
/// Returns true if `value` is a power-of-two.
/// Assumes `alignment` is positive.
template <typename T>
bool IsPowerOfTwo(T value) {
return (value & (value - 1)) == 0;
}
} // namespace
Resolver::Resolver(ProgramBuilder* builder)
@@ -1126,7 +1113,7 @@ const semantic::Array* Resolver::Array(type::Array* arr) {
return nullptr;
}
return create_semantic(RoundUp(el_align, el_size));
return create_semantic(utils::RoundUp(el_align, el_size));
}
const semantic::Struct* Resolver::Structure(type::Struct* str) {
@@ -1179,7 +1166,7 @@ const semantic::Struct* Resolver::Structure(type::Struct* str) {
offset = o->offset();
align = 1;
} else if (auto* a = deco->As<ast::StructMemberAlignDecoration>()) {
if (a->align() <= 0 || !IsPowerOfTwo(a->align())) {
if (a->align() <= 0 || !utils::IsPowerOfTwo(a->align())) {
diagnostics_.add_error(
"align value must be a positive, power-of-two integer",
a->source());
@@ -1198,7 +1185,7 @@ const semantic::Struct* Resolver::Structure(type::Struct* str) {
}
}
offset = RoundUp(align, offset);
offset = utils::RoundUp(align, offset);
auto* sem_member =
builder_->create<semantic::StructMember>(member, offset, size);
@@ -1209,7 +1196,7 @@ const semantic::Struct* Resolver::Structure(type::Struct* str) {
struct_align = std::max(struct_align, align);
}
struct_size = RoundUp(struct_align, struct_size);
struct_size = utils::RoundUp(struct_align, struct_size);
auto* sem = builder_->create<semantic::Struct>(str, std::move(sem_members),
struct_align, struct_size);