Fixed a problem with incorrect alpha AOV values (issue #536)

LuxCoreRender · May 27, 2021 · 459e9bb · 459e9bb
1 parent 4881b24
commit 459e9bb
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/include/slg/film/film_funcs.cl b/include/slg/film/film_funcs.cl
@@ -163,7 +163,7 @@ OPENCL_FORCE_INLINE void Film_AddSampleResultColor(const uint x, const uint y,
 
 	if (film->hasChannelAlpha)
 		Film_AddWeightedPixel2(usePixelAtomics, &filmAlpha[index2], &sampleResult->alpha, weight);
-
+		
 	if (film->hasChannelDirectDiffuse) {
 		const float3 c = VLOAD3F(sampleResult->directDiffuseReflect.c) + VLOAD3F(sampleResult->directDiffuseTransmit.c);
 		Film_AddIfValidWeightedPixel4Val(usePixelAtomics, &filmDirectDiffuse[index4], c, weight);

diff --git a/release-notes.txt b/release-notes.txt
@@ -33,6 +33,7 @@
 * Fixed a bug rendering black baked maps when using bump mapping and COMBINED type with BAKECPU rendering engine
 * Fixed a bug when rendering caustics over volumes with Caustic cache (issue #533)
 * Fixed a problem causing the initialization of multiple dataset accelerators in some case
+* Fixed a problem with incorrect alpha AOV values (issue #536)
 
 Check https://wiki.luxcorerender.org/LuxCoreRender_Release_Notes for the full list
 of release notes.

diff --git a/src/slg/engines/pathocl/pathocl.cpp b/src/slg/engines/pathocl/pathocl.cpp
@@ -302,7 +302,7 @@ const Properties &PathOCLRenderEngine::GetDefaultProps() {
 			OCLRenderEngine::GetDefaultProps() <<
 			Property("renderengine.type")(GetObjectTag()) <<
 			PathTracer::GetDefaultProps() <<
-			Property("pathocl.pixelatomics.enable")(false) <<
+			Property("pathocl.pixelatomics.enable")(true) <<
 			Property("opencl.task.count")("AUTO") <<
 			PhotonGICache::GetDefaultProps();
 

diff --git a/src/slg/engines/pathoclbase/pathoclbase.cpp b/src/slg/engines/pathoclbase/pathoclbase.cpp
@@ -210,7 +210,6 @@ string PathOCLBaseRenderEngine::GetCachedKernelsHash(const RenderConfig &renderC
 	const float epsilonMax = renderConfig.GetProperty("scene.epsilon.max").Get<float>();
 
 	const Properties &cfg = renderConfig.cfg;
-	const bool usePixelAtomics = cfg.Get(Property("pathocl.pixelatomics.enable")(false)).Get<bool>();
 	const bool useCPUs = cfg.Get(GetDefaultProps().Get("opencl.cpu.use")).Get<bool>();
 	const bool useGPUs = cfg.Get(GetDefaultProps().Get("opencl.gpu.use")).Get<bool>();
 	const string oclDeviceConfig = cfg.Get(GetDefaultProps().Get("opencl.devices.select")).Get<string>();
@@ -221,7 +220,6 @@ string PathOCLBaseRenderEngine::GetCachedKernelsHash(const RenderConfig &renderC
 			renderEngineType << "##" <<
 			epsilonMin << "##" <<
 			epsilonMax << "##" <<
-			usePixelAtomics << "##" <<
 			useCPUs << "##" <<
 			useGPUs << "##" <<
 			oclDeviceConfig;