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

quiet compiler

Browse source
This commit is contained in:
Seth Alves 2015-07-13 07:37:59 -07:00
parent f011d5c7f7
commit 5aca0c28ef
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/entities/src/EntityItem.cpp
View file

@ -385,7 +385,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
dataAt += encodedID.size(); dataAt += encodedID.size();
bytesRead += encodedID.size(); bytesRead += encodedID.size();
Q_ASSERT(id == _id); Q_ASSERT(id == _id);
Q_ASSERT(parser.offset() == bytesRead); Q_ASSERT(parser.offset() == (unsigned int) bytesRead);
} }
#endif #endif
@ -400,8 +400,8 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
quint32 type = typeCoder; quint32 type = typeCoder;
EntityTypes::EntityType oldType = (EntityTypes::EntityType)type; EntityTypes::EntityType oldType = (EntityTypes::EntityType)type;
Q_ASSERT(oldType == _type); Q_ASSERT(oldType == _type);
Q_ASSERT(parser.offset() == bytesRead); Q_ASSERT(parser.offset() == (unsigned int) bytesRead);
#endif #endif
bool overwriteLocalData = true; // assume the new content overwrites our local data bool overwriteLocalData = true; // assume the new content overwrites our local data
quint64 now = usecTimestampNow(); quint64 now = usecTimestampNow();
@ -417,9 +417,9 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
dataAt += sizeof(createdFromBuffer2); dataAt += sizeof(createdFromBuffer2);
bytesRead += sizeof(createdFromBuffer2); bytesRead += sizeof(createdFromBuffer2);
Q_ASSERT(createdFromBuffer2 == createdFromBuffer); Q_ASSERT(createdFromBuffer2 == createdFromBuffer);
Q_ASSERT(parser.offset() == bytesRead); Q_ASSERT(parser.offset() == (unsigned int) bytesRead);
} }
#endif #endif
if (_created == UNKNOWN_CREATED_TIME) { if (_created == UNKNOWN_CREATED_TIME) {
// we don't yet have a _created timestamp, so we accept this one // we don't yet have a _created timestamp, so we accept this one
createdFromBuffer -= clockSkew; createdFromBuffer -= clockSkew;
@ -458,9 +458,9 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
dataAt += sizeof(lastEditedFromBuffer2); dataAt += sizeof(lastEditedFromBuffer2);
bytesRead += sizeof(lastEditedFromBuffer2); bytesRead += sizeof(lastEditedFromBuffer2);
Q_ASSERT(lastEditedFromBuffer2 == lastEditedFromBuffer); Q_ASSERT(lastEditedFromBuffer2 == lastEditedFromBuffer);
Q_ASSERT(parser.offset() == bytesRead); Q_ASSERT(parser.offset() == (unsigned int) bytesRead);
} }
#endif #endif
quint64 lastEditedFromBufferAdjusted = lastEditedFromBuffer - clockSkew; quint64 lastEditedFromBufferAdjusted = lastEditedFromBuffer - clockSkew;
if (lastEditedFromBufferAdjusted > now) { if (lastEditedFromBufferAdjusted > now) {
lastEditedFromBufferAdjusted = now; lastEditedFromBufferAdjusted = now;
@ -534,10 +534,10 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
encodedUpdateDelta = updateDeltaCoder; // determine true length encodedUpdateDelta = updateDeltaCoder; // determine true length
dataAt += encodedUpdateDelta.size(); dataAt += encodedUpdateDelta.size();
bytesRead += encodedUpdateDelta.size(); bytesRead += encodedUpdateDelta.size();
Q_ASSERT(parser.offset() == bytesRead); Q_ASSERT(parser.offset() == (unsigned int) bytesRead);
} }
#endif #endif
if (overwriteLocalData) { if (overwriteLocalData) {
_lastUpdated = lastEditedFromBufferAdjusted + updateDelta; // don't adjust for clock skew since we already did that _lastUpdated = lastEditedFromBufferAdjusted + updateDelta; // don't adjust for clock skew since we already did that
#ifdef WANT_DEBUG #ifdef WANT_DEBUG
@ -562,7 +562,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
encodedSimulatedDelta = simulatedDeltaCoder; // determine true length encodedSimulatedDelta = simulatedDeltaCoder; // determine true length
dataAt += encodedSimulatedDelta.size(); dataAt += encodedSimulatedDelta.size();
bytesRead += encodedSimulatedDelta.size(); bytesRead += encodedSimulatedDelta.size();
Q_ASSERT(parser.offset() == bytesRead); Q_ASSERT(parser.offset() == (unsigned int) bytesRead);
} }
#endif #endif
@ -599,7 +599,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
dataAt += propertyFlags.getEncodedLength(); dataAt += propertyFlags.getEncodedLength();
bytesRead += propertyFlags.getEncodedLength(); bytesRead += propertyFlags.getEncodedLength();
Q_ASSERT(propertyFlags2 == propertyFlags); Q_ASSERT(propertyFlags2 == propertyFlags);
Q_ASSERT(parser.offset() == bytesRead); Q_ASSERT(parser.offset() == (unsigned int)bytesRead);
} }
#endif #endif

1
libraries/gpu/src/gpu/GLBackend.cpp
View file

@ -204,7 +204,6 @@ void GLBackend::do_drawInstanced(Batch& batch, uint32 paramOffset) {
GLenum mode = _primitiveToGLmode[primitiveType]; GLenum mode = _primitiveToGLmode[primitiveType];
uint32 numVertices = batch._params[paramOffset + 2]._uint; uint32 numVertices = batch._params[paramOffset + 2]._uint;
uint32 startVertex = batch._params[paramOffset + 1]._uint; uint32 startVertex = batch._params[paramOffset + 1]._uint;
uint32 startInstance = batch._params[paramOffset + 0]._uint;
glDrawArraysInstancedARB(mode, startVertex, numVertices, numInstances); glDrawArraysInstancedARB(mode, startVertex, numVertices, numInstances);
(void) CHECK_GL_ERROR(); (void) CHECK_GL_ERROR();

7
tests/entities/src/main.cpp
View file

@ -85,7 +85,7 @@ void testByteCountCodedStable(const T& value) {
#ifndef QT_NO_DEBUG #ifndef QT_NO_DEBUG
auto consumed = decoder.decode(encoded.data(), encoded.size()); auto consumed = decoder.decode(encoded.data(), encoded.size());
#endif #endif
Q_ASSERT(consumed == originalEncodedSize); Q_ASSERT(consumed == (unsigned int)originalEncodedSize);
} }
@ -108,6 +108,9 @@ void testPropertyFlags(uint32_t value) {
original.setHasProperty((EntityPropertyList)i); original.setHasProperty((EntityPropertyList)i);
} }
QByteArray encoded = original.encode(); QByteArray encoded = original.encode();
#ifndef QT_NO_DEBUG
auto originalSize = encoded.size();
#endif
for (size_t i = 0; i < enumSize; ++i) { for (size_t i = 0; i < enumSize; ++i) {
encoded.append(qrand()); encoded.append(qrand());
} }
@ -123,7 +126,7 @@ void testPropertyFlags(uint32_t value) {
auto decodeSize = decodeNew.decode((const uint8_t*)encoded.data(), encoded.size()); auto decodeSize = decodeNew.decode((const uint8_t*)encoded.data(), encoded.size());
#endif #endif
Q_ASSERT(originalSize == decodeSize); Q_ASSERT(originalSize == decodeSize);
Q_ASSERT(decodeNew == original); Q_ASSERT(decodeNew == (unsigned int) original);
} }
} }