oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Travis: Update clang from 4.0 to 5.0 (#6467)

Browse source 
* Update clang from 4.0 to 5.0
This commit is contained in:
Loïc Blot 2017-10-09 11:32:06 +02:00 • committed by GitHub
parent e6e5fa3bf8
commit 17016090e3
12 changed files with 55 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/client/renderingengine.cpp
View file

@ -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];