Browse Source
[compat] HaikuOS port (#2805)
[compat] HaikuOS port (#2805)
Still had the issues with libusb, but that should get solved with the other PRs anyways Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2805 Reviewed-by: MaranBr <maranbr@eden-emu.dev> Reviewed-by: crueter <crueter@eden-emu.dev> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>pull/2812/head
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
28 changed files with 250 additions and 129 deletions
-
49.patch/glslang/0001-haikuos-fix.patch
-
9CMakeLists.txt
-
29docs/Caveats.md
-
39docs/Deps.md
-
8docs/user/Architectures.md
-
1docs/user/Basics.md
-
4docs/user/Graphics.md
-
8externals/renderdoc/renderdoc_app.h
-
31src/common/host_memory.cpp
-
2src/common/settings.cpp
-
2src/common/settings.h
-
62src/common/thread.cpp
-
16src/common/virtual_buffer.cpp
-
2src/core/arm/dynarmic/arm_dynarmic_32.cpp
-
2src/core/arm/dynarmic/arm_dynarmic_64.cpp
-
6src/core/frontend/emu_window.h
-
6src/core/internal_network/network.cpp
-
5src/core/internal_network/network.h
-
14src/core/internal_network/sockets.h
-
2src/core/tools/renderdoc.cpp
-
3src/dynarmic/src/dynarmic/CMakeLists.txt
-
5src/qt_common/qt_common.cpp
-
2src/qt_common/util/game.cpp
-
10src/video_core/host_shaders/CMakeLists.txt
-
33src/video_core/renderer_opengl/gl_device.cpp
-
5src/video_core/vulkan_common/vulkan.h
-
4src/video_core/vulkan_common/vulkan_instance.cpp
-
20src/video_core/vulkan_common/vulkan_surface.cpp
@ -0,0 +1,49 @@ |
|||||
|
diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
|
||||
|
index be7f442..5fd0438 100644
|
||||
|
--- a/StandAlone/StandAlone.cpp
|
||||
|
+++ b/StandAlone/StandAlone.cpp
|
||||
|
@@ -1766,9 +1766,10 @@ int singleMain()
|
||||
|
glslang::FinalizeProcess(); |
||||
|
} else { |
||||
|
ShInitialize(); |
||||
|
+#ifndef __HAIKU__
|
||||
|
ShInitialize(); // also test reference counting of users |
||||
|
ShFinalize(); // also test reference counting of users |
||||
|
-
|
||||
|
+#endif
|
||||
|
bool printShaderNames = workList.size() > 1; |
||||
|
|
||||
|
if (Options & EOptionMultiThreaded) { |
||||
|
@@ -1793,8 +1794,9 @@ int singleMain()
|
||||
|
PutsIfNonEmpty(WorkItems[w]->results.c_str()); |
||||
|
} |
||||
|
} |
||||
|
-
|
||||
|
+#ifndef __HAIKU__
|
||||
|
ShFinalize(); |
||||
|
+#endif
|
||||
|
} |
||||
|
|
||||
|
if (CompileFailed.load()) |
||||
|
@@ -1809,8 +1811,10 @@ int C_DECL main(int argc, char* argv[])
|
||||
|
{ |
||||
|
ProcessArguments(WorkItems, argc, argv); |
||||
|
|
||||
|
+#ifdef __HAIKU__
|
||||
|
+ return singleMain();
|
||||
|
+#else
|
||||
|
int ret = 0; |
||||
|
-
|
||||
|
// Loop over the entire init/finalize cycle to watch memory changes |
||||
|
const int iterations = 1; |
||||
|
if (iterations > 1) |
||||
|
@@ -1820,8 +1824,8 @@ int C_DECL main(int argc, char* argv[])
|
||||
|
if (iterations > 1) |
||||
|
glslang::OS_DumpMemoryCounters(); |
||||
|
} |
||||
|
-
|
||||
|
return ret; |
||||
|
+#endif
|
||||
|
} |
||||
|
|
||||
|
// |
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue