Library Forwarding/GL: Assume void* always points to compatible data

FEX-Emu · Jun 10, 2024 · cf08857 · cf08857
1 parent 476f175
commit cf08857
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ThunkLibs/Generator/analysis.cpp b/ThunkLibs/Generator/analysis.cpp
@@ -379,11 +379,6 @@ void AnalysisAction::ParseInterface(clang::ASTContext& context) {
               continue;
             }
 
-            if (param_type->isVoidPointerType()) {
-              // TODO: Drop workaround for currently unannotated APIs
-              data.param_annotations[param_idx].assume_compatible = true;
-            }
-
             auto check_struct_type = [&](const clang::Type* type) {
               if (type->isIncompleteType()) {
                 throw report_error(type->getAsTagDecl()->getBeginLoc(), "Unannotated pointer with incomplete struct type; consider using "

diff --git a/ThunkLibs/Generator/gen.cpp b/ThunkLibs/Generator/gen.cpp
@@ -144,7 +144,7 @@ void GenerateThunkLibsAction::EmitLayoutWrappers(clang::ASTContext& context, std
     auto struct_name = get_type_name(context, type);
 
     // Opaque types don't need layout definitions
-    if (type_repack_info.assumed_compatible && type_repack_info.pointers_only) {
+    if (type_repack_info.assumed_compatible && type_repack_info.pointers_only && struct_name != "void") {
       if (guest_abi.pointer_size != 4) {
         fmt::print(file, "template<> inline constexpr bool has_compatible_data_layout<{}*> = true;\n", struct_name);
       }

diff --git a/ThunkLibs/libGL/libGL_interface.cpp b/ThunkLibs/libGL/libGL_interface.cpp
@@ -38,6 +38,11 @@ struct fex_gen_config<SetGuestXDisplayString> : fexgen::custom_guest_entrypoint,
 template<typename>
 struct fex_gen_type {};
 
+// Assume void* always points to data with consistent layout.
+// It's used in too many functions to annotate them all.
+template<>
+struct fex_gen_type<void> : fexgen::opaque_type {};
+
 template<>
 struct fex_gen_type<std::remove_pointer_t<GLXContext>> : fexgen::opaque_type {};
 template<>