Making sure resources are packed properly

HoneybunchBuilder · Sep 1, 2024 · 58a9061 · 58a9061
1 parent d3f3d1f
commit 58a9061
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 26 deletions.
diff --git a/addons/water/include/tb_ocean.slangh b/addons/water/include/tb_ocean.slangh
@@ -7,11 +7,11 @@
 // To avoid struct packing issues
 typedef float4 TbOceanWave; // xy = dir, z = steep, w = wavelength
 
-TB_GPU_STRUCT_DECL(TbOceanData, { float4 time_waves; // x = time, y = wave count
-  TbOceanWave wave[TB_WAVE_MAX];});
-
-
-  TB_GPU_STRUCT_DECL(TbOceanPushConstants, {
+TB_GPU_STRUCT_DECL_NOPACK(TbOceanData, {
+   float4 time_waves; // x = time, y = wave count
+  TbOceanWave wave[TB_WAVE_MAX];
+});
+TB_GPU_STRUCT_DECL(TbOceanPushConstants, {
   float4x4 m;
 });
 

diff --git a/include/tb_common.slangh b/include/tb_common.slangh
@@ -16,19 +16,20 @@
 
 #ifdef TB_SHADER
 #define _TB_GPU_STRUCT_START struct
-#else
-#define _TB_GPU_STRUCT_START typedef struct TB_GPU_STRUCT
-#endif
-
-#ifdef TB_SHADER
+#define _TB_GPU_STRUCT_START_NOPACK struct
 #define _TB_GPU_STRUCT_END(name)
 #else
+#define _TB_GPU_STRUCT_START typedef struct TB_GPU_STRUCT
+#define _TB_GPU_STRUCT_START_NOPACK typedef struct
 #define _TB_GPU_STRUCT_END(name) name
 #endif
 
 #define TB_GPU_STRUCT_DECL(name, body)                                         \
   _TB_GPU_STRUCT_START name body _TB_GPU_STRUCT_END(name)
 
+#define TB_GPU_STRUCT_DECL_NOPACK(name, body)                                   \
+  _TB_GPU_STRUCT_START_NOPACK name body _TB_GPU_STRUCT_END(name)
+
 TB_GPU_STRUCT_DECL(TbCommonObjectData, {float4x4 m;});
 
 // Common input layout info and permutation settings

diff --git a/include/tb_gltf.slangh b/include/tb_gltf.slangh
@@ -94,7 +94,7 @@ float2 uv_transform(int2 quant_uv, TextureTransform trans) {
   [[vk::binding(1, b)]] TextureCube irradiance_map;                            \
   [[vk::binding(2, b)]] TextureCube prefiltered_map;                           \
   [[vk::binding(3, b)]] Texture2D brdf_lut;                                    \
-  [[vk::binding(4, b)]] ConstantBuffer<TbCommonLightData> light_data;          \
+  [[vk::binding(4, b)]] ConstantBuffer<TbLightData> light_data;          \
   [[vk::binding(5, b)]] Texture2DArray shadow_map;                             \
   [[vk::binding(6, b)]] SamplerState filtered_env_sampler;                     \
   [[vk::binding(7, b)]] SamplerState brdf_sampler;

diff --git a/include/tb_lighting.slangh b/include/tb_lighting.slangh
@@ -2,7 +2,7 @@
 
 #include "tb_pbr.slangh"
 
-TB_GPU_STRUCT_DECL(TbCommonLightData,{
+TB_GPU_STRUCT_DECL_NOPACK(TbLightData,{
   float3 color;
   float3 light_dir;
   float4 cascade_splits;
@@ -20,7 +20,7 @@ struct TbView {
 };
 
 struct Light {
-  TbCommonLightData light;
+  TbLightData light;
   Texture2DArray shadow_map;
   SamplerComparisonState shadow_sampler;
 };

diff --git a/include/tb_sky.slangh b/include/tb_sky.slangh
@@ -18,7 +18,10 @@ _Static_assert(sizeof(TbSkyPushConstants) <= TB_PUSH_CONSTANT_BYTES,
                "Too Many Push Constants");
 #endif
 
-TB_GPU_STRUCT_DECL(TbSkyData, {
+// HACK
+// If we pack this it won't work with the ocean
+// Unintuitive and shitty
+TB_GPU_STRUCT_DECL_NOPACK(TbSkyData, {
   float time;
   float cirrus;
   float cumulus;

diff --git a/include/tb_view.slangh b/include/tb_view.slangh
@@ -2,7 +2,7 @@
 
 #include "tb_common.slangh"
 
-TB_GPU_STRUCT_DECL(TbViewData, {
+TB_GPU_STRUCT_DECL_NOPACK(TbViewData, {
   float4x4 v;
   float4x4 p;
   float4x4 vp;

diff --git a/include/tb_view_system.h b/include/tb_view_system.h
@@ -36,7 +36,7 @@ typedef struct TbViewSystemFrameState {
 typedef struct TbView {
   TbRenderTargetId target;
   TbViewData view_data;
-  TbCommonLightData light_data;
+  TbLightData light_data;
   TbFrustum frustum;
   TbDescriptorBuffer desc_buffer;
 } TbView;
@@ -65,7 +65,7 @@ void tb_view_system_set_view_target(TbViewSystem *self, TbViewId view,
 void tb_view_system_set_view_data(TbViewSystem *self, TbViewId view,
                                   const TbViewData *data);
 void tb_view_system_set_light_data(TbViewSystem *self, TbViewId view,
-                                   const TbCommonLightData *data);
+                                   const TbLightData *data);
 void tb_view_system_set_view_frustum(TbViewSystem *self, TbViewId view,
                                      const TbFrustum *frust);
 VkDescriptorSet tb_view_system_get_descriptor(TbViewSystem *self,

diff --git a/source/tb_light_system.c b/source/tb_light_system.c
@@ -34,7 +34,7 @@ void light_update_tick(ecs_iter_t *it) {
         float3 dir = -tb_transform_get_forward(&transform->transform);
 
         // Send lighting data to the camera's view
-        TbCommonLightData light_data = {
+        TbLightData light_data = {
             .color = light->color,
             .light_dir = dir,
             .cascade_splits = light->cascade_splits,

diff --git a/source/tb_view_system.c b/source/tb_view_system.c
@@ -257,7 +257,7 @@ void view_update_tick(ecs_iter_t *it) {
     TB_DYN_ARR_FOREACH(sys->views, view_idx) {
       const TbView *view = &TB_DYN_ARR_AT(sys->views, view_idx);
       const TbViewData *view_data = &view->view_data;
-      const TbCommonLightData *light_data = &view->light_data;
+      const TbLightData *light_data = &view->light_data;
 
       tb_auto tmp_addr = tb_rnd_get_gpu_tmp_addr(rnd_sys);
 
@@ -266,7 +266,7 @@ void view_update_tick(ecs_iter_t *it) {
       tb_rnd_sys_copy_to_tmp_buffer(rnd_sys, sizeof(TbViewData), 0x40,
                                     view_data, &view_offset);
       uint64_t light_offset = 0;
-      tb_rnd_sys_copy_to_tmp_buffer(rnd_sys, sizeof(TbCommonLightData), 0x40,
+      tb_rnd_sys_copy_to_tmp_buffer(rnd_sys, sizeof(TbLightData), 0x40,
                                     light_data, &light_offset);
 
       TB_DYN_ARR_OF(TbDescriptor) descriptors = {0};
@@ -336,7 +336,7 @@ void view_update_tick(ecs_iter_t *it) {
                   .pUniformBuffer = &(VkDescriptorAddressInfoEXT){
                       .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_ADDRESS_INFO_EXT,
                       .address = tmp_addr + light_offset,
-                      .range = sizeof(TbCommonLightData),
+                      .range = sizeof(TbLightData),
                   }}}));
 
       // Write all descriptors to buffer
@@ -418,16 +418,16 @@ void view_update_tick(ecs_iter_t *it) {
   TB_DYN_ARR_FOREACH(sys->views, view_idx) {
     const TbView *view = &TB_DYN_ARR_AT(sys->views, view_idx);
     const TbViewData *view_data = &view->view_data;
-    const TbCommonLightData *light_data = &view->light_data;
+    const TbLightData *light_data = &view->light_data;
 
     // Write view data into the tmp buffer we know will wind up on the GPU
     uint64_t view_offset = 0;
     err = tb_rnd_sys_copy_to_tmp_buffer(rnd_sys, sizeof(TbViewData), 0x40,
                                         view_data, &view_offset);
     TB_VK_CHECK(err, "Failed to make tmp host buffer allocation for view");
     uint64_t light_offset = 0;
-    err = tb_rnd_sys_copy_to_tmp_buffer(rnd_sys, sizeof(TbCommonLightData),
-                                        0x40, light_data, &light_offset);
+    err = tb_rnd_sys_copy_to_tmp_buffer(rnd_sys, sizeof(TbLightData), 0x40,
+                                        light_data, &light_offset);
     TB_VK_CHECK(err, "Failed to make tmp host buffer allocation for view");
 
     uint32_t buffer_idx = view_idx * buf_count;
@@ -445,7 +445,7 @@ void view_update_tick(ecs_iter_t *it) {
     buffer_info[buffer_idx + 1] = (VkDescriptorBufferInfo){
         .buffer = tmp_gpu_buffer,
         .offset = light_offset,
-        .range = sizeof(TbCommonLightData),
+        .range = sizeof(TbLightData),
     };
 
     image_info[image_idx + 0] = (VkDescriptorImageInfo){
@@ -599,7 +599,7 @@ void tb_view_system_set_view_data(TbViewSystem *self, TbViewId view,
 }
 
 void tb_view_system_set_light_data(TbViewSystem *self, TbViewId view,
-                                   const TbCommonLightData *data) {
+                                   const TbLightData *data) {
   if (view >= TB_DYN_ARR_SIZE(self->views)) {
     TB_CHECK(false, "TbView Id out of range");
   }