Solari indirect specular support #21355
Open
+175
−10
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…i.e. is non-metallic)
alice-i-cecile
added
C-Feature
|
Split the uncontroversial stuff off into a separate PR since this one needs some work #21391 |
Simplify and fix recursive traces
JMS55
changed the title
JMS55
changed the title
SparkyPotato
suggested changes
Oct 10, 2025
| let depth = textureLoad(depth_buffer, global_id.xy, 0); | ||
| if depth == 0.0 { | ||
| textureStore(diffuse_albedo, pixel_id, vec4(0.0)); | ||
| textureStore(diffuse_albedo, pixel_id, vec4(0.5)); |
There was a problem hiding this comment.
Should this be specular_albedo?
There was a problem hiding this comment.
Whoops yes, thanks for catching!
SparkyPotato
approved these changes
Oct 10, 2025
atlv24
reviewed
Oct 10, 2025
| let B = TBN[1]; | ||
| let N = TBN[2]; | ||
| let wo = -wi; | ||
| let wo_tangent = vec3(dot(wo, T), dot(wo, B), dot(wo, N)); |
There was a problem hiding this comment.
Yeah, but the rest of bevy does it this way so we keep doing it this way.
atlv24
reviewed
Oct 10, 2025
Comment on lines
+58
to
+59
| var bias = dot(M1 * X.xy, Y.xy) / dot(M2 * X.xyw, Y.xyw); | ||
| let scale = dot(M3 * X.xy, Y.xy) / dot(M4 * X.xzw, Y.xyw); |
There was a problem hiding this comment.
are the swizzles right here? .xyw .xyw on the first line and .xzw .xyz on the second
There was a problem hiding this comment.
From the DLSS RR integration guide,
float3 EnvBRDFApprox2(float3 SpecularColor, float alpha, float NoV)
{
NoV = abs(NoV);
// [Ray Tracing Gems, Chapter 32]
float4 X;
X.x = 1.f;
X.y = NoV;
X.z = NoV * NoV;
X.w = NoV * X.z;
float4 Y;
Y.x = 1.f;
Y.y = alpha;
Y.z = alpha * alpha;
Y.w = alpha * Y.z;
float2x2 M1 = float2x2(0.99044f, -1.28514f, 1.29678f, -0.755907f);
float3x3 M2 = float3x3(1.f, 2.92338f, 59.4188f, 20.3225f, -27.0302f,
222.592f, 121.563f, 626.13f, 316.627f);
float2x2 M3 = float2x2(0.0365463f, 3.32707, 9.0632f, -9.04756);
float3x3 M4 = float3x3(1.f, 3.59685f, -1.36772f, 9.04401f, -16.3174f,
9.22949f, 5.56589f, 19.7886f, -20.2123f);
float bias = dot(mul(M1, X.xy), Y.xy) * rcp(dot(mul(M2, X.xyw), Y.xyw));
float scale = dot(mul(M3, X.xy), Y.xy) * rcp(dot(mul(M4, X.xzw), Y.xyw));
// This is a hack for specular reflectance of 0
bias *= saturate(SpecularColor.g * 50);
return mad(SpecularColor, max(0, scale), max(0, bias));
}
outSpecularAlbedo = EnvBRDFApprox2( GBuffer.SpecularAlbedo, GBuffer.fRoughness
* GBuffer.fRoughness, NdotV );
atlv24
approved these changes
Oct 11, 2025
JMS55
added
the
S-Ready-For-Final-Review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Objective
Solution
specular_giFuture
Showcase
Before
After
