Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reduce mem requirement #1636

Merged
merged 2 commits into from
Dec 15, 2023
Merged

reduce mem requirement #1636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab04fa2
reduce mem requirement
zhxx1987 Dec 15, 2023
e800207
reduce mem requirement
zhxx1987 Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions zenovis/xinxinoptix/DeflMatShader.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,11 @@ extern "C" __global__ void __anyhit__shadow_cutout()
/* MODMA */
float2 barys = optixGetTriangleBarycentrics();

float3 n0 = normalize( *(float3*)&(rt_data->nrm[ vert_idx_offset+0 ]) );
float3 n0 = normalize( decodeNormal(rt_data->nrm[ vert_idx_offset+0 ]) );
n0 = dot(n0, N_Local)>0.8f?n0:N_Local;
float3 n1 = normalize( *(float3*)&(rt_data->nrm[ vert_idx_offset+1 ]) );
float3 n1 = normalize( decodeNormal(rt_data->nrm[ vert_idx_offset+1 ]) );
n1 = dot(n1, N_Local)>0.8f?n1:N_Local;
float3 n2 = normalize( *(float3*)&(rt_data->nrm[ vert_idx_offset+2 ]) );
float3 n2 = normalize( decodeNormal(rt_data->nrm[ vert_idx_offset+2 ]) );
n2 = dot(n2, N_Local)>0.8f?n2:N_Local;

N_Local = normalize(interp(barys, n0, n1, n2));
Expand All @@ -273,15 +273,15 @@ extern "C" __global__ void __anyhit__shadow_cutout()
attrs.pos = P;
attrs.nrm = N;

const float3& uv0 = *(float3*)&( rt_data->uv[ vert_idx_offset+0 ] );
const float3& uv1 = *(float3*)&( rt_data->uv[ vert_idx_offset+1 ] );
const float3& uv2 = *(float3*)&( rt_data->uv[ vert_idx_offset+2 ] );
const float3& clr0 = *(float3*)&( rt_data->clr[ vert_idx_offset+0 ] );
const float3& clr1 = *(float3*)&( rt_data->clr[ vert_idx_offset+1 ] );
const float3& clr2 = *(float3*)&( rt_data->clr[ vert_idx_offset+2 ] );
const float3& tan0 = *(float3*)&( rt_data->tan[ vert_idx_offset+0 ] );
const float3& tan1 = *(float3*)&( rt_data->tan[ vert_idx_offset+1 ] );
const float3& tan2 = *(float3*)&( rt_data->tan[ vert_idx_offset+2 ] );
const float3& uv0 = decodeColor( rt_data->uv[ vert_idx_offset+0 ] );
const float3& uv1 = decodeColor( rt_data->uv[ vert_idx_offset+1 ] );
const float3& uv2 = decodeColor( rt_data->uv[ vert_idx_offset+2 ] );
const float3& clr0 = decodeColor( rt_data->clr[ vert_idx_offset+0 ] );
const float3& clr1 = decodeColor( rt_data->clr[ vert_idx_offset+1 ] );
const float3& clr2 = decodeColor( rt_data->clr[ vert_idx_offset+2 ] );
const float3& tan0 = decodeNormal( rt_data->tan[ vert_idx_offset+0 ] );
const float3& tan1 = decodeNormal( rt_data->tan[ vert_idx_offset+1 ] );
const float3& tan2 = decodeNormal( rt_data->tan[ vert_idx_offset+2 ] );

attrs.uv = interp(barys, uv0, uv1, uv2);//todo later
attrs.clr = interp(barys, clr0, clr1, clr2);
Expand Down Expand Up @@ -506,15 +506,15 @@ extern "C" __global__ void __closesthit__radiance()
float3 N = N_World;
attrs.nrm = N;

const float3& uv0 = *(float3*)&( rt_data->uv[ vert_idx_offset+0 ] );
const float3& uv1 = *(float3*)&( rt_data->uv[ vert_idx_offset+1 ] );
const float3& uv2 = *(float3*)&( rt_data->uv[ vert_idx_offset+2 ] );
const float3& clr0 = *(float3*)&( rt_data->clr[ vert_idx_offset+0 ] );
const float3& clr1 = *(float3*)&( rt_data->clr[ vert_idx_offset+1 ] );
const float3& clr2 = *(float3*)&( rt_data->clr[ vert_idx_offset+2 ] );
const float3& tan0 = *(float3*)&( rt_data->tan[ vert_idx_offset+0 ] );
const float3& tan1 = *(float3*)&( rt_data->tan[ vert_idx_offset+1 ] );
const float3& tan2 = *(float3*)&( rt_data->tan[ vert_idx_offset+2 ] );
const float3& uv0 = decodeColor( rt_data->uv[ vert_idx_offset+0 ] );
const float3& uv1 = decodeColor( rt_data->uv[ vert_idx_offset+1 ] );
const float3& uv2 = decodeColor( rt_data->uv[ vert_idx_offset+2 ] );
const float3& clr0 = decodeColor( rt_data->clr[ vert_idx_offset+0 ] );
const float3& clr1 = decodeColor( rt_data->clr[ vert_idx_offset+1 ] );
const float3& clr2 = decodeColor( rt_data->clr[ vert_idx_offset+2 ] );
const float3& tan0 = decodeNormal( rt_data->tan[ vert_idx_offset+0 ] );
const float3& tan1 = decodeNormal( rt_data->tan[ vert_idx_offset+1 ] );
const float3& tan2 = decodeNormal( rt_data->tan[ vert_idx_offset+2 ] );

attrs.uv = interp(barys, uv0, uv1, uv2);//todo later
attrs.clr = interp(barys, clr0, clr1, clr2);
Expand All @@ -540,13 +540,13 @@ extern "C" __global__ void __closesthit__radiance()

#else

float3 n0 = normalize( *(float3*)&(rt_data->nrm[ vert_idx_offset+0 ]) );
float3 n0 = normalize( decodeNormal(rt_data->nrm[ vert_idx_offset+0 ]) );
n0 = dot(n0, N_Local)>(1-mats.smoothness)?n0:N_Local;

float3 n1 = normalize( *(float3*)&(rt_data->nrm[ vert_idx_offset+1 ]) );
float3 n1 = normalize( decodeNormal(rt_data->nrm[ vert_idx_offset+1 ]) );
n1 = dot(n1, N_Local)>(1-mats.smoothness)?n1:N_Local;

float3 n2 = normalize( *(float3*)&(rt_data->nrm[ vert_idx_offset+2 ]) );
float3 n2 = normalize( decodeNormal(rt_data->nrm[ vert_idx_offset+2 ]) );
n2 = dot(n2, N_Local)>(1-mats.smoothness)?n2:N_Local;

N_Local = normalize(interp(barys, n0, n1, n2));
Expand Down
Loading
Loading