maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rebase patches for fixing haiku build.

Browse source
This commit is contained in:
Adrien Destugues 2018-08-11 13:05:48 +02:00
parent 0fc1c4eda8
commit a294a842cb
18 changed files with 257 additions and 286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
modules/websocket/SCsub
View file

@ -7,87 +7,88 @@ Import('env_modules')
env_lws = env_modules.Clone() env_lws = env_modules.Clone()
thirdparty_dir = "#thirdparty/libwebsockets/" if env['builtin_libwebsockets']:
helper_dir = "win32helpers/" thirdparty_dir = "#thirdparty/libwebsockets/"
thirdparty_sources = [ helper_dir = "win32helpers/"
thirdparty_sources = [
"core/alloc.c", "core/alloc.c",
"core/context.c", "core/context.c",
"core/libwebsockets.c", "core/libwebsockets.c",
"core/output.c", "core/output.c",
"core/pollfd.c", "core/pollfd.c",
"core/service.c", "core/service.c",
"event-libs/poll/poll.c", "event-libs/poll/poll.c",
"misc/base64-decode.c", "misc/base64-decode.c",
"misc/lejp.c", "misc/lejp.c",
"misc/sha-1.c", "misc/sha-1.c",
"roles/h1/ops-h1.c", "roles/h1/ops-h1.c",
"roles/http/header.c", "roles/http/header.c",
"roles/http/client/client.c", "roles/http/client/client.c",
"roles/http/client/client-handshake.c", "roles/http/client/client-handshake.c",
"roles/http/server/fops-zip.c", "roles/http/server/fops-zip.c",
"roles/http/server/lejp-conf.c", "roles/http/server/lejp-conf.c",
"roles/http/server/parsers.c", "roles/http/server/parsers.c",
"roles/http/server/server.c", "roles/http/server/server.c",
"roles/listen/ops-listen.c", "roles/listen/ops-listen.c",
"roles/pipe/ops-pipe.c", "roles/pipe/ops-pipe.c",
"roles/raw/ops-raw.c", "roles/raw/ops-raw.c",
"roles/ws/client-ws.c", "roles/ws/client-ws.c",
"roles/ws/client-parser-ws.c", "roles/ws/client-parser-ws.c",
"roles/ws/ops-ws.c", "roles/ws/ops-ws.c",
"roles/ws/server-ws.c", "roles/ws/server-ws.c",
"tls/tls.c", "tls/tls.c",
"tls/tls-client.c", "tls/tls-client.c",
"tls/tls-server.c", "tls/tls-server.c",
"tls/mbedtls/wrapper/library/ssl_cert.c", "tls/mbedtls/wrapper/library/ssl_cert.c",
"tls/mbedtls/wrapper/library/ssl_pkey.c", "tls/mbedtls/wrapper/library/ssl_pkey.c",
"tls/mbedtls/wrapper/library/ssl_stack.c", "tls/mbedtls/wrapper/library/ssl_stack.c",
"tls/mbedtls/wrapper/library/ssl_methods.c", "tls/mbedtls/wrapper/library/ssl_methods.c",
"tls/mbedtls/wrapper/library/ssl_lib.c", "tls/mbedtls/wrapper/library/ssl_lib.c",
"tls/mbedtls/wrapper/library/ssl_x509.c", "tls/mbedtls/wrapper/library/ssl_x509.c",
"tls/mbedtls/wrapper/platform/ssl_port.c", "tls/mbedtls/wrapper/platform/ssl_port.c",
"tls/mbedtls/wrapper/platform/ssl_pm.c", "tls/mbedtls/wrapper/platform/ssl_pm.c",
"tls/mbedtls/lws-genhash.c", "tls/mbedtls/lws-genhash.c",
"tls/mbedtls/mbedtls-client.c", "tls/mbedtls/mbedtls-client.c",
"tls/mbedtls/lws-genrsa.c", "tls/mbedtls/lws-genrsa.c",
"tls/mbedtls/ssl.c", "tls/mbedtls/ssl.c",
"tls/mbedtls/mbedtls-server.c" "tls/mbedtls/mbedtls-server.c"
] ]
if env_lws["platform"] == "android": # Builtin getifaddrs if env_lws["platform"] == "android": # Builtin getifaddrs
thirdparty_sources += ["misc/getifaddrs.c"] thirdparty_sources += ["misc/getifaddrs.c"]
if env_lws["platform"] == "windows" or env_lws["platform"] == "uwp": # Winsock if env_lws["platform"] == "windows" or env_lws["platform"] == "uwp": # Winsock
thirdparty_sources += ["plat/lws-plat-win.c", helper_dir + "getopt.c", helper_dir + "getopt_long.c", helper_dir + "gettimeofday.c"] thirdparty_sources += ["plat/lws-plat-win.c", helper_dir + "getopt.c", helper_dir + "getopt_long.c", helper_dir + "gettimeofday.c"]
else: # Unix socket else: # Unix socket
thirdparty_sources += ["plat/lws-plat-unix.c"] thirdparty_sources += ["plat/lws-plat-unix.c"]
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
if env_lws["platform"] == "javascript": # No need to add third party libraries at all if env_lws["platform"] == "javascript": # No need to add third party libraries at all
pass pass
else: else:
env_lws.add_source_files(env.modules_sources, thirdparty_sources) env_lws.add_source_files(env.modules_sources, thirdparty_sources)
env_lws.Append(CPPPATH=[thirdparty_dir]) env_lws.Append(CPPPATH=[thirdparty_dir])
wrapper_includes = ["#thirdparty/libwebsockets/tls/mbedtls/wrapper/include/" + inc for inc in ["internal", "openssl", "platform", ""]] wrapper_includes = ["#thirdparty/libwebsockets/tls/mbedtls/wrapper/include/" + inc for inc in ["internal", "openssl", "platform", ""]]
env_lws.Prepend(CPPPATH=wrapper_includes) env_lws.Prepend(CPPPATH=wrapper_includes)
if env['builtin_mbedtls']: if env['builtin_mbedtls']:
mbedtls_includes = "#thirdparty/mbedtls/include" mbedtls_includes = "#thirdparty/mbedtls/include"
env_lws.Prepend(CPPPATH=[mbedtls_includes]) env_lws.Prepend(CPPPATH=[mbedtls_includes])
if env_lws["platform"] == "windows" or env_lws["platform"] == "uwp": if env_lws["platform"] == "windows" or env_lws["platform"] == "uwp":
env_lws.Append(CPPPATH=[thirdparty_dir + helper_dir]) env_lws.Append(CPPPATH=[thirdparty_dir + helper_dir])
if env_lws["platform"] == "uwp": if env_lws["platform"] == "uwp":
env_lws.Append(CCFLAGS=["/DLWS_MINGW_SUPPORT"]) env_lws.Append(CCFLAGS=["/DLWS_MINGW_SUPPORT"])
env_lws.add_source_files(env.modules_sources, "*.cpp") env_lws.add_source_files(env.modules_sources, "*.cpp")

2
platform/haiku/audio_driver_media_kit.cpp
View file

@ -100,7 +100,7 @@ int AudioDriverMediaKit::get_mix_rate() const {
return mix_rate; return mix_rate;
} }
AudioDriverSW::SpeakerMode AudioDriverMediaKit::get_speaker_mode() const { AudioDriverMediaKit::SpeakerMode AudioDriverMediaKit::get_speaker_mode() const {
return speaker_mode; return speaker_mode;
} }

3
platform/haiku/audio_driver_media_kit.h
View file

@ -35,9 +35,10 @@
#include "core/os/mutex.h" #include "core/os/mutex.h"
#include "core/os/thread.h" #include "core/os/thread.h"
#include <SoundPlayer.h>
#include <kernel/image.h> // needed for image_id #include <kernel/image.h> // needed for image_id
#include <SoundPlayer.h>
class AudioDriverMediaKit : public AudioDriver { class AudioDriverMediaKit : public AudioDriver {
Mutex *mutex; Mutex *mutex;

81
platform/haiku/detect.py
View file

@ -64,6 +64,87 @@ def configure(env):
env["CC"] = "gcc-x86" env["CC"] = "gcc-x86"
env["CXX"] = "g++-x86" env["CXX"] = "g++-x86"
## Dependencies
if not env['builtin_libwebp']:
env.ParseConfig('pkg-config libwebp --cflags --libs')
# freetype depends on libpng and zlib, so bundling one of them while keeping others
# as shared libraries leads to weird issues
if env['builtin_freetype'] or env['builtin_libpng'] or env['builtin_zlib']:
env['builtin_freetype'] = True
env['builtin_libpng'] = True
env['builtin_zlib'] = True
if not env['builtin_freetype']:
env.ParseConfig('pkg-config freetype2 --cflags --libs')
if not env['builtin_libpng']:
env.ParseConfig('pkg-config libpng --cflags --libs')
if not env['builtin_bullet']:
# We need at least version 2.88
import subprocess
bullet_version = subprocess.check_output(['pkg-config', 'bullet', '--modversion']).strip()
if bullet_version < "2.88":
# Abort as system bullet was requested but too old
print("Bullet: System version {0} does not match minimal requirements ({1}). Aborting.".format(bullet_version, "2.88"))
sys.exit(255)
env.ParseConfig('pkg-config bullet --cflags --libs')
if not env['builtin_enet']:
env.ParseConfig('pkg-config libenet --cflags --libs')
if not env['builtin_squish'] and env['tools']:
env.ParseConfig('pkg-config libsquish --cflags --libs')
if not env['builtin_zstd']:
env.ParseConfig('pkg-config libzstd --cflags --libs')
# Sound and video libraries
# Keep the order as it triggers chained dependencies (ogg needed by others, etc.)
if not env['builtin_libtheora']:
env['builtin_libogg'] = False # Needed to link against system libtheora
env['builtin_libvorbis'] = False # Needed to link against system libtheora
env.ParseConfig('pkg-config theora theoradec --cflags --libs')
if not env['builtin_libvpx']:
env.ParseConfig('pkg-config vpx --cflags --libs')
if not env['builtin_libvorbis']:
env['builtin_libogg'] = False # Needed to link against system libvorbis
env.ParseConfig('pkg-config vorbis vorbisfile --cflags --libs')
if not env['builtin_opus']:
env['builtin_libogg'] = False # Needed to link against system opus
env.ParseConfig('pkg-config opus opusfile --cflags --libs')
if not env['builtin_libogg']:
env.ParseConfig('pkg-config ogg --cflags --libs')
if env['builtin_libtheora']:
list_of_x86 = ['x86_64', 'x86', 'i386', 'i586']
if any(platform.machine() in s for s in list_of_x86):
env["x86_libtheora_opt_gcc"] = True
if not env['builtin_libwebsockets']:
env.ParseConfig('pkg-config libwebsockets --cflags --libs')
if not env['builtin_mbedtls']:
# mbedTLS does not provide a pkgconfig config yet. See https://github.com/ARMmbed/mbedtls/issues/228
env.Append(LIBS=['mbedtls', 'mbedcrypto', 'mbedx509'])
if not env['builtin_miniupnpc']:
# No pkgconfig file so far, hardcode default paths.
env.Append(CPPPATH=["/system/develop/headers/x86/miniupnpc"])
env.Append(LIBS=["miniupnpc"])
# On Linux wchar_t should be 32-bits
# 16-bit library shouldn't be required due to compiler optimisations
if not env['builtin_pcre2']:
env.ParseConfig('pkg-config libpcre2-32 --cflags --libs')
## Flags ## Flags
env.Append(CPPPATH=['#platform/haiku']) env.Append(CPPPATH=['#platform/haiku'])

3
platform/haiku/haiku_application.h
View file

@ -31,9 +31,10 @@
#ifndef HAIKU_APPLICATION_H #ifndef HAIKU_APPLICATION_H
#define HAIKU_APPLICATION_H #define HAIKU_APPLICATION_H
#include <Application.h>
#include <kernel/image.h> // needed for image_id #include <kernel/image.h> // needed for image_id
#include <Application.h>
class HaikuApplication : public BApplication { class HaikuApplication : public BApplication {
public: public:
HaikuApplication(); HaikuApplication();

127
platform/haiku/haiku_direct_window.cpp
View file

@ -41,10 +41,14 @@ HaikuDirectWindow::HaikuDirectWindow(BRect p_frame) :
last_buttons_state = 0; last_buttons_state = 0;
last_button_mask = 0; last_button_mask = 0;
last_key_modifier_state = 0; last_key_modifier_state = 0;
view = NULL;
update_runner = NULL;
input = NULL;
main_loop = NULL;
} }
HaikuDirectWindow::~HaikuDirectWindow() { HaikuDirectWindow::~HaikuDirectWindow() {
delete update_runner;
} }
void HaikuDirectWindow::SetHaikuGLView(HaikuGLView *p_view) { void HaikuDirectWindow::SetHaikuGLView(HaikuGLView *p_view) {
@ -53,7 +57,7 @@ void HaikuDirectWindow::SetHaikuGLView(HaikuGLView *p_view) {
void HaikuDirectWindow::StartMessageRunner() { void HaikuDirectWindow::StartMessageRunner() {
update_runner = new BMessageRunner(BMessenger(this), update_runner = new BMessageRunner(BMessenger(this),
new BMessage(REDRAW_MSG), 1000000 / 30 /* 30 fps */); new BMessage(REDRAW_MSG), 1000000 / 60 /* 60 fps */);
} }
void HaikuDirectWindow::StopMessageRunner() { void HaikuDirectWindow::StopMessageRunner() {
@ -69,6 +73,7 @@ void HaikuDirectWindow::SetMainLoop(MainLoop *p_main_loop) {
} }
bool HaikuDirectWindow::QuitRequested() { bool HaikuDirectWindow::QuitRequested() {
StopMessageRunner();
main_loop->notification(MainLoop::NOTIFICATION_WM_QUIT_REQUEST); main_loop->notification(MainLoop::NOTIFICATION_WM_QUIT_REQUEST);
return false; return false;
} }
@ -152,39 +157,36 @@ void HaikuDirectWindow::HandleMouseButton(BMessage *message) {
} }
*/ */
Ref<InputEvent> mouse_event; Ref<InputEventMouseButton> mouse_event;
mouse_event.type = Ref<InputEvent>::MOUSE_BUTTON; mouse_event.instance();
mouse_event.device = 0;
mouse_event.mouse_button.mod = GetKeyModifierState(modifiers); mouse_event->set_button_mask(GetMouseButtonState(buttons));
mouse_event->get_button_mask() = GetMouseButtonState(buttons); mouse_event->set_position({ where.x, where.y });
mouse_event->get_position().x = where.x; mouse_event->set_global_position({ where.x, where.y });
mouse_event->get_position().y = where.y; GetKeyModifierState(mouse_event, modifiers);
mouse_event.mouse_button.global_x = where.x;
mouse_event.mouse_button.global_y = where.y;
switch (button) { switch (button) {
default: default:
case B_PRIMARY_MOUSE_BUTTON: case B_PRIMARY_MOUSE_BUTTON:
mouse_event->get_button_index() = 1; mouse_event->set_button_index(1);
break; break;
case B_SECONDARY_MOUSE_BUTTON: case B_SECONDARY_MOUSE_BUTTON:
mouse_event->get_button_index() = 2; mouse_event->set_button_index(2);
break; break;
case B_TERTIARY_MOUSE_BUTTON: case B_TERTIARY_MOUSE_BUTTON:
mouse_event->get_button_index() = 3; mouse_event->set_button_index(3);
break; break;
} }
mouse_event->is_pressed() = (message->what == B_MOUSE_DOWN); mouse_event->set_pressed(message->what == B_MOUSE_DOWN);
if (message->what == B_MOUSE_DOWN && mouse_event->get_button_index() == 1) { if (message->what == B_MOUSE_DOWN && mouse_event->get_button_index() == 1) {
int32 clicks = message->FindInt32("clicks"); int32 clicks = message->FindInt32("clicks");
if (clicks > 1) { if (clicks > 1) {
mouse_event.mouse_button.doubleclick = true; mouse_event->set_doubleclick(true);
} }
} }
@ -208,22 +210,18 @@ void HaikuDirectWindow::HandleMouseMoved(BMessage *message) {
Point2i rel = pos - last_mouse_position; Point2i rel = pos - last_mouse_position;
Ref<InputEvent> motion_event; Ref<InputEventMouseMotion> motion_event;
motion_event.type = Ref<InputEvent>::MOUSE_MOTION; motion_event.instance();
motion_event.device = 0; GetKeyModifierState(motion_event, modifiers);
motion_event.mouse_motion.mod = GetKeyModifierState(modifiers); motion_event->set_button_mask(GetMouseButtonState(buttons));
motion_event->get_button_mask() = GetMouseButtonState(buttons); motion_event->set_position({ pos.x, pos.y });
motion_event.mouse_motion.x = pos.x;
motion_event.mouse_motion.y = pos.y;
input->set_mouse_position(pos); input->set_mouse_position(pos);
motion_event.mouse_motion.global_x = pos.x; motion_event->set_global_position({ pos.x, pos.y });
motion_event.mouse_motion.global_y = pos.y; motion_event->set_speed({ input->get_last_mouse_speed().x,
motion_event.mouse_motion.speed_x = input->get_last_mouse_speed().x; input->get_last_mouse_speed().y });
motion_event.mouse_motion.speed_y = input->get_last_mouse_speed().y;
motion_event->get_relative().x = rel.x; motion_event->set_relative({ rel.x, rel.y });
motion_event->get_relative().y = rel.y;
last_mouse_position = pos; last_mouse_position = pos;
@ -236,22 +234,21 @@ void HaikuDirectWindow::HandleMouseWheelChanged(BMessage *message) {
return; return;
} }
Ref<InputEvent> mouse_event; Ref<InputEventMouseButton> mouse_event;
mouse_event.type = Ref<InputEvent>::MOUSE_BUTTON; mouse_event.instance();
mouse_event.device = 0; //GetKeyModifierState(mouse_event, modifiers);
mouse_event->get_button_index() = wheel_delta_y < 0 ? 4 : 5; mouse_event->set_button_index(wheel_delta_y < 0 ? 4 : 5);
mouse_event.mouse_button.mod = GetKeyModifierState(last_key_modifier_state); mouse_event->set_button_mask(last_button_mask);
mouse_event->get_button_mask() = last_button_mask; mouse_event->set_position({ last_mouse_position.x,
mouse_event->get_position().x = last_mouse_position.x; last_mouse_position.y });
mouse_event->get_position().y = last_mouse_position.y; mouse_event->set_global_position({ last_mouse_position.x,
mouse_event.mouse_button.global_x = last_mouse_position.x; last_mouse_position.y });
mouse_event.mouse_button.global_y = last_mouse_position.y;
mouse_event->is_pressed() = true; mouse_event->set_pressed(true);
input->parse_input_event(mouse_event); input->parse_input_event(mouse_event);
mouse_event->is_pressed() = false; mouse_event->set_pressed(false);
input->parse_input_event(mouse_event); input->parse_input_event(mouse_event);
} }
@ -272,24 +269,23 @@ void HaikuDirectWindow::HandleKeyboardEvent(BMessage *message) {
return; return;
} }
Ref<InputEvent> event; Ref<InputEventKey> event;
event.type = Ref<InputEvent>::KEY; event.instance();
event.device = 0; GetKeyModifierState(event, modifiers);
event.key.mod = GetKeyModifierState(modifiers); event->set_pressed(message->what == B_KEY_DOWN);
event->is_pressed() = (message->what == B_KEY_DOWN); event->set_scancode(KeyMappingHaiku::get_keysym(raw_char, key));
event->get_scancode() = KeyMappingHaiku::get_keysym(raw_char, key); event->set_echo(message->HasInt32("be:key_repeat"));
event->is_echo() = message->HasInt32("be:key_repeat"); event->set_unicode(0);
event.key.unicode = 0;
const char *bytes = NULL; const char *bytes = NULL;
if (message->FindString("bytes", &bytes) == B_OK) { if (message->FindString("bytes", &bytes) == B_OK) {
event.key.unicode = BUnicodeChar::FromUTF8(&bytes); event->set_unicode(BUnicodeChar::FromUTF8(&bytes));
} }
//make it consistent across platforms. //make it consistent across platforms.
if (event->get_scancode() == KEY_BACKTAB) { if (event->get_scancode() == KEY_BACKTAB) {
event->get_scancode() = KEY_TAB; event->set_scancode(KEY_TAB);
event->get_shift() = true; event->set_shift(true);
} }
input->parse_input_event(event); input->parse_input_event(event);
@ -309,14 +305,14 @@ void HaikuDirectWindow::HandleKeyboardModifierEvent(BMessage *message) {
int32 key = old_modifiers ^ modifiers; int32 key = old_modifiers ^ modifiers;
Ref<InputEvent> event; Ref<InputEventWithModifiers> event;
event.type = Ref<InputEvent>::KEY; event.instance();
event.device = 0; GetKeyModifierState(event, modifiers);
event.key.mod = GetKeyModifierState(modifiers);
event->is_pressed() = ((modifiers & key) != 0); event->set_shift(key & B_SHIFT_KEY);
event->get_scancode() = KeyMappingHaiku::get_modifier_keysym(key); event->set_alt(key & B_OPTION_KEY);
event->is_echo() = false; event->set_control(key & B_CONTROL_KEY);
event.key.unicode = 0; event->set_command(key & B_COMMAND_KEY);
input->parse_input_event(event); input->parse_input_event(event);
} }
@ -333,14 +329,13 @@ void HaikuDirectWindow::HandleWindowResized(BMessage *message) {
current_video_mode->height = height; current_video_mode->height = height;
} }
inline InputModifierState HaikuDirectWindow::GetKeyModifierState(uint32 p_state) { inline void HaikuDirectWindow::GetKeyModifierState(Ref<InputEventWithModifiers> event, uint32 p_state) {
last_key_modifier_state = p_state; last_key_modifier_state = p_state;
InputModifierState state;
state.shift = (p_state & B_SHIFT_KEY) != 0; event->set_shift(p_state & B_SHIFT_KEY);
state.control = (p_state & B_CONTROL_KEY) != 0; event->set_control(p_state & B_CONTROL_KEY);
state.alt = (p_state & B_OPTION_KEY) != 0; event->set_alt(p_state & B_OPTION_KEY);
state.meta = (p_state & B_COMMAND_KEY) != 0; event->set_metakey(p_state & B_COMMAND_KEY);
return state; return state;
} }

5
platform/haiku/haiku_direct_window.h
View file

@ -31,9 +31,10 @@
#ifndef HAIKU_DIRECT_WINDOW_H #ifndef HAIKU_DIRECT_WINDOW_H
#define HAIKU_DIRECT_WINDOW_H #define HAIKU_DIRECT_WINDOW_H
#include <DirectWindow.h>
#include <kernel/image.h> // needed for image_id #include <kernel/image.h> // needed for image_id
#include <DirectWindow.h>
#include "core/os/os.h" #include "core/os/os.h"
#include "main/input_default.h" #include "main/input_default.h"
@ -63,7 +64,7 @@ private:
void HandleWindowResized(BMessage *message); void HandleWindowResized(BMessage *message);
void HandleKeyboardEvent(BMessage *message); void HandleKeyboardEvent(BMessage *message);
void HandleKeyboardModifierEvent(BMessage *message); void HandleKeyboardModifierEvent(BMessage *message);
inline InputModifierState GetKeyModifierState(uint32 p_state); inline void GetKeyModifierState(Ref<InputEventWithModifiers> event, uint32 p_state);
inline int GetMouseButtonState(uint32 p_state); inline int GetMouseButtonState(uint32 p_state);
public: public:

3
platform/haiku/haiku_gl_view.h
View file

@ -31,9 +31,10 @@
#ifndef HAIKU_GL_VIEW_H #ifndef HAIKU_GL_VIEW_H
#define HAIKU_GL_VIEW_H #define HAIKU_GL_VIEW_H
#include <GLView.h>
#include <kernel/image.h> // needed for image_id #include <kernel/image.h> // needed for image_id
#include <GLView.h>
class HaikuGLView : public BGLView { class HaikuGLView : public BGLView {
public: public:
HaikuGLView(BRect frame, uint32 type); HaikuGLView(BRect frame, uint32 type);

34
platform/haiku/os_haiku.cpp
View file

@ -28,9 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "drivers/gles3/rasterizer_gles3.h"
#include "os_haiku.h" #include "os_haiku.h"
#include "drivers/gles3/rasterizer_gles3.h"
#include "main/main.h" #include "main/main.h"
#include "servers/physics/physics_server_sw.h" #include "servers/physics/physics_server_sw.h"
#include "servers/visual/visual_server_raster.h" #include "servers/visual/visual_server_raster.h"
@ -111,13 +112,12 @@ Error OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p
context_gl->initialize(); context_gl->initialize();
context_gl->make_current(); context_gl->make_current();
context_gl->set_use_vsync(current_video_mode.use_vsync); context_gl->set_use_vsync(current_video_mode.use_vsync);
RasterizerGLES3::register_config();
/* Port to GLES 3 rasterizer */ RasterizerGLES3::make_current();
//rasterizer = memnew(RasterizerGLES2);
#endif #endif
visual_server = memnew(VisualServerRaster(rasterizer)); visual_server = memnew(VisualServerRaster());
ERR_FAIL_COND_V(!visual_server, ERR_UNAVAILABLE); ERR_FAIL_COND_V(!visual_server, ERR_UNAVAILABLE);
@ -138,8 +138,6 @@ Error OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p
AudioDriverManager::initialize(p_audio_driver); AudioDriverManager::initialize(p_audio_driver);
power_manager = memnew(PowerHaiku);
return OK; return OK;
} }
@ -152,7 +150,6 @@ void OS_Haiku::finalize() {
visual_server->finish(); visual_server->finish();
memdelete(visual_server); memdelete(visual_server);
memdelete(rasterizer);
memdelete(input); memdelete(input);
@ -336,7 +333,7 @@ String OS_Haiku::get_config_path() const {
if (has_environment("XDG_CONFIG_HOME")) { if (has_environment("XDG_CONFIG_HOME")) {
return get_environment("XDG_CONFIG_HOME"); return get_environment("XDG_CONFIG_HOME");
} else if (has_environment("HOME")) { } else if (has_environment("HOME")) {
return get_environment("HOME").plus_file(".config"); return get_environment("HOME").plus_file("config/settings");
} else { } else {
return "."; return ".";
} }
@ -347,7 +344,7 @@ String OS_Haiku::get_data_path() const {
if (has_environment("XDG_DATA_HOME")) { if (has_environment("XDG_DATA_HOME")) {
return get_environment("XDG_DATA_HOME"); return get_environment("XDG_DATA_HOME");
} else if (has_environment("HOME")) { } else if (has_environment("HOME")) {
return get_environment("HOME").plus_file(".local/share"); return get_environment("HOME").plus_file("config/data");
} else { } else {
return get_config_path(); return get_config_path();
} }
@ -358,8 +355,23 @@ String OS_Haiku::get_cache_path() const {
if (has_environment("XDG_CACHE_HOME")) { if (has_environment("XDG_CACHE_HOME")) {
return get_environment("XDG_CACHE_HOME"); return get_environment("XDG_CACHE_HOME");
} else if (has_environment("HOME")) { } else if (has_environment("HOME")) {
return get_environment("HOME").plus_file(".cache"); return get_environment("HOME").plus_file("config/cache");
} else { } else {
return get_config_path(); return get_config_path();
} }
} }
OS::PowerState OS_Haiku::get_power_state() {
WARN_PRINT("Power management is not implemented on this platform, defaulting to POWERSTATE_UNKNOWN");
return OS::POWERSTATE_UNKNOWN;
}
int OS_Haiku::get_power_seconds_left() {
WARN_PRINT("Power management is not implemented on this platform, defaulting to -1");
return -1;
}
int OS_Haiku::get_power_percent_left() {
WARN_PRINT("Power management is not implemented on this platform, defaulting to -1");
return -1;
}

4
platform/haiku/os_haiku.h
View file

@ -37,9 +37,7 @@
#include "haiku_application.h" #include "haiku_application.h"
#include "haiku_direct_window.h" #include "haiku_direct_window.h"
#include "main/input_default.h" #include "main/input_default.h"
#include "power_haiku.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "servers/visual/rasterizer.h"
#include "servers/visual_server.h" #include "servers/visual_server.h"
class OS_Haiku : public OS_Unix { class OS_Haiku : public OS_Unix {
@ -48,11 +46,9 @@ private:
HaikuDirectWindow *window; HaikuDirectWindow *window;
MainLoop *main_loop; MainLoop *main_loop;
InputDefault *input; InputDefault *input;
Rasterizer *rasterizer;
VisualServer *visual_server; VisualServer *visual_server;
VideoMode current_video_mode; VideoMode current_video_mode;
int video_driver_index; int video_driver_index;
PowerHaiku *power_manager;
#ifdef MEDIA_KIT_ENABLED #ifdef MEDIA_KIT_ENABLED
AudioDriverMediaKit driver_media_kit; AudioDriverMediaKit driver_media_kit;

1
platform/haiku/platform_config.h
View file

@ -34,3 +34,4 @@
#define _BSD_SOURCE 1 #define _BSD_SOURCE 1
#define GLES3_INCLUDE_H "glad/glad.h" #define GLES3_INCLUDE_H "glad/glad.h"
#define GLES2_INCLUDE_H "glad/glad.h"

74
platform/haiku/power_haiku.cpp
View file

@ -1,74 +0,0 @@
/*************************************************************************/
/* power_haiku.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "core/error_macros.h"
#include "power_haiku.h"
bool PowerHaiku::UpdatePowerInfo() {
return false;
}
OS::PowerState PowerHaiku::get_power_state() {
if (UpdatePowerInfo()) {
return power_state;
} else {
WARN_PRINT("Power management is not implemented on this platform, defaulting to POWERSTATE_UNKNOWN");
return OS::POWERSTATE_UNKNOWN;
}
}
int PowerX11::get_power_seconds_left() {
if (UpdatePowerInfo()) {
return nsecs_left;
} else {
WARN_PRINT("Power management is not implemented on this platform, defaulting to -1");
return -1;
}
}
int PowerX11::get_power_percent_left() {
if (UpdatePowerInfo()) {
return percent_left;
} else {
WARN_PRINT("Power management is not implemented on this platform, defaulting to -1");
return -1;
}
}
PowerHaiku::PowerHaiku() :
nsecs_left(-1),
percent_left(-1),
power_state(OS::POWERSTATE_UNKNOWN) {
}
PowerHaiku::~PowerHaiku() {
}

53
platform/haiku/power_haiku.h
View file

@ -1,53 +0,0 @@
/*************************************************************************/
/* power_haiku.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef PLATFORM_HAIKU_POWER_HAIKU_H_
#define PLATFORM_HAIKU_POWER_HAIKU_H_
#include <os/os.h>
class PowerHaiku {
private:
int nsecs_left;
int percent_left;
OS::PowerState power_state;
bool UpdatePowerInfo();
public:
PowerHaiku();
virtual ~PowerHaiku();
OS::PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();
};
#endif /* PLATFORM_HAIKU_POWER_HAIKU_H_ */

6
thirdparty/glad/glad.c vendored
View file

@ -77,7 +77,7 @@ void close_gl(void) {
#include <dlfcn.h> #include <dlfcn.h>
static void* libGL; static void* libGL;
#ifndef __APPLE__ #if !defined(__APPLE__) && !defined(__HAIKU__)
typedef void* (APIENTRYP PFNGLXGETPROCADDRESSPROC_PRIVATE)(const char*); typedef void* (APIENTRYP PFNGLXGETPROCADDRESSPROC_PRIVATE)(const char*);
static PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr; static PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
#endif #endif
@ -100,7 +100,7 @@ int open_gl(void) {
libGL = dlopen(NAMES[index], RTLD_NOW | RTLD_GLOBAL); libGL = dlopen(NAMES[index], RTLD_NOW | RTLD_GLOBAL);
if(libGL != NULL) { if(libGL != NULL) {
#ifdef __APPLE__ #if defined(__APPLE__) || defined(__HAIKU__)
return 1; return 1;
#else #else
gladGetProcAddressPtr = (PFNGLXGETPROCADDRESSPROC_PRIVATE)dlsym(libGL, gladGetProcAddressPtr = (PFNGLXGETPROCADDRESSPROC_PRIVATE)dlsym(libGL,
@ -127,7 +127,7 @@ void* get_proc(const char *namez) {
void* result = NULL; void* result = NULL;
if(libGL == NULL) return NULL; if(libGL == NULL) return NULL;
#ifndef __APPLE__ #if !defined(__APPLE__) && !defined(__HAIKU__)
if(gladGetProcAddressPtr != NULL) { if(gladGetProcAddressPtr != NULL) {
result = gladGetProcAddressPtr(namez); result = gladGetProcAddressPtr(namez);
} }

2
thirdparty/libwebsockets/lws_config.h vendored
View file

@ -174,7 +174,7 @@
#define LWS_HAVE_MALLOC_H #define LWS_HAVE_MALLOC_H
#endif #endif
#if !defined(IPHONE_ENABLED) && !defined(OSX_ENABLED) #if !defined(IPHONE_ENABLED) && !defined(OSX_ENABLED) && !defined(__HAIKU__)
#define LWS_HAVE_PIPE2 #define LWS_HAVE_PIPE2
#endif #endif

2
thirdparty/libwebsockets/lws_config_private.h vendored
View file

@ -81,7 +81,7 @@
/* Define to 1 if you have the <sys/prctl.h> header file. */ /* Define to 1 if you have the <sys/prctl.h> header file. */
#define LWS_HAVE_SYS_PRCTL_H #define LWS_HAVE_SYS_PRCTL_H
#if defined(OSX_ENABLED) || defined(IPHONE_ENABLED) || defined(__FreeBSD__) || defined(__OpenBSD__) #if defined(OSX_ENABLED) || defined(IPHONE_ENABLED) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__HAIKU__)
#undef LWS_HAVE_SYS_PRCTL_H #undef LWS_HAVE_SYS_PRCTL_H
#endif #endif

5
thirdparty/thekla_atlas/nvcore/nvcore.h vendored
View file

@ -44,6 +44,9 @@
#elif defined POSH_OS_FREEBSD #elif defined POSH_OS_FREEBSD
# define NV_OS_FREEBSD 1 # define NV_OS_FREEBSD 1
# define NV_OS_UNIX 1 # define NV_OS_UNIX 1
#elif defined POSH_OS_HAIKU
# define NV_OS_HAIKU 1
# define NV_OS_UNIX 1
#elif defined POSH_OS_OPENBSD #elif defined POSH_OS_OPENBSD
# define NV_OS_OPENBSD 1 # define NV_OS_OPENBSD 1
# define NV_OS_UNIX 1 # define NV_OS_UNIX 1
@ -341,7 +344,7 @@ template <typename T, size_t N> char (&ArraySizeHelper(T (&array)[N]))[N];
#elif NV_CC_GNUC #elif NV_CC_GNUC
# if NV_OS_LINUX # if NV_OS_LINUX
# include "DefsGnucLinux.h" # include "DefsGnucLinux.h"
# elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD # elif NV_OS_DARWIN || NV_OS_FREEBSD || NV_OS_OPENBSD || NV_OS_HAIKU
# include "DefsGnucDarwin.h" # include "DefsGnucDarwin.h"
# elif NV_OS_ORBIS # elif NV_OS_ORBIS
# include "DefsOrbis.h" # include "DefsOrbis.h"

5
thirdparty/thekla_atlas/poshlib/posh.h vendored
View file

@ -298,6 +298,11 @@ Metrowerks:
# define POSH_OS_STRING "Linux" # define POSH_OS_STRING "Linux"
#endif #endif
#if defined __HAIKU__
# define POSH_OS_HAIKU 1
# define POSH_OS_STRING "Haiku"
#endif
#if defined __FreeBSD__ #if defined __FreeBSD__
# define POSH_OS_FREEBSD 1 # define POSH_OS_FREEBSD 1
# define POSH_OS_STRING "FreeBSD" # define POSH_OS_STRING "FreeBSD"