binning + rasterization fixed, first disc rendered!

Author: Geolm

lib/binning.h

@@ -3,7 +3,7 @@
 
 #include <stddef.h>
 
-static const size_t binning_shader_size = 26059;
+static const size_t binning_shader_size = 26020;
 static const char binning_shader[] =
     "// ---------------------------------------------------------------------------------------------------------------------------\n"
     "// Structures\n"
@@ -773,8 +773,7 @@ static const char binning_shader[] =
     "        }\n"
     "\n"
     "        // 3. Fine-grained intersection test\n"
-    "        //let to_be_added = intersection_tile_command(tile_aabb, cmd, g_draw_args.aa_width + aabb_margin);\n"
-    "        let to_be_added:bool = true;\n"
+    "        let to_be_added = intersection_tile_command(tile_aabb, cmd, g_draw_args.aa_width + aabb_margin);\n"
     "\n"
     "        // we traverse in reverse order, so the end comes first\n"
     "        if (cmd_type == BEGIN_GROUP) \n"

lib/onedraw.c

@@ -432,14 +432,8 @@ static inline gpu_draw_command gpu_draw_command_make(uint32_t data_index, uint8_
                                                      enum primitive_fillmode fillmode, enum command_type type)
 {
     gpu_draw_command cmd;
-
     cmd.data_index = data_index;
-    cmd.flags =
-          (uint32_t)extra
-        | ((uint32_t)clip_index << 8)
-        | ((uint32_t)fillmode   << 16)
-        | ((uint32_t)type       << 24);
-
+    cmd.flags = (uint32_t)extra | ((uint32_t)clip_index << 8) | ((uint32_t)fillmode << 16) | ((uint32_t)type << 24);
     return cmd;
 }
 
@@ -478,7 +472,7 @@ static inline void merge_quantized_aabb(quantized_aabb* merge, const quantized_a
         uint32_t m = *merge;
         uint32_t o = *other;
 
-        uint32_t min_x = OD_MIN(m & 0xFFu,        o & 0xFFu);
+        uint32_t min_x = OD_MIN(m & 0xFFu, o & 0xFFu);
         uint32_t min_y = OD_MIN((m >> 8) & 0xFFu, (o >> 8) & 0xFFu);
         uint32_t max_x = OD_MAX((m >> 16) & 0xFFu, (o >> 16) & 0xFFu);
         uint32_t max_y = OD_MAX((m >> 24) & 0xFFu, (o >> 24) & 0xFFu);
@@ -1308,6 +1302,7 @@ void od_end_frame(struct onedraw* r, WGPUTextureView target_view)
     dynamic_buffer_upload(r->queue, &r->commands.colors, buffer_index);
     dynamic_buffer_upload(r->queue, &r->commands.float_data, buffer_index);
     dynamic_buffer_upload(r->queue, &r->commands.draw_args, buffer_index);
+    dynamic_buffer_upload(r->queue, &r->commands.list, buffer_index);
 
     WGPUCommandEncoderDescriptor encoder_desc = {0};
     WGPUCommandEncoder encoder = wgpuDeviceCreateCommandEncoder(r->device, &encoder_desc);
@@ -1317,7 +1312,8 @@ void od_end_frame(struct onedraw* r, WGPUTextureView target_view)
 
     // clear heads pass
     {
-        WGPUComputePassEncoder pass = wgpuCommandEncoderBeginComputePass(encoder, NULL);
+        WGPUComputePassDescriptor desc = {.label = WGPU_STRING_VIEW("clear_heads pass")};
+        WGPUComputePassEncoder pass = wgpuCommandEncoderBeginComputePass(encoder, &desc);
         wgpuComputePassEncoderSetPipeline(pass, r->tiles.clear_pso);
         wgpuComputePassEncoderSetBindGroup(pass, 0, r->binding.binning_bindgroup, 0, NULL);
         wgpuComputePassEncoderSetBindGroup(pass, 1, r->binding.frame_bindgroup[buffer_index], 0, NULL);
@@ -1328,7 +1324,8 @@ void od_end_frame(struct onedraw* r, WGPUTextureView target_view)
 
     // binning pass
     {
-        WGPUComputePassEncoder pass = wgpuCommandEncoderBeginComputePass(encoder, NULL);
+        WGPUComputePassDescriptor desc = {.label = WGPU_STRING_VIEW("binning pass")};
+        WGPUComputePassEncoder pass = wgpuCommandEncoderBeginComputePass(encoder, &desc);
         wgpuComputePassEncoderSetPipeline(pass, r->tiles.binning_pso);
         wgpuComputePassEncoderSetBindGroup(pass, 0, r->binding.binning_bindgroup, 0, NULL);
         wgpuComputePassEncoderSetBindGroup(pass, 1, r->binding.frame_bindgroup[buffer_index], 0, NULL);
@@ -1339,7 +1336,8 @@ void od_end_frame(struct onedraw* r, WGPUTextureView target_view)
 
     // write indirect params pass
     {
-        WGPUComputePassEncoder pass = wgpuCommandEncoderBeginComputePass(encoder, NULL);
+        WGPUComputePassDescriptor desc = {.label = WGPU_STRING_VIEW("write_indirect_params pass")};
+        WGPUComputePassEncoder pass = wgpuCommandEncoderBeginComputePass(encoder, &desc);
         wgpuComputePassEncoderSetPipeline(pass, r->tiles.write_indirect_buffer_pso);
         wgpuComputePassEncoderSetBindGroup(pass, 0, r->binding.binning_bindgroup, 0, NULL);
         wgpuComputePassEncoderSetBindGroup(pass, 1, r->binding.frame_bindgroup[buffer_index], 0, NULL);
@@ -1364,7 +1362,7 @@ void od_end_frame(struct onedraw* r, WGPUTextureView target_view)
         .colorAttachmentCount = 1,
         .colorAttachments = &color_attachment,
         .depthStencilAttachment = NULL,
-        .label = WGPU_STRING_VIEW("rasterization_pass")
+        .label = WGPU_STRING_VIEW("rasterization pass")
     };
 
 

lib/rasterizer.h

@@ -3,7 +3,7 @@
 
 #include <stddef.h>
 
-static const size_t rasterizer_shader_size = 24175;
+static const size_t rasterizer_shader_size = 24121;
 static const char rasterizer_shader[] =
     "// ---------------------------------------------------------------------------------------------------------------------------\n"
     "// Structures\n"
@@ -471,8 +471,7 @@ static const char rasterizer_shader[] =
     "fn tile_fs(in: vs_out) -> @location(0) vec4<f32> \n"
     "{\n"
     "    var output:vec4<f32> = g_draw_args.clear_color;\n"
-    "\n"
-    "    /* \n"
+    " \n"
     "    var node_idx:u32 = g_tile_heads[in.tile_index];\n"
     "    if (node_idx == INVALID_INDEX)\n"
     "    {\n"
@@ -706,8 +705,7 @@ static const char rasterizer_shader[] =
     "        output = linear_to_srgb(output);\n"
     "    }\n"
     "\n"
-    "    //return output; */\n"
-    "    return vec4<f32>(1.0, 0.0, 0.0, 1.0);\n"
+    "    return output;\n"
     "}\n"
 ;
 

src/shaders/binning.wgsl

@@ -572,8 +572,7 @@ fn tile_bin(@builtin(global_invocation_id) global_id: vec3<u32>)
         }
 
         // 3. Fine-grained intersection test
-        //let to_be_added = intersection_tile_command(tile_aabb, cmd, g_draw_args.aa_width + aabb_margin);
-        let to_be_added:bool = true;
+        let to_be_added = intersection_tile_command(tile_aabb, cmd, g_draw_args.aa_width + aabb_margin);
 
         // we traverse in reverse order, so the end comes first
         if (cmd_type == BEGIN_GROUP) 

src/shaders/rasterizer.wgsl

@@ -270,8 +270,7 @@ fn tile_vs(@builtin(instance_index) instance_id: u32, @builtin(vertex_index) ver
 fn tile_fs(in: vs_out) -> @location(0) vec4<f32> 
 {
     var output:vec4<f32> = g_draw_args.clear_color;
-
-    /* 
+ 
     var node_idx:u32 = g_tile_heads[in.tile_index];
     if (node_idx == INVALID_INDEX)
     {
@@ -505,6 +504,5 @@ fn tile_fs(in: vs_out) -> @location(0) vec4<f32>
         output = linear_to_srgb(output);
     }
 
-    //return output; */
-    return vec4<f32>(1.0, 0.0, 0.0, 1.0);
+    return output;
 }

tests/minimal.c

@@ -44,8 +44,8 @@ void frame(void)
     WGPUTextureView frame = wgpuTextureCreateView(surfaceTexture.texture, NULL);
 
     od_begin_frame(renderer);
-    od_draw_disc(renderer, 50.f, 50.f, 25.f, 0xffffffff);
-    // od_draw_text(renderer, 0, 0, "Hello world!", 0xffffffff);
+    od_draw_disc(renderer, 500.f, 500.f, 250.f, 0xffffffff);
+    //od_draw_text(renderer, 0, 0, "Hello world!", 0xffffffff);
     od_end_frame(renderer, frame);
 
     wgpuSurfacePresent(wgpu.surface);