Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #76856 from HolonProduction/macos-specific 

Don't expose macOS and iOS specific display servers.
4.1
Rémi Verschelde 2023-05-11 11:47:58 +07:00
parent a745bf3802 ddcb2d157d
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
Unescape Escape View File

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

2
platform/ios/display_server_ios.h
Unescape Escape View File

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

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

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

2
platform/macos/display_server_macos.h
Unescape Escape View File

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

2
platform/web/display_server_web.h
Unescape Escape View File

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

3
platform/windows/display_server_windows.h
Unescape Escape View File

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