godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Fix some more build issues after c69de2ba4

Browse Source 
Fixes #20301.
This commit is contained in:
Rémi Verschelde
2018-07-20 11:56:18 +02:00
parent 2662c7e3d1
commit 814fdd3985
6 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/haiku/os_haiku.cpp
View File

@@ -80,6 +80,10 @@ const char *OS_Haiku::get_video_driver_name(int p_driver) const {
return "GLES3"; return "GLES3";
} }
int OS_Haiku::get_current_video_driver() const {
return video_driver_index;
}
Error OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) { Error OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
main_loop = NULL; main_loop = NULL;
current_video_mode = p_desired; current_video_mode = p_desired;
@@ -124,6 +128,8 @@ Error OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p
} }
*/ */
video_driver_index = p_video_driver;
input = memnew(InputDefault); input = memnew(InputDefault);
window->SetInput(input); window->SetInput(input);

2
platform/haiku/os_haiku.h
View File

@@ -51,6 +51,7 @@ private:
Rasterizer *rasterizer; Rasterizer *rasterizer;
VisualServer *visual_server; VisualServer *visual_server;
VideoMode current_video_mode; VideoMode current_video_mode;
int video_driver_index;
PowerHaiku *power_manager; PowerHaiku *power_manager;
#ifdef MEDIA_KIT_ENABLED #ifdef MEDIA_KIT_ENABLED
@@ -66,6 +67,7 @@ private:
protected: protected:
virtual int get_video_driver_count() const; virtual int get_video_driver_count() const;
virtual const char *get_video_driver_name(int p_driver) const; virtual const char *get_video_driver_name(int p_driver) const;
virtual int get_current_video_driver() const;
virtual Error initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); virtual Error initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);
virtual void finalize(); virtual void finalize();

5
platform/server/os_server.h
View File

@@ -47,7 +47,6 @@
class OS_Server : public OS_Unix { class OS_Server : public OS_Unix {
//Rasterizer *rasterizer;
VisualServer *visual_server; VisualServer *visual_server;
VideoMode current_videomode; VideoMode current_videomode;
List<String> args; List<String> args;
@@ -73,7 +72,7 @@ class OS_Server : public OS_Unix {
protected: protected:
virtual int get_video_driver_count() const; virtual int get_video_driver_count() const;
virtual const char *get_video_driver_name(int p_driver) const; virtual const char *get_video_driver_name(int p_driver) const;
virtual int get_current_video_driver() const;
virtual int get_audio_driver_count() const; virtual int get_audio_driver_count() const;
virtual const char *get_audio_driver_name(int p_driver) const; virtual const char *get_audio_driver_name(int p_driver) const;
@@ -86,8 +85,6 @@ protected:
public: public:
virtual String get_name(); virtual String get_name();
virtual int get_current_video_driver() const;
virtual void set_cursor_shape(CursorShape p_shape); virtual void set_cursor_shape(CursorShape p_shape);
virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot); virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot);

6
platform/uwp/os_uwp.cpp
View File

@@ -77,6 +77,10 @@ Size2 OSUWP::get_window_size() const {
return size; return size;
} }
int OSUWP::get_current_video_driver() const {
return video_driver_index;
}
void OSUWP::set_window_size(const Size2 p_size) { void OSUWP::set_window_size(const Size2 p_size) {
Windows::Foundation::Size new_size; Windows::Foundation::Size new_size;
@@ -237,6 +241,8 @@ Error OSUWP::initialize(const VideoMode &p_desired, int p_video_driver, int p_au
} }
gl_context->set_use_vsync(vm.use_vsync); gl_context->set_use_vsync(vm.use_vsync);
video_driver_index = p_video_driver;
visual_server = memnew(VisualServerRaster); visual_server = memnew(VisualServerRaster);
// FIXME: Reimplement threaded rendering? Or remove? // FIXME: Reimplement threaded rendering? Or remove?
/* /*

2
platform/uwp/os_uwp.h
View File

@@ -99,6 +99,7 @@ private:
Windows::UI::Core::CoreWindow ^ window; Windows::UI::Core::CoreWindow ^ window;
VideoMode video_mode; VideoMode video_mode;
int video_driver_index;
MainLoop *main_loop; MainLoop *main_loop;
@@ -154,6 +155,7 @@ private:
// functions used by main to initialize/deintialize the OS // functions used by main to initialize/deintialize the OS
protected: protected:
virtual int get_video_driver_count() const; virtual int get_video_driver_count() const;
virtual int get_current_video_driver() const;
virtual void initialize_core(); virtual void initialize_core();
virtual Error initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); virtual Error initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);

4
platform/x11/os_x11.h
View File

@@ -196,6 +196,8 @@ class OS_X11 : public OS_Unix {
Bool xrandr_ext_ok; Bool xrandr_ext_ok;
protected: protected:
virtual int get_current_video_driver() const;
virtual void initialize_core(); virtual void initialize_core();
virtual Error initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); virtual Error initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);
virtual void finalize(); virtual void finalize();
@@ -207,8 +209,6 @@ protected:
bool is_window_maximize_allowed(); bool is_window_maximize_allowed();
public: public:
virtual int get_current_video_driver() const;
virtual String get_name(); virtual String get_name();
virtual void set_cursor_shape(CursorShape p_shape); virtual void set_cursor_shape(CursorShape p_shape);