Thunks/gen: Drop now unneeded callback_unpacks file

ThunkLibs/Generator/gen.cpp

@@ -731,11 +731,6 @@ void GenerateThunkLibsAction::EndSourceFileAction() {
         }
     }
 
-    if (!output_filenames.callback_unpacks.empty()) {
-        // TODO: Not needed anymore
-        std::ofstream file(output_filenames.callback_unpacks);
-    }
-
     if (!output_filenames.symbol_list.empty()) {
         std::ofstream file(output_filenames.symbol_list);
 

ThunkLibs/Generator/interface.h

@@ -17,8 +17,6 @@ struct OutputFilenames {
     std::string function_packs_public;
 
     // Guest + Host
-    std::string callback_unpacks;
-
     std::string symbol_list;
 };
 

ThunkLibs/Generator/main.cpp

@@ -51,8 +51,6 @@ int main(int argc, char* argv[]) {
             output_filenames.function_packs = out_filename;
         } else if (target == "-function_packs_public") {
             output_filenames.function_packs_public = out_filename;
-        } else if (target == "-callback_unpacks") {
-            output_filenames.callback_unpacks = out_filename;
         } else if (target == "-symbol_list") {
             output_filenames.symbol_list = out_filename;
         } else {

ThunkLibs/GuestLibs/CMakeLists.txt

@@ -103,10 +103,10 @@ target_link_libraries(GL-guest PRIVATE X11)
 # target_link_libraries(SDL2-guest PRIVATE GL)
 # target_link_libraries(SDL2-guest PRIVATE dl)
 
-generate(libX11 ${CMAKE_CURRENT_SOURCE_DIR}/../libX11/libX11_interface.cpp thunks function_packs function_packs_public callback_unpacks)
+generate(libX11 ${CMAKE_CURRENT_SOURCE_DIR}/../libX11/libX11_interface.cpp thunks function_packs function_packs_public)
 add_guest_lib(X11)
 
-generate(libXext ${CMAKE_CURRENT_SOURCE_DIR}/../libXext/libXext_interface.cpp thunks function_packs function_packs_public callback_unpacks)
+generate(libXext ${CMAKE_CURRENT_SOURCE_DIR}/../libXext/libXext_interface.cpp thunks function_packs function_packs_public)
 add_guest_lib(Xext)
 
 generate(libXrender ${CMAKE_CURRENT_SOURCE_DIR}/../libXrender/libXrender_interface.cpp thunks function_packs function_packs_public)
@@ -119,7 +119,7 @@ generate(libvulkan ${CMAKE_CURRENT_SOURCE_DIR}/../libvulkan/libvulkan_interface.
 target_include_directories(libvulkan-guest-deps INTERFACE ${FEX_PROJECT_SOURCE_DIR}/External/Vulkan-Headers/include/)
 add_guest_lib(vulkan)
 
-generate(libxcb ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb/libxcb_interface.cpp thunks function_packs function_packs_public callback_unpacks)
+generate(libxcb ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb/libxcb_interface.cpp thunks function_packs function_packs_public)
 add_guest_lib(xcb)
 
 generate(libxcb-dri2 ${CMAKE_CURRENT_SOURCE_DIR}/../libxcb-dri2/libxcb-dri2_interface.cpp thunks function_packs function_packs_public)

ThunkLibs/README.md

@@ -65,7 +65,6 @@ For each thunked library, the generator outputs the following files:
 - `ldr.inl`: Host loader that dlopens/dlsyms the "real" host library for the implementation functions.
 - `ldr_ptrs.inl`: Host loader pointer declarations, used by ldr and function_unpacks
 - `tab_function_unpacks.inl`: Host function unpackers list, passed to FEX after Host library init so it can resolve the Guest Thunks to Host functions
-- `callback_unpacks.inl`: Guest callback unpackers
 
 
 ## Adding a new library

ThunkLibs/libX11/libX11_Guest.cpp

@@ -27,7 +27,6 @@ $end_info$
 #include <stdarg.h>
 
 #include "thunks.inl"
-#include "callback_unpacks.inl"
 
 #include "function_packs.inl"
 #include "function_packs_public.inl"

ThunkLibs/libXext/libXext_Guest.cpp

@@ -40,7 +40,6 @@ extern "C" {
 #include "common/Guest.h"
 
 #include "thunks.inl"
-#include "callback_unpacks.inl"
 
 #include "function_packs.inl"
 #include "function_packs_public.inl"

ThunkLibs/libxcb/libxcb_Guest.cpp

@@ -29,7 +29,6 @@ $end_info$
 #include "thunks.inl"
 #include "function_packs.inl"
 #include "function_packs_public.inl"
-#include "callback_unpacks.inl"
 
 static std::thread CBThread{};
 static std::atomic<bool> CBDone{false};

unittests/ThunkLibs/generator.cpp

@@ -57,7 +57,6 @@ struct Fixture {
             tmpdir + "/thunks",
             tmpdir + "/function_packs",
             tmpdir + "/function_packs_public",
-            tmpdir + "/callback_unpacks",
         };
     }
 
@@ -290,7 +289,6 @@ SourceWithAST Fixture::run_thunkgen_guest(std::string_view prelude, std::string_
         "Target *AllocateHostTrampolineForGuestFunction(Target*);\n";
     for (auto& filename : {
             output_filenames.thunks,
-            output_filenames.callback_unpacks,
             output_filenames.function_packs_public,
             output_filenames.function_packs,
             }) {