Merge branch 'dev/ralston/conditional_portal_fade_in' into 'main'

anon-apple · anon-apple · commit 912a6147d37e · 2024-11-04T11:52:16.000-08:00
[PR:83] Conditional Ray Portal Fade-in

See merge request lightspeedrtx/dxvk-remix-nv!1120
diff --git a/src/dxvk/shaders/rtx/algorithm/resolve.slangh b/src/dxvk/shaders/rtx/algorithm/resolve.slangh
@@ -581,7 +581,7 @@ void resolveVertex<T: IBasePayloadState>(
 
     // Render Portal outline
     {
-      const bool portalFadeInEffect = cb.enablePortalFadeInEffect;
+      const bool portalFadeInEffect = cb.enablePortalFadeInEffect && rayPortalSurfaceMaterial.maskTextureIndex != BINDING_INDEX_INVALID;
       const float16_t tFactor = portalFadeInEffect ? float16_t((surface.tFactor >> 24) & 0xff) / 255.0 : float16_t(0.0);
       const float16_t ringTransparency =
         saturate(float16_t(1) - rayPortalSurfaceMaterialInteraction.mask.a) *

Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ void resolveVertex<T: IBasePayloadState>(`
`581`	`581`
`582`	`582`	`// Render Portal outline`
`583`	`583`	`{`
`584`		`- const bool portalFadeInEffect = cb.enablePortalFadeInEffect;`
	`584`	`+ const bool portalFadeInEffect = cb.enablePortalFadeInEffect && rayPortalSurfaceMaterial.maskTextureIndex != BINDING_INDEX_INVALID;`
`585`	`585`	`const float16_t tFactor = portalFadeInEffect ? float16_t((surface.tFactor >> 24) & 0xff) / 255.0 : float16_t(0.0);`
`586`	`586`	`const float16_t ringTransparency =`
`587`	`587`	`saturate(float16_t(1) - rayPortalSurfaceMaterialInteraction.mask.a) *`