1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
diff --git a/moonray/moonray/lib/rendering/rt/gpu/optix/OptixGPUPrimitiveGroup.cc b/moonray/moonray/lib/rendering/rt/gpu/optix/OptixGPUPrimitiveGroup.cc
index 0f0162c..b8b4d6b 100644
--- a/moonray/moonray/lib/rendering/rt/gpu/optix/OptixGPUPrimitiveGroup.cc
+++ b/moonray/moonray/lib/rendering/rt/gpu/optix/OptixGPUPrimitiveGroup.cc
@@ -66,7 +66,6 @@ OptixGPUPrimitiveGroup::build(CUstream cudaStream,
oinstance.instanceId = 0;
oinstance.visibilityMask = 255;
oinstance.sbtOffset = mSBTOffset;
- oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
oinstance.traversableHandle = mTrianglesGAS;
instances.push_back(oinstance);
}
@@ -87,7 +86,6 @@ OptixGPUPrimitiveGroup::build(CUstream cudaStream,
oinstance.instanceId = 0;
oinstance.visibilityMask = 255;
oinstance.sbtOffset = mSBTOffset + mTriMeshes.size();
- oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
oinstance.traversableHandle = mTrianglesMBGAS;
instances.push_back(oinstance);
}
@@ -108,7 +106,6 @@ OptixGPUPrimitiveGroup::build(CUstream cudaStream,
oinstance.instanceId = 0;
oinstance.visibilityMask = 255;
oinstance.sbtOffset = mSBTOffset + mTriMeshes.size() + mTriMeshesMB.size();
- oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
oinstance.traversableHandle = mRoundCurvesGAS;
instances.push_back(oinstance);
}
@@ -129,7 +126,6 @@ OptixGPUPrimitiveGroup::build(CUstream cudaStream,
oinstance.instanceId = 0;
oinstance.visibilityMask = 255;
oinstance.sbtOffset = mSBTOffset + mTriMeshes.size() + mTriMeshesMB.size() + mRoundCurves.size();
- oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
oinstance.traversableHandle = mRoundCurvesMBGAS;
instances.push_back(oinstance);
}
@@ -151,7 +147,6 @@ OptixGPUPrimitiveGroup::build(CUstream cudaStream,
oinstance.visibilityMask = 255;
oinstance.sbtOffset = mSBTOffset + mTriMeshes.size() + mTriMeshesMB.size() +
mRoundCurves.size() + mRoundCurvesMB.size();
- oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
oinstance.traversableHandle = mCustomPrimitivesGAS;
instances.push_back(oinstance);
@@ -185,7 +180,6 @@ OptixGPUPrimitiveGroup::build(CUstream cudaStream,
// The xform is specified in the mMMTTraversable instead. The child
// node is the MatrixMotionTransform of the instance, which itself
// has the group's top level IAS node as its child.
- oinstance.flags = OPTIX_INSTANCE_FLAG_DISABLE_TRANSFORM;
OptixGPUXform::identityXform().toOptixTransform(oinstance.transform);
oinstance.traversableHandle = mInstances[i]->mMMTTraversable;
}
diff --git a/moonray/mcrt_denoise/lib/denoiser/OptixDenoiserImpl.cc b/moonray/mcrt_denoise/lib/denoiser/OptixDenoiserImpl.cc
index e9b4302..57f2fba 100644
--- a/moonray/mcrt_denoise/lib/denoiser/OptixDenoiserImpl.cc
+++ b/moonray/mcrt_denoise/lib/denoiser/OptixDenoiserImpl.cc
@@ -107,7 +107,7 @@ OptixDenoiserImpl::OptixDenoiserImpl(int width,
}
mDenoiserParams = {}; // zero initialize
- mDenoiserParams.denoiseAlpha = 0; // don't denoise alpha
+ mDenoiserParams.denoiseAlpha = OPTIX_DENOISER_ALPHA_MODE_COPY; // don't denoise alpha
mDenoiserParams.hdrIntensity = 0; // optional average log intensity image of input image,
// helps with very dark/bright images
mDenoiserParams.blendFactor = 0.f; // show the denoised image only
|