Remove get_default_video_mode definition on OSX/iOS

It had been missed in d09160a and broke compilation for those platforms. Took the opportunity to run clang-format on the code base to fix some corner cases that went through our static tests/were overlooked recently.
godotengine · Nov 9, 2017 · ed57f0a · ed57f0a
1 parent 9e6f974
commit ed57f0a
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 44 deletions.
diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h
@@ -271,7 +271,7 @@ class Math {
 
 #elif defined(_MSC_VER) && _MSC_VER < 1800
 		__asm fld a __asm fistp b
-		/*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) )
+/*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) )
 		// use AT&T inline assembly style, document that
 		// we use memory as output (=m) and input (m)
 		__asm__ __volatile__ (

diff --git a/core/os/os.h b/core/os/os.h
@@ -1,4 +1,4 @@
-/************************************************************************* /
+/*************************************************************************/
 /*  os.h                                                                 */
 /*************************************************************************/
 /*                       This file is part of:                           */

diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp
@@ -1134,9 +1134,9 @@ bool RasterizerSceneGLES3::_setup_material(RasterizerStorageGLES3::Material *p_m
 		state.current_depth_draw = p_material->shader->spatial.depth_draw_mode;
 	}
 
-	//glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
+//glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
 
-	/*
+/*
 	if (p_material->flags[VS::MATERIAL_FLAG_WIREFRAME])
 		glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
 	else

diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h
@@ -49,7 +49,6 @@ class OS_Unix : public OS {
 
 	//virtual int get_video_driver_count() const;
 	//virtual const char * get_video_driver_name(int p_driver) const;
-	//virtual VideoMode get_default_video_mode() const;
 
 	virtual int get_audio_driver_count() const;
 	virtual const char *get_audio_driver_name(int p_driver) const;

diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp
@@ -62,11 +62,6 @@ OSIPhone *OSIPhone::get_singleton() {
 	return (OSIPhone *)OS::get_singleton();
 };
 
-OS::VideoMode OSIPhone::get_default_video_mode() const {
-
-	return video_mode;
-};
-
 uint8_t OSIPhone::get_orientations() const {
 
 	return supported_orientations;

diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h
@@ -83,8 +83,6 @@ class OSIPhone : public OS_Unix {
 	virtual int get_video_driver_count() const;
 	virtual const char *get_video_driver_name(int p_driver) const;
 
-	virtual VideoMode get_default_video_mode() const;
-
 	virtual void initialize_logger();
 	virtual void initialize_core();
 	virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);

diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
@@ -899,16 +899,6 @@ - (BOOL)canBecomeKeyWindow {
 	return "GLES2";
 }
 
-OS::VideoMode OS_OSX::get_default_video_mode() const {
-
-	VideoMode vm;
-	vm.width = 1024;
-	vm.height = 600;
-	vm.fullscreen = false;
-	vm.resizable = true;
-	return vm;
-}
-
 void OS_OSX::initialize_core() {
 
 	crash_handler.initialize();

diff --git a/platform/uwp/gl_context_egl.cpp b/platform/uwp/gl_context_egl.cpp
@@ -101,26 +101,25 @@ Error ContextEGL::initialize() {
 
 	try {
 
-		const EGLint displayAttributes[] =
-				{
-					/*EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
-					EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, 9,
-					EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE, 3,
-					EGL_NONE,*/
-					// These are the default display attributes, used to request ANGLE's D3D11 renderer.
-					// eglInitialize will only succeed with these attributes if the hardware supports D3D11 Feature Level 10_0+.
-					EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
-
-					// EGL_ANGLE_DISPLAY_ALLOW_RENDER_TO_BACK_BUFFER is an optimization that can have large performance benefits on mobile devices.
-					// Its syntax is subject to change, though. Please update your Visual Studio templates if you experience compilation issues with it.
-					//EGL_ANGLE_DISPLAY_ALLOW_RENDER_TO_BACK_BUFFER, EGL_TRUE,
-
-					// EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE is an option that enables ANGLE to automatically call
-					// the IDXGIDevice3::Trim method on behalf of the application when it gets suspended.
-					// Calling IDXGIDevice3::Trim when an application is suspended is a Windows Store application certification requirement.
-					EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE, EGL_TRUE,
-					EGL_NONE,
-				};
+		const EGLint displayAttributes[] = {
+			/*EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
+			EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, 9,
+			EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE, 3,
+			EGL_NONE,*/
+			// These are the default display attributes, used to request ANGLE's D3D11 renderer.
+			// eglInitialize will only succeed with these attributes if the hardware supports D3D11 Feature Level 10_0+.
+			EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
+
+			// EGL_ANGLE_DISPLAY_ALLOW_RENDER_TO_BACK_BUFFER is an optimization that can have large performance benefits on mobile devices.
+			// Its syntax is subject to change, though. Please update your Visual Studio templates if you experience compilation issues with it.
+			//EGL_ANGLE_DISPLAY_ALLOW_RENDER_TO_BACK_BUFFER, EGL_TRUE,
+
+			// EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE is an option that enables ANGLE to automatically call
+			// the IDXGIDevice3::Trim method on behalf of the application when it gets suspended.
+			// Calling IDXGIDevice3::Trim when an application is suspended is a Windows Store application certification requirement.
+			EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE, EGL_TRUE,
+			EGL_NONE,
+		};
 
 		PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT"));
 

diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
@@ -83,10 +83,10 @@
 #include "scene/gui/link_button.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/menu_button.h"
+#include "scene/gui/nine_patch_rect.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/panel_container.h"
-#include "scene/gui/nine_patch_rect.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/reference_rect.h"

diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp
@@ -571,7 +571,7 @@ void DynamicFontAtSize::_update_char(CharType p_char) {
 						wr[ofs + 0] = 255; //grayscale as 1
 						wr[ofs + 1] = slot->bitmap.buffer[i * slot->bitmap.pitch + j];
 						break;
-						// TODO: FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_BGRA
+					// TODO: FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_BGRA
 					default:
 						ERR_EXPLAIN("Font uses unsupported pixel format: " + itos(slot->bitmap.pixel_mode));
 						ERR_FAIL();