metagen: simplify enum generation; reading/organization pass over raddbgi_from_pdb

src/render/d3d11/generated/render_d3d11.meta.h

@@ -13,7 +13,7 @@ R_D3D11_VShadKind_Blur,
 R_D3D11_VShadKind_Mesh,
 R_D3D11_VShadKind_Geo3DComposite,
 R_D3D11_VShadKind_Finalize,
-R_D3D11_VShadKind_COUNT
+R_D3D11_VShadKind_COUNT,
 } R_D3D11_VShadKind;
 
 typedef enum R_D3D11_PShadKind
@@ -23,7 +23,7 @@ R_D3D11_PShadKind_Blur,
 R_D3D11_PShadKind_Mesh,
 R_D3D11_PShadKind_Geo3DComposite,
 R_D3D11_PShadKind_Finalize,
-R_D3D11_PShadKind_COUNT
+R_D3D11_PShadKind_COUNT,
 } R_D3D11_PShadKind;
 
 typedef enum R_D3D11_UniformTypeKind
@@ -31,7 +31,7 @@ typedef enum R_D3D11_UniformTypeKind
 R_D3D11_UniformTypeKind_Rect,
 R_D3D11_UniformTypeKind_Blur,
 R_D3D11_UniformTypeKind_Mesh,
-R_D3D11_UniformTypeKind_COUNT
+R_D3D11_UniformTypeKind_COUNT,
 } R_D3D11_UniformTypeKind;
 
 read_only global String8 r_d3d11_g_rect_shader_src =

src/render/d3d11/render_d3d11.mdesk

@@ -462,25 +462,22 @@ ps_main(Vertex2Pixel v2p) : SV_TARGET
 ////////////////////////////////
 //~ rjf: Table Generators
 
-@table_gen_enum
-R_D3D11_VShadKind:
+@enum R_D3D11_VShadKind:
 {
-  @expand(R_D3D11_VShadTable a) `R_D3D11_VShadKind_$(a.name),`;
-  `R_D3D11_VShadKind_COUNT`;
+  @expand(R_D3D11_VShadTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum
-R_D3D11_PShadKind:
+@enum R_D3D11_PShadKind:
 {
-  @expand(R_D3D11_PShadTable a) `R_D3D11_PShadKind_$(a.name),`;
-  `R_D3D11_PShadKind_COUNT`;
+  @expand(R_D3D11_PShadTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum
-R_D3D11_UniformTypeKind:
+@enum R_D3D11_UniformTypeKind:
 {
-  @expand(R_D3D11_UniformTypeTable a) `R_D3D11_UniformTypeKind_$(a.name),`;
-  `R_D3D11_UniformTypeKind_COUNT`;
+  @expand(R_D3D11_UniformTypeTable a) `$(a.name)`,
+  COUNT,
 }
 
 @c_file @table_gen_data(type:String8, fallback:`{0}`)

src/render/generated/render.meta.h

@@ -17,21 +17,21 @@ R_Tex2DFormat_RGBA16,
 R_Tex2DFormat_R32,
 R_Tex2DFormat_RG32,
 R_Tex2DFormat_RGBA32,
-R_Tex2DFormat_COUNT
+R_Tex2DFormat_COUNT,
 } R_Tex2DFormat;
 
 typedef enum R_Tex2DKind
 {
 R_Tex2DKind_Static,
 R_Tex2DKind_Dynamic,
-R_Tex2DKind_COUNT
+R_Tex2DKind_COUNT,
 } R_Tex2DKind;
 
 typedef enum R_Tex2DSampleKind
 {
 R_Tex2DSampleKind_Nearest,
 R_Tex2DSampleKind_Linear,
-R_Tex2DSampleKind_COUNT
+R_Tex2DSampleKind_COUNT,
 } R_Tex2DSampleKind;
 
 typedef enum R_GeoTopologyKind
@@ -40,14 +40,14 @@ R_GeoTopologyKind_Lines,
 R_GeoTopologyKind_LineStrip,
 R_GeoTopologyKind_Triangles,
 R_GeoTopologyKind_TriangleStrip,
-R_GeoTopologyKind_COUNT
+R_GeoTopologyKind_COUNT,
 } R_GeoTopologyKind;
 
 typedef enum R_BufferKind
 {
 R_BufferKind_Static,
 R_BufferKind_Dynamic,
-R_BufferKind_COUNT
+R_BufferKind_COUNT,
 } R_BufferKind;
 
 typedef enum R_PassKind
@@ -55,7 +55,7 @@ typedef enum R_PassKind
 R_PassKind_UI,
 R_PassKind_Blur,
 R_PassKind_Geo3D,
-R_PassKind_COUNT
+R_PassKind_COUNT,
 } R_PassKind;
 
 String8 r_tex2d_format_display_string_table[] =

src/render/render_core.mdesk

@@ -59,40 +59,40 @@ R_PassKindTable:
 ////////////////////////////////
 //~ rjf: Generators
 
-@table_gen_enum R_Tex2DFormat:
+@enum R_Tex2DFormat:
 {
-  @expand(R_Tex2DFormatTable a) `R_Tex2DFormat_$(a.name),`;
-  `R_Tex2DFormat_COUNT`;
+  @expand(R_Tex2DFormatTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum R_Tex2DKind:
+@enum R_Tex2DKind:
 {
-  @expand(R_Tex2DKindTable a) `R_Tex2DKind_$(a.name),`;
-  `R_Tex2DKind_COUNT`;
+  @expand(R_Tex2DKindTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum R_Tex2DSampleKind:
+@enum R_Tex2DSampleKind:
 {
-  @expand(R_Tex2DSampleKindTable a) `R_Tex2DSampleKind_$(a.name),`;
-  `R_Tex2DSampleKind_COUNT`;
+  @expand(R_Tex2DSampleKindTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum R_GeoTopologyKind:
+@enum R_GeoTopologyKind:
 {
-  @expand(R_GeoTopologyKindTable a) `R_GeoTopologyKind_$(a.name),`;
-  `R_GeoTopologyKind_COUNT`;
+  @expand(R_GeoTopologyKindTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum R_BufferKind:
+@enum R_BufferKind:
 {
-  @expand(R_BufferKindTable a) `R_BufferKind_$(a.name),`;
-  `R_BufferKind_COUNT`;
+  @expand(R_BufferKindTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum R_PassKind:
+@enum R_PassKind:
 {
-  @expand(R_PassKindTable a) `R_PassKind_$(a.name),`;
-  `R_PassKind_COUNT`;
+  @expand(R_PassKindTable a) `$(a.name)`,
+  COUNT,
 }
 
 @table_gen_data(type:String8) r_tex2d_format_display_string_table: