From 9e7d37a9eaeca36c0c1d2f54098fec082872d76d Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Tue, 15 Mar 2022 21:51:30 -0700
Subject: [PATCH] gpu: cleanup RenderPassEncoder

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 gpu/src/NativeInstance.zig    | 10 +++++-----
 gpu/src/RenderPassEncoder.zig |  7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/gpu/src/NativeInstance.zig b/gpu/src/NativeInstance.zig
index aa23f9c9..266bf649 100644
--- a/gpu/src/NativeInstance.zig
+++ b/gpu/src/NativeInstance.zig
@@ -883,11 +883,6 @@ const render_pass_encoder_vtable = RenderPassEncoder.VTable{
             c.wgpuRenderPassEncoderRelease(@ptrCast(c.WGPURenderPassEncoder, ptr));
         }
     }).release,
-    .end = (struct {
-        pub fn end(ptr: *anyopaque) void {
-            c.wgpuRenderPassEncoderEnd(@ptrCast(c.WGPURenderPassEncoder, ptr));
-        }
-    }).end,
     .setLabel = (struct {
         pub fn setLabel(ptr: *anyopaque, label: [:0]const u8) void {
             c.wgpuRenderPassEncoderSetLabel(@ptrCast(c.WGPURenderPassEncoder, ptr), label);
@@ -945,6 +940,11 @@ const render_pass_encoder_vtable = RenderPassEncoder.VTable{
             c.wgpuRenderPassEncoderBeginOcclusionQuery(@ptrCast(c.WGPURenderPassEncoder, ptr), query_index);
         }
     }).beginOcclusionQuery,
+    .end = (struct {
+        pub fn end(ptr: *anyopaque) void {
+            c.wgpuRenderPassEncoderEnd(@ptrCast(c.WGPURenderPassEncoder, ptr));
+        }
+    }).end,
 };
 
 fn wrapRenderBundleEncoder(enc: c.WGPURenderBundleEncoder) RenderBundleEncoder {
diff --git a/gpu/src/RenderPassEncoder.zig b/gpu/src/RenderPassEncoder.zig
index 2efce173..bd9ee49d 100644
--- a/gpu/src/RenderPassEncoder.zig
+++ b/gpu/src/RenderPassEncoder.zig
@@ -15,7 +15,6 @@ vtable: *const VTable,
 pub const VTable = struct {
     reference: fn (ptr: *anyopaque) void,
     release: fn (ptr: *anyopaque) void,
-    beginOcclusionQuery: fn (ptr: *anyopaque, query_index: u32) void,
     draw: fn (ptr: *anyopaque, vertex_count: u32, instance_count: u32, first_vertex: u32, first_instance: u32) void,
     drawIndexed: fn (
         ptr: *anyopaque,
@@ -27,6 +26,7 @@ pub const VTable = struct {
     ) void,
     drawIndexedIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void,
     drawIndirect: fn (ptr: *anyopaque, indirect_buffer: Buffer, indirect_offset: u64) void,
+    beginOcclusionQuery: fn (ptr: *anyopaque, query_index: u32) void,
     end: fn (ptr: *anyopaque) void,
     // WGPU_EXPORT void wgpuRenderPassEncoderEndOcclusionQuery(WGPURenderPassEncoder renderPassEncoder);
     // WGPU_EXPORT void wgpuRenderPassEncoderEndPass(WGPURenderPassEncoder renderPassEncoder);
@@ -113,6 +113,11 @@ test "syntax" {
     _ = reference;
     _ = release;
     _ = draw;
+    _ = drawIndexed;
+    _ = drawIndexedIndirect;
+    _ = drawIndirect;
+    _ = beginOcclusionQuery;
+    _ = end;
     _ = setLabel;
     _ = setPipeline;
     _ = Descriptor;