Bug fixes

Author: Rsnelllenberg

DVRViewPlugin/res/shaders/FullDataMaterialBlending.frag

@@ -32,7 +32,7 @@ layout(std430, binding = 2) buffer MeanPositions {
     float meanPositions[];
 };
 
-float getMaterialID(float[5] materials, vec3 samplePos) {
+float getMaterialID(inout float[5] materials, vec3 samplePos) {
     float firstMaterial = materials[0];
     float previousMaterial = materials[1];
 

DVRViewPlugin/res/shaders/MaterialTransition2D.frag

@@ -23,7 +23,7 @@ uniform vec3 u_maxClippingPlane;
 uniform bool useShading;
 uniform bool useClutterRemover;
 
-float getMaterialID(float[5] materials, vec3[5] samplePositions) {
+float getMaterialID(inout float[5] materials, inout vec3[5] samplePositions) {
     float firstMaterial = materials[0];
     float previousMaterial = materials[1];
 

DVRViewPlugin/src/VolumeRenderer.cpp

@@ -906,7 +906,7 @@ void VolumeRenderer::getGPUFullDataModeBatches(std::vector<float>& frontfacesDat
 
     //Create small batches of pixels that are spread out over the whole image ---
 
-    int numBatches = 1024; // Number of batches to divide the data into. (Tune as needed.)
+    int numBatches = 2048; // Number of batches to divide the data into. (Tune as needed.)
     std::vector<std::vector<int>> batches(numBatches); // Each element is a vector of pixel indices.
     // Instead of memory requirements (in bytes), we now record the number of samples per ray.
     std::vector<std::vector<int>> batchRaySampleAmount(numBatches);
@@ -979,7 +979,7 @@ void VolumeRenderer::getGPUFullDataModeBatches(std::vector<float>& frontfacesDat
     // Combine as many of the small batches as can possibly fit in the indicated GPU memory ---
 
     // Calculate available GPU memory for the batch transfer
-    size_t availableMemoryInBytes = _fullGPUMemorySize - _fullDataMemorySize - 100000; // ~100MB reserved for other data
+    size_t availableMemoryInBytes = std::min(int(_fullGPUMemorySize - _fullDataMemorySize - 100000), 2000000); // ~100MB reserved for other data
     if (availableMemoryInBytes < 0 || availableMemoryInBytes < maxBatchMemory)
         throw std::runtime_error("Not enough GPU memory available for the GPU-CPU batch transfer.");
 
@@ -1516,20 +1516,25 @@ void VolumeRenderer::renderCompositeColor()
 
     mv::Vector3f volumeSize;
     mv::Vector3f invVolumeSize;
+    mv::Vector3f dimesnionVolumeRatio;
     if (_useCustomRenderSpace) {
         volumeSize = _renderSpace;
         invVolumeSize = mv::Vector3f(1.0f / _renderSpace.x, 1.0f / _renderSpace.y, 1.0f / _renderSpace.z);
+        dimesnionVolumeRatio = mv::Vector3f(_renderSpace.x / _volumeSize.x, _renderSpace.y / _volumeSize.y, _renderSpace.z / _volumeSize.z);
     }
     else {
         volumeSize = _volumeSize;
         invVolumeSize = mv::Vector3f(1.0f / _volumeSize.x, 1.0f / _volumeSize.y, 1.0f / _volumeSize.z);
+        dimesnionVolumeRatio = mv::Vector3f(1.0f, 1.0f, 1.0f); // No custom render space, so ratio is 1:1
     }
 
     _colorCompositeShader.uniform3fv("dimensions", 1, &volumeSize);
     _colorCompositeShader.uniform3fv("invDimensions", 1, &invVolumeSize);
     _colorCompositeShader.uniform2f("invFaceTexSize", 1.0f / _adjustedScreenSize.width(), 1.0f / _adjustedScreenSize.height());
     _colorCompositeShader.uniform2f("invTfTexSize", 1.0f / _tfDataset->getImageSize().width(), 1.0f / _tfDataset->getImageSize().height());
 
+    //_colorCompositeShader.uniform3fv("dimensionVolumeRatio", 1, &dimesnionVolumeRatio);
+
     drawDVRQuad(_colorCompositeShader);
 
     _framebuffer.release();

DVRViewPlugin/src/VolumeRenderer.h

@@ -230,7 +230,7 @@ class VolumeRenderer : protected QOpenGLFunctions_4_3_Core
     mv::Vector3f _cameraPos;
 
     size_t _fullDataMemorySize = 0; // The size of the full data in bytes
-    size_t _fullGPUMemorySize = static_cast<size_t>(2 * 1024 * 1024) * 1024; // The size of the full data in bytes on the GPU if we use normal int it causes a overflow; The SSBOs are limited to 2GB, so even if the GPU has more VRAM we limit the size to 2GB for the full data mode. This is a hard limit, so we need to make sure that the data fits into this limit.
+    size_t _fullGPUMemorySize = static_cast<size_t>(2 * 1024 * 1024) * 1024; // The size of the full data in bytes on the GPU if we use normal int it causes a overflow; The SSBOs are limited to 2GB, so even if the GPU has more VRAM we limit the size to 2GB for the full data mode.
 
     // HNSWLib-related members  
     std::unique_ptr<hnswlib::L2Space> _hnswSpace;