Do not override alignment for reference C builds

solidpixel · solidpixel · commit cef5102dbd02 · 2023-12-09T20:50:50.000Z
diff --git a/Source/astcenc_entry.cpp b/Source/astcenc_entry.cpp
@@ -712,7 +712,7 @@ astcenc_error astcenc_context_alloc(
 
 		size_t worksize = sizeof(compression_working_buffers) * thread_count;
 		ctx->working_buffers = aligned_malloc<compression_working_buffers>(worksize, ASTCENC_VECALIGN);
-		static_assert((sizeof(compression_working_buffers) % ASTCENC_VECALIGN) == 0,
+		static_assert((ASTCENC_VECALIGN == 0) || ((sizeof(compression_working_buffers) % ASTCENC_VECALIGN) == 0),
 		              "compression_working_buffers size must be multiple of vector alignment");
 		if (!ctx->working_buffers)
 		{
diff --git a/Source/astcenc_mathlib.h b/Source/astcenc_mathlib.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // ----------------------------------------------------------------------------
-// Copyright 2011-2021 Arm Limited
+// Copyright 2011-2023 Arm Limited
 //
 // Licensed under the Apache License, Version 2.0 (the "License"); you may not
 // use this file except in compliance with the License. You may obtain a copy
@@ -73,10 +73,14 @@
   #endif
 #endif
 
+// Force vector-sized SIMD alignment
 #if ASTCENC_AVX
   #define ASTCENC_VECALIGN 32
-#else
+#elif ASTCENC_SSE || ASTCENC_NEON
   #define ASTCENC_VECALIGN 16
+// Use default alignment for non-SIMD builds
+#else
+  #define ASTCENC_VECALIGN 0
 #endif
 
 #if ASTCENC_SSE != 0 || ASTCENC_AVX != 0 || ASTCENC_POPCNT != 0

Original file line number	Diff line number	Diff line change
`@@ -712,7 +712,7 @@ astcenc_error astcenc_context_alloc(`
`712`	`712`
`713`	`713`	`size_t worksize = sizeof(compression_working_buffers) * thread_count;`
`714`	`714`	`ctx->working_buffers = aligned_malloc<compression_working_buffers>(worksize, ASTCENC_VECALIGN);`
`715`		`- static_assert((sizeof(compression_working_buffers) % ASTCENC_VECALIGN) == 0,`
	`715`	`+ static_assert((ASTCENC_VECALIGN == 0) \|\| ((sizeof(compression_working_buffers) % ASTCENC_VECALIGN) == 0),`
`716`	`716`	`"compression_working_buffers size must be multiple of vector alignment");`
`717`	`717`	`if (!ctx->working_buffers)`
`718`	`718`	`{`