Codegen: remove build_config from domain model

godot-codegen/src/class_generator.rs

@@ -107,7 +107,6 @@ impl FnDefinitions {
 pub(crate) fn generate_class_files(
     api: &ExtensionApi,
     ctx: &mut Context,
-    _build_config: [&str; 2],
     gen_path: &Path,
     submit_fn: &mut SubmitFn,
 ) {
@@ -141,7 +140,6 @@ pub(crate) fn generate_class_files(
 pub(crate) fn generate_builtin_class_files(
     api: &ExtensionApi,
     ctx: &mut Context,
-    _build_config: [&str; 2],
     gen_path: &Path,
     submit_fn: &mut SubmitFn,
 ) {
@@ -179,7 +177,6 @@ pub(crate) fn generate_builtin_class_files(
 pub(crate) fn generate_native_structures_files(
     api: &ExtensionApi,
     ctx: &mut Context,
-    _build_config: [&str; 2],
     gen_path: &Path,
     submit_fn: &mut SubmitFn,
 ) {

godot-codegen/src/lib.rs

@@ -62,12 +62,12 @@ pub fn generate_sys_files(
     h_path: &Path,
     watch: &mut godot_bindings::StopWatch,
 ) {
-    let (json_api, build_config) = load_extension_api(watch);
+    let json_api = load_extension_api(watch);
 
     let mut ctx = Context::build_from_api(&json_api);
     watch.record("build_context");
 
-    let api = ExtensionApi::from_json(&json_api, build_config, &mut ctx);
+    let api = ExtensionApi::from_json(&json_api, &mut ctx);
     watch.record("map_domain_models");
 
     // TODO if ctx is no longer needed for below functions:
@@ -99,11 +99,11 @@ pub fn generate_core_files(core_gen_path: &Path) {
 
     generate_core_mod_file(core_gen_path, &mut submit_fn);
 
-    let (json_api, build_config) = load_extension_api(&mut watch);
+    let json_api = load_extension_api(&mut watch);
     let mut ctx = Context::build_from_api(&json_api);
     watch.record("build_context");
 
-    let api = ExtensionApi::from_json(&json_api, build_config, &mut ctx);
+    let api = ExtensionApi::from_json(&json_api, &mut ctx);
     watch.record("map_domain_models");
 
     // TODO if ctx is no longer needed for below functions:
@@ -121,7 +121,6 @@ pub fn generate_core_files(core_gen_path: &Path) {
     generate_class_files(
         &api,
         &mut ctx,
-        build_config,
         &core_gen_path.join("classes"),
         &mut submit_fn,
     );
@@ -130,7 +129,6 @@ pub fn generate_core_files(core_gen_path: &Path) {
     generate_builtin_class_files(
         &api,
         &mut ctx,
-        build_config,
         &core_gen_path.join("builtin_classes"),
         &mut submit_fn,
     );
@@ -139,7 +137,6 @@ pub fn generate_core_files(core_gen_path: &Path) {
     generate_native_structures_files(
         &api,
         &mut ctx,
-        build_config,
         &core_gen_path.join("native"),
         &mut submit_fn,
     );

godot-codegen/src/models/domain.rs

@@ -26,7 +26,6 @@ pub struct ExtensionApi {
     pub native_structures: Vec<NativeStructure>,
     pub utility_functions: Vec<UtilityFunction>,
     pub global_enums: Vec<Enum>,
-    pub build_config: [&'static str; 2],
     pub godot_version: GodotApiVersion,
 
     /// Map `(original Godot name, build config) -> builtin size` in bytes.

godot-codegen/src/models/domain_mapping.rs

@@ -26,11 +26,7 @@ use std::collections::HashMap;
 // Top-level
 
 impl ExtensionApi {
-    pub fn from_json(
-        json: &JsonExtensionApi,
-        build_config: [&'static str; 2],
-        ctx: &mut Context,
-    ) -> Self {
+    pub fn from_json(json: &JsonExtensionApi, ctx: &mut Context) -> Self {
         Self {
             builtins: BuiltinVariant::all_from_json(&json.global_enums, &json.builtin_classes, ctx),
             classes: json
@@ -54,7 +50,6 @@ impl ExtensionApi {
                 .iter()
                 .map(|json| Enum::from_json(json, None))
                 .collect(),
-            build_config,
             godot_version: GodotApiVersion::from_json(&json.header),
             builtin_sizes: Self::builtin_size_from_json(&json.builtin_class_sizes),
         }

godot-codegen/src/models/json.rs

@@ -251,22 +251,7 @@ impl JsonMethodReturn {
 // ----------------------------------------------------------------------------------------------------------------------------------------------
 // Implementation
 
-pub fn load_extension_api(
-    watch: &mut godot_bindings::StopWatch,
-) -> (JsonExtensionApi, [&'static str; 2]) {
-    // For float/double inference, see:
-    // * https://github.com/godotengine/godot-proposals/issues/892
-    // * https://github.com/godotengine/godot-cpp/pull/728
-    // Have to do target_pointer_width check after code generation
-    // So pass a [32bit, 64bit] around of appropriate precision
-    // For why see: https://github.com/rust-lang/rust/issues/42587
-    let build_config: [&'static str; 2] = {
-        if cfg!(feature = "double-precision") {
-            ["double_32", "double_64"]
-        } else {
-            ["float_32", "float_64"]
-        }
-    };
+pub fn load_extension_api(watch: &mut godot_bindings::StopWatch) -> JsonExtensionApi {
     // Use type inference, so we can accept both String (dynamically resolved) and &str (prebuilt).
     // #[allow]: as_ref() acts as impl AsRef<str>, but with conditional compilation
 
@@ -279,6 +264,5 @@ pub fn load_extension_api(
     watch.record("deserialize_json");
 
     println!("Parsed extension_api.json for version {:?}", model.header);
-
-    (model, build_config)
+    model
 }

godot-ffi/src/opaque.rs

@@ -12,6 +12,13 @@
 ///
 /// Note: due to `align(4)` / `align(8)` and not `packed` repr, this type may be bigger than `N` bytes
 /// (which should be OK since C++ just needs to read/write those `N` bytes reliably).
+///
+///
+/// For float/double inference, see:
+/// * https://github.com/godotengine/godot-proposals/issues/892
+/// * https://github.com/godotengine/godot-cpp/pull/728
+///
+/// We have to do a `target_pointer_width` check *after* code generation, see https://github.com/rust-lang/rust/issues/42587.
 #[cfg_attr(target_pointer_width = "32", repr(C, align(4)))]
 #[cfg_attr(target_pointer_width = "64", repr(C, align(8)))]
 #[derive(Copy, Clone)]