fix warning about size_t >= 0 (which must always be true)
git-svn-id: http://skia.googlecode.com/svn/trunk@760 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/GrTextureCache.cpp b/gpu/src/GrTextureCache.cpp
index bc2a904..e27272e 100644
--- a/gpu/src/GrTextureCache.cpp
+++ b/gpu/src/GrTextureCache.cpp
@@ -274,17 +274,19 @@
return count;
}
+#if GR_DEBUG
+static bool both_zero_or_nonzero(int count, size_t bytes) {
+ return (count == 0 && bytes == 0) || (count > 0 && bytes > 0);
+}
+#endif
+
void GrTextureCache::validate() const {
GrAssert(!fHead == !fTail);
- GrAssert(!fEntryCount == !fEntryBytes);
- GrAssert(!fClientDetachedBytes == !fClientDetachedBytes);
+ GrAssert(both_zero_or_nonzero(fEntryCount, fEntryBytes));
+ GrAssert(both_zero_or_nonzero(fClientDetachedCount, fClientDetachedBytes));
GrAssert(fClientDetachedBytes <= fEntryBytes);
GrAssert(fClientDetachedCount <= fEntryCount);
GrAssert((fEntryCount - fClientDetachedCount) == fCache.count());
- GrAssert(fEntryBytes >= 0);
- GrAssert(fEntryCount >= 0);
- GrAssert(fClientDetachedCount >= 0);
- GrAssert(fClientDetachedBytes >= 0);
fCache.validate();