godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76856 from HolonProduction/macos-specific

Browse Source 
Don't expose macOS and iOS specific display servers.
This commit is contained in:
Rémi Verschelde 2023-05-11 11:47:58 +02:00
commit a1db628eb3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/display_server_android.h
View File

@ -39,6 +39,8 @@ class RenderingDeviceVulkan;
#endif #endif
class DisplayServerAndroid : public DisplayServer { class DisplayServerAndroid : public DisplayServer {
// No need to register with GDCLASS, it's platform-specific and nothing is added.
String rendering_driver; String rendering_driver;
// https://developer.android.com/reference/android/view/PointerIcon // https://developer.android.com/reference/android/view/PointerIcon

2
platform/ios/display_server_ios.h
View File

@ -55,7 +55,7 @@
#import <QuartzCore/CAMetalLayer.h> #import <QuartzCore/CAMetalLayer.h>
class DisplayServerIOS : public DisplayServer { class DisplayServerIOS : public DisplayServer {
GDCLASS(DisplayServerIOS, DisplayServer) // No need to register with GDCLASS, it's platform-specific and nothing is added.
_THREAD_SAFE_CLASS_ _THREAD_SAFE_CLASS_

3
platform/linuxbsd/x11/display_server_x11.h
View File

@ -119,8 +119,7 @@ typedef struct _xrr_monitor_info {
#undef CursorShape #undef CursorShape
class DisplayServerX11 : public DisplayServer { class DisplayServerX11 : public DisplayServer {
//No need to register, it's platform-specific and nothing is added // No need to register with GDCLASS, it's platform-specific and nothing is added.
//GDCLASS(DisplayServerX11, DisplayServer)
_THREAD_SAFE_CLASS_ _THREAD_SAFE_CLASS_

2
platform/macos/display_server_macos.h
View File

@ -56,7 +56,7 @@
#undef CursorShape #undef CursorShape
class DisplayServerMacOS : public DisplayServer { class DisplayServerMacOS : public DisplayServer {
GDCLASS(DisplayServerMacOS, DisplayServer) // No need to register with GDCLASS, it's platform-specific and nothing is added.
_THREAD_SAFE_CLASS_ _THREAD_SAFE_CLASS_

2
platform/web/display_server_web.h
View File

@ -37,6 +37,8 @@
#include <emscripten/html5.h> #include <emscripten/html5.h>
class DisplayServerWeb : public DisplayServer { class DisplayServerWeb : public DisplayServer {
// No need to register with GDCLASS, it's platform-specific and nothing is added.
private: private:
struct JSTouchEvent { struct JSTouchEvent {
uint32_t identifier[32] = { 0 }; uint32_t identifier[32] = { 0 };

3
platform/windows/display_server_windows.h
View File

@ -280,8 +280,7 @@ typedef struct {
} ICONDIR, *LPICONDIR; } ICONDIR, *LPICONDIR;
class DisplayServerWindows : public DisplayServer { class DisplayServerWindows : public DisplayServer {
//No need to register, it's platform-specific and nothing is added // No need to register with GDCLASS, it's platform-specific and nothing is added.
//GDCLASS(DisplayServerWindows, DisplayServer)
_THREAD_SAFE_CLASS_ _THREAD_SAFE_CLASS_