diff options
| author | Rémi Verschelde | 2017-11-09 23:36:08 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-11-09 23:36:08 +0100 |
| commit | ed57f0a0d40e7fa8dde222c48cd5649d3f80008e (patch) | |
| tree | e25a7a5ce877126b8d8bd8f7a1d1b5a782d90ada /drivers | |
| parent | 9e6f9742f4443b0fdb7593ea1fc1b3a7dd46409c (diff) | |
| download | godot-ed57f0a0d40e7fa8dde222c48cd5649d3f80008e.tar.gz godot-ed57f0a0d40e7fa8dde222c48cd5649d3f80008e.tar.zst godot-ed57f0a0d40e7fa8dde222c48cd5649d3f80008e.zip | |
Remove get_default_video_mode definition on OSX/iOS
It had been missed in d09160a8b67fdc60e8108962c4e9bd4c0bc7f13e 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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_scene_gles3.cpp | 4 | ||||
| -rw-r--r-- | drivers/unix/os_unix.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index 8ec988bec..9a92e63c0 100644 --- 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 index 87e73534c..82c7dee3b 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -49,7 +49,6 @@ protected: //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; |