Drop kFirstMemberAlignment from DawnInstanceDescriptor
The alignment is only needed for C++ structs that have an analogous
C counterpart so that their layout is identical.
This struct is not in the C API.
Bug: none
Change-Id: I6ec5dd4ecb559be0eb906d6252eba3daf037b0e3
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/149326
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Auto-Submit: Austin Eng <enga@chromium.org>
diff --git a/generator/templates/api_cpp.h b/generator/templates/api_cpp.h
index 2239cf8..a77e297 100644
--- a/generator/templates/api_cpp.h
+++ b/generator/templates/api_cpp.h
@@ -31,6 +31,12 @@
namespace {{metadata.namespace}} {
+ namespace detail {
+ constexpr size_t ConstexprMax(size_t a, size_t b) {
+ return a > b ? a : b;
+ }
+ } // namespace detail
+
{% set c_prefix = metadata.c_prefix %}
{% for constant in by_category["constant"] %}
{% set type = as_cppType(constant.type.name) %}
diff --git a/generator/templates/api_cpp_chained_struct.h b/generator/templates/api_cpp_chained_struct.h
index 8c0af4a..b1e6e77 100644
--- a/generator/templates/api_cpp_chained_struct.h
+++ b/generator/templates/api_cpp_chained_struct.h
@@ -28,12 +28,6 @@
// which exposes capabilities that may require correctly set proc tables.
namespace {{metadata.namespace}} {
- namespace detail {
- constexpr size_t ConstexprMax(size_t a, size_t b) {
- return a > b ? a : b;
- }
- } // namespace detail
-
enum class SType : uint32_t;
struct ChainedStruct {
diff --git a/include/dawn/native/DawnNative.h b/include/dawn/native/DawnNative.h
index 4b27eb8..83f75f4 100644
--- a/include/dawn/native/DawnNative.h
+++ b/include/dawn/native/DawnNative.h
@@ -133,9 +133,7 @@
// Can be chained in InstanceDescriptor
struct DAWN_NATIVE_EXPORT DawnInstanceDescriptor : wgpu::ChainedStruct {
DawnInstanceDescriptor();
- static constexpr size_t kFirstMemberAlignment =
- wgpu::detail::ConstexprMax(alignof(wgpu::ChainedStruct), alignof(uint32_t));
- alignas(kFirstMemberAlignment) uint32_t additionalRuntimeSearchPathsCount = 0;
+ uint32_t additionalRuntimeSearchPathsCount = 0;
const char* const* additionalRuntimeSearchPaths;
dawn::platform::Platform* platform = nullptr;
