Ensure that the trace accum. is cleared once when doing muti-spp

rendering
achilleasa · Oct 5, 2016 · c7c186f · c7c186f
1 parent a9cfb94
commit c7c186f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/renderer/opengl.go b/renderer/opengl.go
@@ -143,7 +143,6 @@ func (r *interactiveGLRenderer) Render() error {
 		// Render frame unless we have reached our target SPP
 		if r.options.SamplesPerPixel == 0 || (r.options.SamplesPerPixel != 0 && r.accumulatedSamples < r.defaultRenderer.options.SamplesPerPixel) {
 			err := r.renderFrame(r.accumulatedSamples)
-			r.accumulatedSamples++
 			if err != nil {
 				r.Unlock()
 				return err

diff --git a/tracer/opencl/pipeline.go b/tracer/opencl/pipeline.go
@@ -101,11 +101,6 @@ func MonteCarloIntegrator(debugFlags DebugFlag) PipelineStage {
 
 		var activeRayBuf uint32 = 0
 
-		_, err = tr.resources.ClearTraceAccumulator(blockReq)
-		if err != nil {
-			return time.Since(start), err
-		}
-
 		// Intersect primary rays outside of the loop
 		// Use packet query intersector for GPUs as opencl forces CPU
 		// to use a local workgroup size equal to 1

diff --git a/tracer/opencl/tracer.go b/tracer/opencl/tracer.go
@@ -8,12 +8,12 @@ import (
 	"sync"
 	"time"
 
+	"github.com/achilleasa/gopencl/v1.2/cl"
 	"github.com/achilleasa/polaris/asset/scene"
 	"github.com/achilleasa/polaris/log"
 	"github.com/achilleasa/polaris/tracer"
 	"github.com/achilleasa/polaris/tracer/opencl/device"
 	"github.com/achilleasa/polaris/types"
-	"github.com/achilleasa/gopencl/v1.2/cl"
 )
 
 type Tracer struct {
@@ -212,6 +212,11 @@ func (tr *Tracer) Trace(blockReq *tracer.BlockRequest) (time.Duration, error) {
 		}
 	}
 
+	_, err = tr.resources.ClearTraceAccumulator(blockReq)
+	if err != nil {
+		return time.Since(start), err
+	}
+
 	var sample uint32
 	for sample = 0; sample < blockReq.SamplesPerPixel; sample++ {
 		blockReq.Seed = rand.Uint32()
@@ -231,6 +236,8 @@ func (tr *Tracer) Trace(blockReq *tracer.BlockRequest) (time.Duration, error) {
 				return time.Since(start), err
 			}
 		}
+
+		blockReq.AccumulatedSamples++
 	}
 
 	tr.stats.BlockW = blockReq.BlockW