Merge pull request #324 from floe/opencl-fix

floe · floe · commit e66d2064586c · 2015-07-15T20:46:13.000+02:00
fix opencl rebuild after config change
diff --git a/examples/protonect/src/opencl_depth_packet_processor.cpp b/examples/protonect/src/opencl_depth_packet_processor.cpp
@@ -611,7 +611,6 @@ void OpenCLDepthPacketProcessor::setConfiguration(const libfreenect2::DepthPacke
     // OpenCL program needs to be rebuilt, then reinitialized
     impl_->programBuilt = false;
     impl_->programInitialized = false;
-    impl_->buildProgram(impl_->sourceCode);
   }
   else if (impl_->config.EnableBilateralFilter != config.EnableBilateralFilter
     || impl_->config.EnableEdgeAwareFilter != config.EnableEdgeAwareFilter)
@@ -621,6 +620,8 @@ void OpenCLDepthPacketProcessor::setConfiguration(const libfreenect2::DepthPacke
   }
 
   impl_->config = config;
+  if (!impl_->programBuilt)
+    impl_->buildProgram(impl_->sourceCode);
 }
 
 void OpenCLDepthPacketProcessor::loadP0TablesFromCommandResponse(unsigned char *buffer, size_t buffer_length)

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,6 @@ void OpenCLDepthPacketProcessor::setConfiguration(const libfreenect2::DepthPacke`
`611`	`611`	`// OpenCL program needs to be rebuilt, then reinitialized`
`612`	`612`	`impl_->programBuilt = false;`
`613`	`613`	`impl_->programInitialized = false;`
`614`		`- impl_->buildProgram(impl_->sourceCode);`
`615`	`614`	`}`
`616`	`615`	`else if (impl_->config.EnableBilateralFilter != config.EnableBilateralFilter`
`617`	`616`	`\|\| impl_->config.EnableEdgeAwareFilter != config.EnableEdgeAwareFilter)`
`@@ -621,6 +620,8 @@ void OpenCLDepthPacketProcessor::setConfiguration(const libfreenect2::DepthPacke`
`621`	`620`	`}`
`622`	`621`
`623`	`622`	`impl_->config = config;`
	`623`	`+ if (!impl_->programBuilt)`
	`624`	`+ impl_->buildProgram(impl_->sourceCode);`
`624`	`625`	`}`
`625`	`626`
`626`	`627`	`void OpenCLDepthPacketProcessor::loadP0TablesFromCommandResponse(unsigned char *buffer, size_t buffer_length)`