Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 21:56:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings

Browse source
This commit is contained in:
Atlante45 2015-10-09 13:29:59 -07:00
parent 51fc43ea4c
commit cba8b0962d
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu/src/gpu/GLBackendTexture.cpp
View file

@ -339,8 +339,6 @@ GLBackend::GLTexture* GLBackend::syncGPUObject(const Texture& texture) {
GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(texture.getTexelFormat(), srcFormat); GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(texture.getTexelFormat(), srcFormat);
auto semantic = texture.getTexelFormat().getSemantic();
glTexImage2D(GL_TEXTURE_2D, 0, glTexImage2D(GL_TEXTURE_2D, 0,
texelFormat.internalFormat, texture.getWidth(), texture.getHeight(), 0, texelFormat.internalFormat, texture.getWidth(), texture.getHeight(), 0,
texelFormat.format, texelFormat.type, bytes); texelFormat.format, texelFormat.type, bytes);

6
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
View file

@ -68,10 +68,10 @@ const float DEFAULT_REACH_LENGTH = 1.5f;
SixenseManager::SixenseManager() : SixenseManager::SixenseManager() :
InputDevice("Hydra"), InputDevice("Hydra"),
#ifdef __APPLE__
_sixenseLibrary(NULL),
#endif
_reachLength(DEFAULT_REACH_LENGTH), _reachLength(DEFAULT_REACH_LENGTH),
#ifdef __APPLE__
_sixenseLibrary(nullptr),
#endif
_hydrasConnected(false) _hydrasConnected(false)
{ {
} }