Skip to content

Commit 585e6a5

Browse files
committed
Updated NRI framework
1 parent 7d9d5e0 commit 585e6a5

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Source/NRDSample.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3657,19 +3657,19 @@ void Sample::UploadStaticData() {
36573657
PrimitiveData& data = primitiveData[meshInstance.primitiveOffset + j];
36583658
const utils::Primitive& primitive = m_Scene.primitives[staticPrimitiveIndex];
36593659

3660-
data.uv0 = Packing::float2_to_float16_t2(float2(v0.uv[0], v0.uv[1]));
3661-
data.uv1 = Packing::float2_to_float16_t2(float2(v1.uv[0], v1.uv[1]));
3662-
data.uv2 = Packing::float2_to_float16_t2(float2(v2.uv[0], v2.uv[1]));
3660+
data.uv0 = float16_t2(float2(v0.uv[0], v0.uv[1]));
3661+
data.uv1 = float16_t2(float2(v1.uv[0], v1.uv[1]));
3662+
data.uv2 = float16_t2(float2(v2.uv[0], v2.uv[1]));
36633663
data.worldArea = primitive.worldArea;
36643664

3665-
data.n0 = Packing::float2_to_float16_t2(float2(n0.x, n0.y));
3666-
data.n1 = Packing::float2_to_float16_t2(float2(n1.x, n1.y));
3667-
data.n2 = Packing::float2_to_float16_t2(float2(n2.x, n2.y));
3665+
data.n0 = float16_t2(float2(n0.x, n0.y));
3666+
data.n1 = float16_t2(float2(n1.x, n1.y));
3667+
data.n2 = float16_t2(float2(n2.x, n2.y));
36683668
data.uvArea = primitive.uvArea;
36693669

3670-
data.t0 = Packing::float2_to_float16_t2(float2(t0.x, t0.y));
3671-
data.t1 = Packing::float2_to_float16_t2(float2(t1.x, t1.y));
3672-
data.t2 = Packing::float2_to_float16_t2(float2(t2.x, t2.y));
3670+
data.t0 = float16_t2(float2(t0.x, t0.y));
3671+
data.t1 = float16_t2(float2(t1.x, t1.y));
3672+
data.t2 = float16_t2(float2(t2.x, t2.y));
36733673
data.bitangentSign = v0.T[3];
36743674
}
36753675
}
@@ -3905,9 +3905,9 @@ void Sample::GatherInstanceData() {
39053905
instanceData.mOverloadedMatrix0 = mOverloadedMatrix.Col(0);
39063906
instanceData.mOverloadedMatrix1 = mOverloadedMatrix.Col(1);
39073907
instanceData.mOverloadedMatrix2 = mOverloadedMatrix.Col(2);
3908-
instanceData.baseColorAndMetalnessScale = Packing::float4_to_float16_t4(material.baseColorAndMetalnessScale);
3909-
instanceData.emissionAndRoughnessScale = Packing::float4_to_float16_t4(material.emissiveAndRoughnessScale);
3910-
instanceData.normalUvScale = Packing::float2_to_float16_t2(material.normalUvScale);
3908+
instanceData.baseColorAndMetalnessScale = float16_t4(material.baseColorAndMetalnessScale);
3909+
instanceData.emissionAndRoughnessScale = float16_t4(material.emissiveAndRoughnessScale);
3910+
instanceData.normalUvScale = float16_t2(material.normalUvScale);
39113911
instanceData.textureOffsetAndFlags = baseTextureIndex | (flags << FLAG_FIRST_BIT);
39123912
instanceData.primitiveOffset = meshInstance.primitiveOffset;
39133913
instanceData.scale = (isLeftHanded ? -1.0f : 1.0f) * max(scale.x, max(scale.y, scale.z));

0 commit comments

Comments
 (0)