Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 17:17:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings on mac and ubuntu

Browse source
This commit is contained in:
Olivier Prat 2018-02-23 19:37:12 +01:00
parent c935111c43
commit 37fdf81f1b
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/gpu-gl/src/gpu/gl/GLTexelFormat.cpp
View file

@ -185,6 +185,8 @@ GLenum GLTexelFormat::evalGLTexelFormatInternal(const gpu::Element& dstFormat) {
break; break;
case gpu::NUINT32: case gpu::NUINT32:
case gpu::NINT32: case gpu::NINT32:
case gpu::NUINT2:
case gpu::NINT2_10_10_10:
case gpu::COMPRESSED: case gpu::COMPRESSED:
case gpu::NUM_TYPES: // quiet compiler case gpu::NUM_TYPES: // quiet compiler
Q_UNREACHABLE(); Q_UNREACHABLE();
@ -663,6 +665,8 @@ GLTexelFormat GLTexelFormat::evalGLTexelFormat(const Element& dstFormat, const E
break; break;
case gpu::NUINT32: case gpu::NUINT32:
case gpu::NINT32: case gpu::NINT32:
case gpu::NUINT2:
case gpu::NINT2_10_10_10:
case gpu::COMPRESSED: case gpu::COMPRESSED:
case gpu::NUM_TYPES: // quiet compiler case gpu::NUM_TYPES: // quiet compiler
Q_UNREACHABLE(); Q_UNREACHABLE();

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

@ -42,8 +42,6 @@ Batch::Batch(const char* name) {
if (name) { if (name) {
_name = name; _name = name;
} }
#else
(void*)name;
#endif #endif
_commands.reserve(_commandsMax); _commands.reserve(_commandsMax);
_commandOffsets.reserve(_commandOffsetsMax); _commandOffsets.reserve(_commandOffsetsMax);

5
libraries/gpu/src/gpu/Buffer.cpp
View file

@ -98,8 +98,9 @@ Buffer::Update::Update(const Buffer& parent) : buffer(parent) {
void Buffer::Update::apply() const { void Buffer::Update::apply() const {
// Make sure we're loaded in order // Make sure we're loaded in order
auto applyUpdateCount = ++buffer._applyUpdateCount; buffer._applyUpdateCount++;
assert(applyUpdateCount == updateNumber); assert(buffer._applyUpdateCount == updateNumber);
const auto pageSize = buffer._pages._pageSize; const auto pageSize = buffer._pages._pageSize;
buffer._renderSysmem.resize(size); buffer._renderSysmem.resize(size);
buffer._renderPages.accommodate(size); buffer._renderPages.accommodate(size);

3
libraries/render-utils/src/AntialiasingEffect.h
View file

@ -189,9 +189,6 @@ public:
private: private:
// Uniforms for AA
gpu::int32 _texcoordOffsetLoc;
gpu::FramebufferSwapChainPointer _antialiasingBuffers; gpu::FramebufferSwapChainPointer _antialiasingBuffers;
gpu::TexturePointer _antialiasingTextures[2]; gpu::TexturePointer _antialiasingTextures[2];

1
libraries/render-utils/src/VelocityBufferPass.cpp
View file

@ -18,7 +18,6 @@
const int VelocityBufferPass_FrameTransformSlot = 0; const int VelocityBufferPass_FrameTransformSlot = 0;
const int VelocityBufferPass_DepthMapSlot = 0; const int VelocityBufferPass_DepthMapSlot = 0;
const int VelocityBufferPass_NormalMapSlot = 1;
#include "velocityBuffer_cameraMotion_frag.h" #include "velocityBuffer_cameraMotion_frag.h"