diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-10-09 11:32:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 11:32:06 +0200 |
| commit | 17016090e38cc44e58517129278c28dd7943b4cc (patch) | |
| tree | a0ba6d0628f333c28b2e584cc6eb6d1ef413aa07 /src/client | |
| parent | e6e5fa3bf8853f149fdef16b39af3981097176a4 (diff) | |
| download | minetest-17016090e38cc44e58517129278c28dd7943b4cc.tar.gz minetest-17016090e38cc44e58517129278c28dd7943b4cc.tar.bz2 minetest-17016090e38cc44e58517129278c28dd7943b4cc.zip | |
Travis: Update clang from 4.0 to 5.0 (#6467)
* Update clang from 4.0 to 5.0
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/renderingengine.cpp | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp index 705871160..b3abd824d 100644 --- a/src/client/renderingengine.cpp +++ b/src/client/renderingengine.cpp @@ -93,10 +93,11 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver) params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu"); params.ZBufferBits = 24; #ifdef __ANDROID__ + // clang-format off params.PrivateData = porting::app_global; - params.OGLES2ShaderPath = std::string( - porting::path_user + DIR_DELIM + "media" + DIR_DELIM + "Shaders" + - DIR_DELIM).c_str(); + params.OGLES2ShaderPath = std::string(porting::path_user + DIR_DELIM + "media" + + DIR_DELIM + "Shaders" + DIR_DELIM).c_str(); + // clang-format on #endif m_device = createDeviceEx(params); @@ -233,7 +234,7 @@ bool RenderingEngine::setWindowIcon() const HICON hicon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(130) // The ID of the ICON defined in // winresource.rc - ); + ); if (hicon) { SendMessage(hWnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hicon)); @@ -997,8 +998,14 @@ void RenderingEngine::draw_plain(Camera *camera, bool show_hud, Hud *hud, const char *RenderingEngine::getVideoDriverName(irr::video::E_DRIVER_TYPE type) { static const char *driver_ids[] = { - "null", "software", "burningsvideo", "direct3d8", "direct3d9", - "opengl", "ogles1", "ogles2", + "null", + "software", + "burningsvideo", + "direct3d8", + "direct3d9", + "opengl", + "ogles1", + "ogles2", }; return driver_ids[type]; @@ -1007,8 +1014,14 @@ const char *RenderingEngine::getVideoDriverName(irr::video::E_DRIVER_TYPE type) const char *RenderingEngine::getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type) { static const char *driver_names[] = { - "NULL Driver", "Software Renderer", "Burning's Video", - "Direct3D 8", "Direct3D 9", "OpenGL", "OpenGL ES1", "OpenGL ES2", + "NULL Driver", + "Software Renderer", + "Burning's Video", + "Direct3D 8", + "Direct3D 9", + "OpenGL", + "OpenGL ES1", + "OpenGL ES2", }; return driver_names[type]; |