sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a shitload of warnings in 64 bits mode

Browse Source 
Former-commit-id: c7792a7d5b1f85ab934da25324831b9daa3f47ff [formerly 3469974c48432be1f65808bff0ea39d9e22f5b50]
Former-commit-id: 5080815e9e1a3aebe237ff9a291b908ce0292eca
This commit is contained in:
Lynix
2016-06-13 21:09:55 +02:00
parent f36eec7346
commit 819b46f5fc
39 changed files with 191 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Renderer/Renderer.cpp
View File

@@ -227,7 +227,8 @@ namespace Nz
}
GLenum type;
UInt8* offset = reinterpret_cast<UInt8*>(s_indexBuffer->GetStartOffset());
UInt8* offset = nullptr;
offset += s_indexBuffer->GetStartOffset();
if (s_indexBuffer->HasLargeIndices())
{
@@ -290,7 +291,8 @@ namespace Nz
}
GLenum type;
UInt8* offset = reinterpret_cast<UInt8*>(s_indexBuffer->GetStartOffset());
UInt8* offset = nullptr;
offset += s_indexBuffer->GetStartOffset();
if (s_indexBuffer->HasLargeIndices())
{

4
src/Nazara/Renderer/Texture.cpp
View File

@@ -364,7 +364,7 @@ namespace Nz
return Image::GetMaxLevel(m_impl->type, m_impl->width, m_impl->height, m_impl->depth);
}
unsigned int Texture::GetMemoryUsage() const
std::size_t Texture::GetMemoryUsage() const
{
#if NAZARA_RENDERER_SAFE
if (!m_impl)
@@ -399,7 +399,7 @@ namespace Nz
return size * PixelFormat::GetBytesPerPixel(m_impl->format);
}
unsigned int Texture::GetMemoryUsage(UInt8 level) const
std::size_t Texture::GetMemoryUsage(UInt8 level) const
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)