Fix #230. The caches reporting different sizes

BlueBrain · Jan 12, 2016 · f931aae · f931aae
1 parent 7f7f9dc
commit f931aae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/doc/Changelog.md b/doc/Changelog.md
@@ -3,6 +3,9 @@ Changelog {#Changelog}
 
 # master {#master}
 
+
+* [#238](https://github.com/BlueBrain/Livre/pull/238):
+  Fix #230. The caches reporting different sizes
 * [#234](https://github.com/BlueBrain/Livre/pull/234):
   Fix #227. Rendering set generation is only done once
 * [#220](https://github.com/BlueBrain/Livre/pull/220):

diff --git a/livre/lib/cache/TextureDataObject.cpp b/livre/lib/cache/TextureDataObject.cpp
@@ -86,8 +86,11 @@ size_t TextureDataObject::getDataSize_() const
     if( !isValid() )
         return 0;
 
-    const Vector3i& voxSizeVec = lodNodePtr_->getVoxelBox( ).getDimension( );
-    return voxSizeVec[0] * voxSizeVec[1] * voxSizeVec[2];
+    const Vector3ui& overlap =
+                dataSourcePtr_->getVolumeInformation().overlap;
+    const Vector3ui blockSize =
+                lodNodePtr_->getBlockSize() + overlap * 2;
+    return blockSize.product();
 }
 
 size_t TextureDataObject::getCacheSize() const

diff --git a/livre/lib/cache/TextureObject.cpp b/livre/lib/cache/TextureObject.cpp
@@ -203,9 +203,9 @@ size_t TextureObject::getCacheSize( ) const
             break;
     }
 
-    const Vector3i textureSize = textureState_->texturePoolPtr->getMaxBlockSize();
-    const uint32_t cacheSize = textureSize[ 0 ] * textureSize[ 1 ] * textureSize[ 2 ] * elementSize;
-    return cacheSize;
+    const Vector3ui textureSize =
+            textureState_->texturePoolPtr->getMaxBlockSize();
+    return textureSize.product() * elementSize;
 }
 
 const TextureDataObject& TextureObject::getTextureDataObject_( ) const