From 6da3f85362f0aedc06ede11bce151a7bf11102ac Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 27 May 2021 13:59:15 -0700 Subject: [PATCH] RenderPass.cpp got mistakenly renamed, fix that. --- filament/CMakeLists.txt | 2 +- filament/src/{FrameGraphRenderPass.cpp => RenderPass.cpp} | 0 filament/src/RenderPass.h | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) rename filament/src/{FrameGraphRenderPass.cpp => RenderPass.cpp} (100%) diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt index f41f71a915..f2f1253e63 100644 --- a/filament/CMakeLists.txt +++ b/filament/CMakeLists.txt @@ -66,7 +66,7 @@ set(SRCS src/MaterialInstance.cpp src/MaterialParser.cpp src/PostProcessManager.cpp - src/FrameGraphRenderPass.cpp + src/RenderPass.cpp src/RenderPrimitive.cpp src/RenderTarget.cpp src/Renderer.cpp diff --git a/filament/src/FrameGraphRenderPass.cpp b/filament/src/RenderPass.cpp similarity index 100% rename from filament/src/FrameGraphRenderPass.cpp rename to filament/src/RenderPass.cpp diff --git a/filament/src/RenderPass.h b/filament/src/RenderPass.h index 39f788805d..505f1e7488 100644 --- a/filament/src/RenderPass.h +++ b/filament/src/RenderPass.h @@ -220,6 +220,8 @@ public: uint8_t reserved = {}; // 1 byte }; + static_assert(sizeof(PrimitiveInfo) == sizeof(void*) + 16); + struct alignas(8) Command { // 32 bytes CommandKey key = 0; // 8 bytes PrimitiveInfo primitive; // 24 bytes @@ -230,6 +232,9 @@ public: return ptr; } }; + + static_assert(sizeof(Command) == 32); + static_assert(std::is_trivially_destructible::value, "Command isn't trivially destructible");