Skip to content

Commit

Permalink
Improve pathtracer
Browse files Browse the repository at this point in the history
  • Loading branch information
@luboslenco
luboslenco committed Jul 21, 2023
1 parent c83e318 commit ba12a20
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 21 deletions.
Binary file modified base/Shaders/raytrace/raytrace_brute_core.cso
View file
Binary file not shown.
27 changes: 20 additions & 7 deletions base/Shaders/raytrace/raytrace_brute_core.metal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#define _SUBSURFACE
#define _TRANSLUCENCY
#endif
#define _FRESNEL
#define _RENDER
// #define _ROULETTE
// #define _TRANSPARENCY
Expand Down Expand Up @@ -140,6 +141,10 @@ float3 envBRDFApprox(float3 specular, float roughness, float dotNV) {
return specular * ab.x + ab.y;
}

float fresnel(float3 normal, float3 incident) {
return mix(0.5, 1.0, pow(1.0 + dot(normal, incident), 5.0));
}

kernel void raytracingKernel(
uint2 tid [[thread_position_in_grid]],
constant RayGenConstantBuffer &constant_buffer [[buffer(0)]],
Expand Down Expand Up @@ -266,6 +271,7 @@ kernel void raytracingKernel(
n = float3x3(tangent, binormal, n) * texpaint1.rgb;

float f = rand(tid.x, tid.y, payload.color.a, seed, constant_buffer.eye.w, mytexture_sobol, mytexture_scramble, mytexture_rank);
seed += 1;

#ifdef _TRANSLUCENCY
float3 diffuseDir = texpaint0.a < f ?
Expand All @@ -275,14 +281,20 @@ kernel void raytracingKernel(
float3 diffuseDir = cos_weighted_hemisphere_direction(tid, n, payload.color.a, seed, constant_buffer.eye.w, mytexture_sobol, mytexture_scramble, mytexture_rank);
#endif

if (f < 0.5) {
#ifdef _FRESNEL
float specularChance = fresnel(ray.direction, n);
#else
const float specularChance = 0.5;
#endif

if (f < specularChance) {
#ifdef _TRANSLUCENCY
float3 specularDir = texpaint0.a < f * 2 ? ray.direction : reflect(ray.direction, n);
#else
float3 specularDir = reflect(ray.direction, n);
#endif

payload.ray_dir = mix(specularDir, diffuseDir, texpaint2.g * texpaint2.g);

float3 v = normalize(constant_buffer.eye.xyz - hit_world_position(ray, intersection));
float dotNV = max(dot(n, v), 0.0);
float3 specular = surfaceSpecular(texcolor, texpaint2.b);
Expand Down Expand Up @@ -331,7 +343,7 @@ kernel void raytracingKernel(
payload.color.rgb = float3(0.032, 0.032, 0.032);
}

accum += payload.color.rgb;
accum += clamp(payload.color.rgb, 0.0, 8.0);
break;
}

Expand All @@ -345,16 +357,17 @@ kernel void raytracingKernel(
}

float3 color = render_target.read(tid).xyz;
accum = accum / SAMPLES;

#ifdef _RENDER
float a = 1.0 / (constant_buffer.eye.w + 1);
float b = 1.0 - a;
color = color * b + (accum.xyz / SAMPLES) * a;
render_target.write(float4(color.xyz, 0.0f), tid);
color = color * b + accum * a;
render_target.write(float4(color, 0.0f), tid);
#else
if (constant_buffer.eye.w == 0) {
color = accum.xyz / SAMPLES;
color = accum;
}
render_target.write(float4(mix(color.xyz, accum.xyz / SAMPLES, 1.0 / 16.0), 0.0f), tid);
render_target.write(float4(mix(color, accum, 1.0 / 16.0), 0.0f), tid);
#endif
}
Binary file modified base/Shaders/raytrace/raytrace_brute_core.spirv
View file
Binary file not shown.
Binary file modified base/Shaders/raytrace/raytrace_brute_full.cso
View file
Binary file not shown.
28 changes: 21 additions & 7 deletions base/Shaders/raytrace/raytrace_brute_full.metal
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#define _FULL

#ifdef _FULL
#define _EMISSION
#define _SUBSURFACE
#define _TRANSLUCENCY
#endif
#define _FRESNEL
#define _RENDER
// #define _ROULETTE
// #define _TRANSPARENCY
Expand Down Expand Up @@ -140,6 +142,10 @@ float3 envBRDFApprox(float3 specular, float roughness, float dotNV) {
return specular * ab.x + ab.y;
}

float fresnel(float3 normal, float3 incident) {
return mix(0.5, 1.0, pow(1.0 + dot(normal, incident), 5.0));
}

kernel void raytracingKernel(
uint2 tid [[thread_position_in_grid]],
constant RayGenConstantBuffer &constant_buffer [[buffer(0)]],
Expand Down Expand Up @@ -266,6 +272,7 @@ kernel void raytracingKernel(
n = float3x3(tangent, binormal, n) * texpaint1.rgb;

float f = rand(tid.x, tid.y, payload.color.a, seed, constant_buffer.eye.w, mytexture_sobol, mytexture_scramble, mytexture_rank);
seed += 1;

#ifdef _TRANSLUCENCY
float3 diffuseDir = texpaint0.a < f ?
Expand All @@ -275,14 +282,20 @@ kernel void raytracingKernel(
float3 diffuseDir = cos_weighted_hemisphere_direction(tid, n, payload.color.a, seed, constant_buffer.eye.w, mytexture_sobol, mytexture_scramble, mytexture_rank);
#endif

if (f < 0.5) {
#ifdef _FRESNEL
float specularChance = fresnel(ray.direction, n);
#else
const float specularChance = 0.5;
#endif

if (f < specularChance) {
#ifdef _TRANSLUCENCY
float3 specularDir = texpaint0.a < f * 2 ? ray.direction : reflect(ray.direction, n);
#else
float3 specularDir = reflect(ray.direction, n);
#endif

payload.ray_dir = mix(specularDir, diffuseDir, texpaint2.g * texpaint2.g);

float3 v = normalize(constant_buffer.eye.xyz - hit_world_position(ray, intersection));
float dotNV = max(dot(n, v), 0.0);
float3 specular = surfaceSpecular(texcolor, texpaint2.b);
Expand Down Expand Up @@ -331,7 +344,7 @@ kernel void raytracingKernel(
payload.color.rgb = float3(0.032, 0.032, 0.032);
}

accum += payload.color.rgb;
accum += clamp(payload.color.rgb, 0.0, 8.0);
break;
}

Expand All @@ -345,16 +358,17 @@ kernel void raytracingKernel(
}

float3 color = render_target.read(tid).xyz;
accum = accum / SAMPLES;

#ifdef _RENDER
float a = 1.0 / (constant_buffer.eye.w + 1);
float b = 1.0 - a;
color = color * b + (accum.xyz / SAMPLES) * a;
render_target.write(float4(color.xyz, 0.0f), tid);
color = color * b + accum * a;
render_target.write(float4(color, 0.0f), tid);
#else
if (constant_buffer.eye.w == 0) {
color = accum.xyz / SAMPLES;
color = accum;
}
render_target.write(float4(mix(color.xyz, accum.xyz / SAMPLES, 1.0 / 16.0), 0.0f), tid);
render_target.write(float4(mix(color, accum, 1.0 / 16.0), 0.0f), tid);
#endif
}
Binary file modified base/Shaders/raytrace/raytrace_brute_full.spirv
View file
Binary file not shown.
23 changes: 16 additions & 7 deletions base/Shaders/raytrace/src/raytrace_brute.hlsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#define _SUBSURFACE
#define _TRANSLUCENCY
#endif
#define _FRESNEL
// #define _RENDER
// #define _ROULETTE
// #define _TRANSPARENCY
Expand Down Expand Up @@ -123,7 +124,7 @@ void raygeneration() {
payload.color.rgb = float3(0.032, 0.032, 0.032);
}

accum += payload.color.rgb;
accum += clamp(payload.color.rgb, 0.0, 8.0);
break;
}

Expand All @@ -137,17 +138,18 @@ void raygeneration() {
}

float3 color = float3(render_target[DispatchRaysIndex().xy].xyz);
accum = accum / SAMPLES;

#ifdef _RENDER
float a = 1.0 / (constant_buffer.eye.w + 1);
float b = 1.0 - a;
color = color * b + (accum.xyz / SAMPLES) * a;
render_target[DispatchRaysIndex().xy] = float4(color.xyz, 0.0f);
color = color * b + accum * a;
render_target[DispatchRaysIndex().xy] = float4(color, 0.0f);
#else
if (constant_buffer.eye.w == 0) {
color = accum.xyz / SAMPLES;
color = accum;
}
render_target[DispatchRaysIndex().xy] = float4(lerp(color.xyz, accum.xyz / SAMPLES, 1.0 / 4.0), 0.0f);
render_target[DispatchRaysIndex().xy] = float4(lerp(color, accum, 1.0 / 4.0), 0.0f);
#endif
}

Expand Down Expand Up @@ -198,6 +200,7 @@ void closesthit(inout RayPayload payload, in BuiltInTriangleIntersectionAttribut
n = mul(texpaint1.rgb, float3x3(tangent, binormal, n));

float f = rand(DispatchRaysIndex().x, DispatchRaysIndex().y, payload.color.a, seed, constant_buffer.eye.w, mytexture_sobol, mytexture_scramble, mytexture_rank);
seed += 1;

#ifdef _TRANSLUCENCY
float3 diffuseDir = texpaint0.a < f ?
Expand All @@ -207,14 +210,20 @@ void closesthit(inout RayPayload payload, in BuiltInTriangleIntersectionAttribut
float3 diffuseDir = cos_weighted_hemisphere_direction(n, payload.color.a, seed, constant_buffer.eye.w, mytexture_sobol, mytexture_scramble, mytexture_rank);
#endif

if (f < 0.5) {
#ifdef _FRESNEL
float specularChance = fresnel(WorldRayDirection(), n);
#else
const float specularChance = 0.5;
#endif

if (f < specularChance) {
#ifdef _TRANSLUCENCY
float3 specularDir = texpaint0.a < f * 2 ? WorldRayDirection() : reflect(WorldRayDirection(), n);
#else
float3 specularDir = reflect(WorldRayDirection(), n);
#endif

payload.ray_dir = lerp(specularDir, diffuseDir, texpaint2.g * texpaint2.g);

float3 v = normalize(constant_buffer.eye.xyz - hit_world_position());
float dotNV = max(dot(n, v), 0.0);
float3 specular = surfaceSpecular(texcolor, texpaint2.b);
Expand Down
4 changes: 4 additions & 0 deletions base/Shaders/raytrace/src/std/math.hlsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,8 @@ float3 envBRDFApprox(float3 specular, float roughness, float dotNV) {
return specular * ab.x + ab.y;
}

float fresnel(float3 normal, float3 incident) {
return lerp(0.5, 1.0, pow(1.0 + dot(normal, incident), 5.0));
}

#endif

0 comments on commit ba12a20

Please sign in to comment.