Sun compute pass only happens when sun is visible

CesiumGS · Sep 5, 2015 · 9484bc0 · 9484bc0
1 parent fd12159
commit 9484bc0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/Source/Scene/Scene.js b/Source/Scene/Scene.js
@@ -1482,11 +1482,10 @@ define([
             executeCommand(skyAtmosphereCommand, scene, context, passState);
         }
 
-        if (defined(sunComputeCommand)) {
-            sunComputeCommand.execute(scene._computeEngine);
-        }
-
         if (sunVisible) {
+            if (defined(sunComputeCommand)) {
+                sunComputeCommand.execute(scene._computeEngine);
+            }
             sunDrawCommand.execute(context, passState);
             if (scene.sunBloom) {
                 var framebuffer;

diff --git a/Source/Scene/Sun.js b/Source/Scene/Sun.js
@@ -91,12 +91,8 @@ define([
             boundingVolume : new BoundingSphere(),
             owner : this
         });
-        this._computeCommand = new ComputeCommand({
-            persists : false,
-            owner : this
-        });
         this._commands = {
-            drawCommand : undefined,
+            drawCommand : this._drawCommand,
             computeCommand : undefined
         };
         this._boundingVolume = new BoundingSphere();
@@ -169,7 +165,6 @@ define([
 
         var drawingBufferWidth = scene.drawingBufferWidth;
         var drawingBufferHeight = scene.drawingBufferHeight;
-        var computeCommand;
 
         if (!defined(this._texture) ||
                 drawingBufferWidth !== this._drawingBufferWidth ||
@@ -203,10 +198,15 @@ define([
                 }
             };
 
-            computeCommand = this._computeCommand;
-            computeCommand.fragmentShaderSource = SunTextureFS;
-            computeCommand.outputTexture = this._texture;
-            computeCommand.uniformMap = uniformMap;
+            this._commands.computeCommand = new ComputeCommand({
+                fragmentShaderSource : SunTextureFS,
+                outputTexture  : this._texture,
+                persists : false,
+                owner : this,
+                postExecute : function() {
+                    that._commands.computeCommand = undefined;
+                }
+            });
         }
 
         var drawCommand = this._drawCommand;
@@ -308,8 +308,6 @@ define([
         this._size = Math.ceil(Cartesian2.magnitude(Cartesian2.subtract(limbWC, positionWC, scratchCartesian4)));
         this._size = 2.0 * this._size * (1.0 + 2.0 * this._glowLengthTS);
 
-        this._commands.drawCommand = drawCommand;
-        this._commands.computeCommand = computeCommand;
         return this._commands;
     };
 

diff --git a/Specs/Renderer/ComputeCommandSpec.js b/Specs/Renderer/ComputeCommandSpec.js
@@ -78,7 +78,7 @@ defineSuite([
         }).toThrowDeveloperError();
     });
 
-    it('renderer resources are destroyed if persists is set to false', function() {
+    it('renderer resources are preserved or destroyed based on the persists flag', function() {
         var vertexShader = 'attribute vec4 position; void main() { gl_PointSize = 1.0; gl_Position = position; }';
         var fragmentShader = 'void main() { gl_FragColor = vec4(1.0); }';
         var shaderProgram = ShaderProgram.fromCache({
@@ -113,7 +113,7 @@ defineSuite([
             outputTexture : outputTexture
         });
 
-        // check that resources are not destroyed when persists is true
+        // check that resources are preserved when persists is true
         computeCommand.persists = true;
         scene.primitives.add(new CommandMockPrimitive(computeCommand));
         scene.renderForSpecs();
@@ -124,8 +124,8 @@ defineSuite([
         expect(vertexArray.isDestroyed()).toEqual(false);
         expect(outputTexture.isDestroyed()).toEqual(false);
 
-        // check that resources are destroyed when persists is false
-        // except outputTexture which is not destroyed by the compute command
+        // check that resources are destroyed when persists is false, except
+        // outputTexture which is always preserved
         computeCommand.persists = false;
         scene.primitives.add(new CommandMockPrimitive(computeCommand));
         scene.renderForSpecs();