virtio-gpu-gfxstream-renderer.h: remove static asserts am: db375c9d21 am: ed80860788 am: 757e88a4f1

Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2537071

Change-Id: Idbd4cbc05a90b9c8045032019213b0275ee5548c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 35 insertions, 36 deletions

diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
index 82328e8d..5c9d500e 100644
--- a/stream-servers/virtio-gpu-gfxstream-renderer.cpp
+++ b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
@@ -2509,4 +2509,39 @@ void virtio_goldfish_pipe_reset(void* pipe, void* host_pipe) {
     sRenderer()->resetPipe((GoldfishHwPipe*)pipe, (GoldfishHostPipe*)host_pipe);
 }
 
+static_assert(sizeof(struct stream_renderer_device_id) == 32,
+              "stream_renderer_device_id must be 32 bytes");
+static_assert(offsetof(struct stream_renderer_device_id, device_uuid) == 0,
+              "stream_renderer_device_id.device_uuid must be at offset 0");
+static_assert(offsetof(struct stream_renderer_device_id, driver_uuid) == 16,
+              "stream_renderer_device_id.driver_uuid must be at offset 16");
+
+static_assert(sizeof(struct stream_renderer_vulkan_info) == 36,
+              "stream_renderer_vulkan_info must be 36 bytes");
+static_assert(offsetof(struct stream_renderer_vulkan_info, memory_index) == 0,
+              "stream_renderer_vulkan_info.memory_index must be at offset 0");
+static_assert(offsetof(struct stream_renderer_vulkan_info, device_id) == 4,
+              "stream_renderer_vulkan_info.device_id must be at offset 4");
+
+static_assert(sizeof(struct stream_renderer_param_host_visible_memory_mask_entry) == 36,
+              "stream_renderer_param_host_visible_memory_mask_entry must be 36 bytes");
+static_assert(offsetof(struct stream_renderer_param_host_visible_memory_mask_entry, device_id) == 0,
+              "stream_renderer_param_host_visible_memory_mask_entry.device_id must be at offset 0");
+static_assert(
+    offsetof(struct stream_renderer_param_host_visible_memory_mask_entry, memory_type_mask) == 32,
+    "stream_renderer_param_host_visible_memory_mask_entry.memory_type_mask must be at offset 32");
+
+static_assert(sizeof(struct stream_renderer_param_host_visible_memory_mask) == 16,
+              "stream_renderer_param_host_visible_memory_mask must be 16 bytes");
+static_assert(offsetof(struct stream_renderer_param_host_visible_memory_mask, entries) == 0,
+              "stream_renderer_param_host_visible_memory_mask.entries must be at offset 0");
+static_assert(offsetof(struct stream_renderer_param_host_visible_memory_mask, num_entries) == 8,
+              "stream_renderer_param_host_visible_memory_mask.num_entries must be at offset 8");
+
+static_assert(sizeof(struct stream_renderer_param) == 16, "stream_renderer_param must be 16 bytes");
+static_assert(offsetof(struct stream_renderer_param, key) == 0,
+              "stream_renderer_param.key must be at offset 0");
+static_assert(offsetof(struct stream_renderer_param, value) == 8,
+              "stream_renderer_param.value must be at offset 8");
+
 }  // extern "C"
diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.h b/stream-servers/virtio-gpu-gfxstream-renderer.h
index f59ab85b..2afc0448 100644
--- a/stream-servers/virtio-gpu-gfxstream-renderer.h
+++ b/stream-servers/virtio-gpu-gfxstream-renderer.h
@@ -5,7 +5,6 @@
  * implement an actual virtio goldfish pipe, but this hijacking of virgl  is
  * done in order to avoid any guest kernel changes. */
 
-#include <assert.h>
 #include <stddef.h>
 
 #include "virgl_hw.h"
@@ -149,25 +148,11 @@ struct stream_renderer_device_id {
     uint8_t driver_uuid[16];
 };
 
-static_assert(sizeof(stream_renderer_device_id) == 32,
-              "stream_renderer_device_id must be 32 bytes");
-static_assert(offsetof(stream_renderer_device_id, device_uuid) == 0,
-              "stream_renderer_device_id.device_uuid must be at offset 0");
-static_assert(offsetof(stream_renderer_device_id, driver_uuid) == 16,
-              "stream_renderer_device_id.driver_uuid must be at offset 16");
-
 struct stream_renderer_vulkan_info {
     uint32_t memory_index;
     struct stream_renderer_device_id device_id;
 };
 
-static_assert(sizeof(stream_renderer_vulkan_info) == 36,
-              "stream_renderer_vulkan_info must be 36 bytes");
-static_assert(offsetof(stream_renderer_vulkan_info, memory_index) == 0,
-              "stream_renderer_vulkan_info.memory_index must be at offset 0");
-static_assert(offsetof(stream_renderer_vulkan_info, device_id) == 4,
-              "stream_renderer_vulkan_info.device_id must be at offset 4");
-
 VG_EXPORT int stream_renderer_vulkan_info(uint32_t res_handle,
                                           struct stream_renderer_vulkan_info* vulkan_info);
 
@@ -216,14 +201,6 @@ struct stream_renderer_param_host_visible_memory_mask_entry {
     uint32_t memory_type_mask;
 };
 
-static_assert(sizeof(stream_renderer_param_host_visible_memory_mask_entry) == 36,
-              "stream_renderer_param_host_visible_memory_mask_entry must be 36 bytes");
-static_assert(offsetof(stream_renderer_param_host_visible_memory_mask_entry, device_id) == 0,
-              "stream_renderer_param_host_visible_memory_mask_entry.device_id must be at offset 0");
-static_assert(
-    offsetof(stream_renderer_param_host_visible_memory_mask_entry, memory_type_mask) == 32,
-    "stream_renderer_param_host_visible_memory_mask_entry.memory_type_mask must be at offset 32");
-
 // Information about the devices in the system with host visible memory type constraints.
 struct stream_renderer_param_host_visible_memory_mask {
     // Points to a stream_renderer_param_host_visible_memory_mask_entry array.
@@ -232,13 +209,6 @@ struct stream_renderer_param_host_visible_memory_mask {
     uint64_t num_entries;
 };
 
-static_assert(sizeof(stream_renderer_param_host_visible_memory_mask) == 16,
-              "stream_renderer_param_host_visible_memory_mask must be 16 bytes");
-static_assert(offsetof(stream_renderer_param_host_visible_memory_mask, entries) == 0,
-              "stream_renderer_param_host_visible_memory_mask.entries must be at offset 0");
-static_assert(offsetof(stream_renderer_param_host_visible_memory_mask, num_entries) == 8,
-              "stream_renderer_param_host_visible_memory_mask.num_entries must be at offset 8");
-
 // Enables the host to control which GPU is used for rendering.
 #define STREAM_RENDERER_PARAM_RENDERING_GPU 9
 
@@ -276,12 +246,6 @@ struct stream_renderer_param {
     uint64_t value;
 };
 
-static_assert(sizeof(stream_renderer_param) == 16, "stream_renderer_param must be 16 bytes");
-static_assert(offsetof(stream_renderer_param, key) == 0,
-              "stream_renderer_param.key must be at offset 0");
-static_assert(offsetof(stream_renderer_param, value) == 8,
-              "stream_renderer_param.value must be at offset 8");
-
 // Entry point for the stream renderer.
 // Pass a list of parameters to configure the renderer. The available ones are listed above. If a
 // parameter is not supported, the renderer will ignore it and warn in stderr.