From 7a79846b1b203d1bc0d382dd717d7469ccdeab00 Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Thu, 8 Oct 2020 13:09:41 +0200
Subject: [PATCH] Update to new opaque syntax

---
 generator/vulkan/parse.zig    |  2 +-
 generator/vulkan/registry.zig |  2 +-
 generator/vulkan/render.zig   | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/generator/vulkan/parse.zig b/generator/vulkan/parse.zig
index 488cd8f..9e88ffc 100644
--- a/generator/vulkan/parse.zig
+++ b/generator/vulkan/parse.zig
@@ -152,7 +152,7 @@ fn parseBaseType(allocator: *Allocator, ty: *xml.Element) !registry.Declaration
         // macros, which is why this part is not built into the xml/c parser.
         return registry.Declaration{
             .name = name,
-            .decl_type = .{.opaque = {}},
+            .decl_type = .{.external = {}},
         };
     }
 }
diff --git a/generator/vulkan/registry.zig b/generator/vulkan/registry.zig
index c2600ef..b65d89c 100644
--- a/generator/vulkan/registry.zig
+++ b/generator/vulkan/registry.zig
@@ -21,7 +21,7 @@ pub const DeclarationType = union(enum) {
     alias: Alias,
     foreign: Foreign,
     typedef: TypeInfo,
-    opaque,
+    external,
 };
 
 pub const Alias = struct {
diff --git a/generator/vulkan/render.zig b/generator/vulkan/render.zig
index f59c13a..eab273b 100644
--- a/generator/vulkan/render.zig
+++ b/generator/vulkan/render.zig
@@ -81,20 +81,20 @@ const builtin_types = std.ComptimeStringMap([]const u8, .{
 });
 
 const foreign_types = std.ComptimeStringMap([]const u8, .{
-    .{"Display", "@Type(.Opaque)"},
+    .{"Display", "opaque {}"},
     .{"VisualID", @typeName(c_uint)},
     .{"Window", @typeName(c_ulong)},
     .{"RROutput", @typeName(c_ulong)},
-    .{"wl_display", "@Type(.Opaque)"},
-    .{"wl_surface", "@Type(.Opaque)"},
+    .{"wl_display", "opaque {}"},
+    .{"wl_surface", "opaque {}"},
     .{"HINSTANCE", "std.os.HINSTANCE"},
-    .{"HWND", "*@Type(.Opaque)"},
-    .{"HMONITOR", "*@Type(.Opaque)"},
+    .{"HWND", "*opaque {}"},
+    .{"HMONITOR", "*opaque {}"},
     .{"HANDLE", "std.os.HANDLE"},
     .{"SECURITY_ATTRIBUTES", "std.os.SECURITY_ATTRIBUTES"},
     .{"DWORD", "std.os.DWORD"},
     .{"LPCWSTR", "std.os.LPCWSTR"},
-    .{"xcb_connection_t", "@Type(.Opaque)"},
+    .{"xcb_connection_t", "opaque {}"},
     .{"xcb_visualid_t", @typeName(u32)},
     .{"xcb_window_t", @typeName(u32)},
     .{"zx_handle_t", @typeName(u32)},
@@ -536,7 +536,7 @@ fn Renderer(comptime WriterType: type) type {
                 .alias => |alias| try self.renderAlias(decl.name, alias),
                 .foreign => |foreign| try self.renderForeign(decl.name, foreign),
                 .typedef => |type_info| try self.renderTypedef(decl.name, type_info),
-                .opaque => try self.renderOpaque(decl.name),
+                .external => try self.renderExternal(decl.name),
             }
         }
 
@@ -711,10 +711,10 @@ fn Renderer(comptime WriterType: type) type {
             try self.writer.writeAll(";\n");
         }
 
-        fn renderOpaque(self: *Self, name: []const u8) !void {
+        fn renderExternal(self: *Self, name: []const u8) !void {
             try self.writer.writeAll("pub const ");
             try self.renderName(name);
-            try self.writer.writeAll(" = @Type(.Opaque);\n");
+            try self.writer.writeAll(" = opaque {};\n");
         }
 
         fn renderForeign(self: *Self, name: []const u8, foreign: reg.Foreign) !void {