Merge pull request #521 from Kitware/tighter_shader_rebuilds

fix(Rendering): tighten up the shader rebuild code
Kitware · Jan 23, 2018 · 62699bd · 62699bd
2 parents 79abfc5 + d362585
commit 62699bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Sources/Rendering/OpenGL/ImageMapper/index.js b/Sources/Rendering/OpenGL/ImageMapper/index.js
@@ -186,14 +186,16 @@ function vtkOpenGLImageMapper(publicAPI, model) {
     // property modified (representation interpolation and lighting)
     // input modified
     // light complexity changed
+
+    const tNumComp = model.openGLTexture.getComponents();
+
     if (
       model.lastHaveSeenDepthRequest !== model.haveSeenDepthRequest ||
       cellBO.getProgram() === 0 ||
-      cellBO.getShaderSourceTime().getMTime() < publicAPI.getMTime() ||
-      cellBO.getShaderSourceTime().getMTime() < actor.getMTime() ||
-      cellBO.getShaderSourceTime().getMTime() < model.currentInput.getMTime()
+      model.lastTextureComponents !== tNumComp
     ) {
       model.lastHaveSeenDepthRequest = model.haveSeenDepthRequest;
+      model.lastTextureComponents = tNumComp;
       return true;
     }
 
@@ -650,6 +652,7 @@ const DEFAULT_VALUES = {
   colorTexture: null,
   lastHaveSeenDepthRequest: false,
   haveSeenDepthRequest: false,
+  lastTextureComponents: 0,
 };
 
 // ----------------------------------------------------------------------------

diff --git a/Sources/Rendering/OpenGL/VolumeMapper/index.js b/Sources/Rendering/OpenGL/VolumeMapper/index.js
@@ -387,7 +387,8 @@ function vtkOpenGLVolumeMapper(publicAPI, model) {
     if (
       cellBO.getProgram() === 0 ||
       needRebuild ||
-      model.lastZBufferTexture !== model.zBufferTexture ||
+      model.lastHaveSeenDepthRequest !== model.haveSeenDepthRequest ||
+      !!model.lastZBufferTexture !== !!model.zBufferTexture ||
       cellBO.getShaderSourceTime().getMTime() < publicAPI.getMTime() ||
       cellBO.getShaderSourceTime().getMTime() < actor.getMTime() ||
       cellBO.getShaderSourceTime().getMTime() < model.currentInput.getMTime()