Skip to content

Commit

Permalink
build: Don't fail for 32 bit builds because of static_assert check (A…
Browse files Browse the repository at this point in the history
…cademySoftwareFoundation#4006)

A static_assert was added recently as part of PR AcademySoftwareFoundation#3898, which assures
that the size of a TileID is a multiple of 8 bytes. But on architectures
with 32 bit pointers, this assertion fails. Which is not quite what we
want, because the code isn't wrong if the struct isn't a multiple of 8
bytes; it's just less efficient. And we don't want to fail for 32 bit
arch.

Bottom line: only do this check to ensure we're in the most efficient
case if we're 64 bits. Nobody's expecting highest performance on a 32
bit machine anyway.

Fixes AcademySoftwareFoundation#4001

Signed-off-by: Larry Gritz <[email protected]>
  • Loading branch information
lgritz committed Oct 7, 2023
1 parent 82a4f9a commit 5a1292c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/libtexture/imagecache_pvt.h
Original file line number Diff line number Diff line change
Expand Up @@ -567,9 +567,11 @@ struct TileID {
static_assert(
sizeof(*this) == member_size,
"All TileID members must be accounted for so we can hash the entire class.");
#ifdef __LP64__
static_assert(
sizeof(*this) % sizeof(uint64_t) == 0,
"FastHash uses the fewest instructions when data size is a multiple of 8 bytes.");
#endif
return fasthash::fasthash64(this, sizeof(*this));
}

Expand Down

0 comments on commit 5a1292c

Please sign in to comment.