ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix OSX 10.7 compilation

Browse Source
This commit is contained in:
Marianne Gagnon 2014-05-13 19:39:19 -04:00
parent 20959f970a
commit 03ad82267a
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/glwrap.cpp
View File

@ -490,6 +490,7 @@ ScopedGPUTimer::ScopedGPUTimer(GPUTimer &timer)
if (!UserConfigParams::m_profiler_enabled) return; if (!UserConfigParams::m_profiler_enabled) return;
if (profiler.isFrozen()) return; if (profiler.isFrozen()) return;
#ifdef GL_TIME_ELAPSED
irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver *)irr_driver->getDevice()->getVideoDriver(); irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver *)irr_driver->getDevice()->getVideoDriver();
if (!timer.initialised) if (!timer.initialised)
{ {
@ -497,14 +498,17 @@ ScopedGPUTimer::ScopedGPUTimer(GPUTimer &timer)
timer.initialised = true; timer.initialised = true;
} }
gl_driver->extGlBeginQuery(GL_TIME_ELAPSED, timer.query); gl_driver->extGlBeginQuery(GL_TIME_ELAPSED, timer.query);
#endif
} }
ScopedGPUTimer::~ScopedGPUTimer() ScopedGPUTimer::~ScopedGPUTimer()
{ {
if (!UserConfigParams::m_profiler_enabled) return; if (!UserConfigParams::m_profiler_enabled) return;
if (profiler.isFrozen()) return; if (profiler.isFrozen()) return;
#ifdef GL_TIME_ELAPSED
irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver *)irr_driver->getDevice()->getVideoDriver(); irr::video::COpenGLDriver *gl_driver = (irr::video::COpenGLDriver *)irr_driver->getDevice()->getVideoDriver();
gl_driver->extGlEndQuery(GL_TIME_ELAPSED); gl_driver->extGlEndQuery(GL_TIME_ELAPSED);
#endif
} }
GPUTimer::GPUTimer() : initialised(false) GPUTimer::GPUTimer() : initialised(false)

6
src/graphics/glwrap.hpp
View File

@ -5,6 +5,12 @@
# include <OpenGL/gl.h> # include <OpenGL/gl.h>
# include <OpenGL/gl3.h> # include <OpenGL/gl3.h>
# define OGL32CTX # define OGL32CTX
# ifdef GL_ARB_instanced_arrays
# define glVertexAttribDivisor glVertexAttribDivisorARB
# endif
# ifndef GL_TEXTURE_SWIZZLE_RGBA
# define GL_TEXTURE_SWIZZLE_RGBA 0x8E46
# endif
#elif defined(ANDROID) #elif defined(ANDROID)
# include <GLES/gl.h> # include <GLES/gl.h>
#elif defined(WIN32) #elif defined(WIN32)

2
src/network/protocols/connect_to_server.cpp
View File

@ -153,7 +153,7 @@ void ConnectToServer::asynchronousUpdate()
if (m_server_address.ip == 0 || m_server_address.port == 0) if (m_server_address.ip == 0 || m_server_address.port == 0)
{ // server data not correct, hide address and stop { // server data not correct, hide address and stop
m_state = HIDING_ADDRESS; m_state = HIDING_ADDRESS;
Log::error("ConnectToServer", "Server address is "ADDRESS_FORMAT, ADDRESS_ARGS(m_server_address.ip, m_server_address.port)); Log::error("ConnectToServer", "Server address is " ADDRESS_FORMAT, ADDRESS_ARGS(m_server_address.ip, m_server_address.port));
m_current_protocol_id = m_listener->requestStart(new HidePublicAddress()); m_current_protocol_id = m_listener->requestStart(new HidePublicAddress());
return; return;
} }