godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-06 17:25:19 +00:00
Code Releases Wiki Activity

Remove get_default_video_mode definition on OSX/iOS

Browse Source 
It had been missed in d09160a8b6 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.
This commit is contained in:
Rémi Verschelde
2017-11-09 23:36:08 +01:00
parent 9e6f9742f4
commit ed57f0a0d4
10 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/math/math_funcs.h
View File

@@ -271,7 +271,7 @@ public:
#elif defined(_MSC_VER) && _MSC_VER < 1800 #elif defined(_MSC_VER) && _MSC_VER < 1800
__asm fld a __asm fistp b __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 // use AT&T inline assembly style, document that
// we use memory as output (=m) and input (m) // we use memory as output (=m) and input (m)
__asm__ __volatile__ ( __asm__ __volatile__ (

2
core/os/os.h
View File

@@ -1,4 +1,4 @@
/************************************************************************* / /*************************************************************************/
/* os.h */ /* os.h */
/*************************************************************************/ /*************************************************************************/
/* This file is part of: */ /* This file is part of: */

4
drivers/gles3/rasterizer_scene_gles3.cpp
View File

@@ -1134,9 +1134,9 @@ bool RasterizerSceneGLES3::_setup_material(RasterizerStorageGLES3::Material *p_m
state.current_depth_draw = p_material->shader->spatial.depth_draw_mode; 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]) if (p_material->flags[VS::MATERIAL_FLAG_WIREFRAME])
glPolygonMode(GL_FRONT_AND_BACK,GL_LINE); glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
else else

1
drivers/unix/os_unix.h
View File

@@ -49,7 +49,6 @@ 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 VideoMode get_default_video_mode() 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;

5
platform/iphone/os_iphone.cpp
View File

@@ -62,11 +62,6 @@ OSIPhone *OSIPhone::get_singleton() {
return (OSIPhone *)OS::get_singleton(); return (OSIPhone *)OS::get_singleton();
}; };
OS::VideoMode OSIPhone::get_default_video_mode() const {
return video_mode;
};
uint8_t OSIPhone::get_orientations() const { uint8_t OSIPhone::get_orientations() const {
return supported_orientations; return supported_orientations;

2
platform/iphone/os_iphone.h
View File

@@ -83,8 +83,6 @@ private:
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 VideoMode get_default_video_mode() const;
virtual void initialize_logger(); virtual void initialize_logger();
virtual void initialize_core(); virtual void initialize_core();
virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);

10
platform/osx/os_osx.mm
View File

@@ -899,16 +899,6 @@ const char *OS_OSX::get_video_driver_name(int p_driver) const {
return "GLES2"; 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() { void OS_OSX::initialize_core() {
crash_handler.initialize(); crash_handler.initialize();

35
platform/uwp/gl_context_egl.cpp
View File

@@ -101,26 +101,25 @@ Error ContextEGL::initialize() {
try { try {
const EGLint displayAttributes[] = const EGLint displayAttributes[] = {
{ /*EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
/*EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE, EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, 9,
EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, 9, EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE, 3,
EGL_PLATFORM_ANGLE_MAX_VERSION_MINOR_ANGLE, 3, EGL_NONE,*/
EGL_NONE,*/ // These are the default display attributes, used to request ANGLE's D3D11 renderer.
// 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+.
// 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_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. // 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. // 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_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 // 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. // 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. // 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_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE, EGL_TRUE,
EGL_NONE, EGL_NONE,
}; };
PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT")); PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT"));

2
scene/register_scene_types.cpp
View File

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

2
scene/resources/dynamic_font.cpp
View File

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