Skip to content

Fix stale data for main light directional cookie. #5828

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

Merged
merged 1 commit into from
Sep 30, 2021
Merged

Fix stale data for main light directional cookie. #5828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions com.unity.render-pipelines.universal/Runtime/LightCookieManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ static class ShaderProperty

private enum LightCookieShaderFormat
{
None = -1,

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The extra line done on purpose or by accident?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On purpose, since it's a bit special and enums often do not have negative values.

RGB = 0,
Alpha = 1,
Red = 2
Expand Down Expand Up @@ -580,6 +582,13 @@ bool SetupMainLight(CommandBuffer cmd, ref VisibleLight visibleMainLight)
cmd.SetGlobalMatrix(ShaderProperty.mainLightWorldToLight, cookieMatrix);
cmd.SetGlobalFloat(ShaderProperty.mainLightCookieTextureFormat, cookieFormat);
}
else
{
// Make sure we erase stale data in case the main light is disabled but cookie system is enabled (for additional lights).
cmd.SetGlobalTexture(ShaderProperty.mainLightTexture, Texture2D.whiteTexture);
cmd.SetGlobalMatrix(ShaderProperty.mainLightWorldToLight, Matrix4x4.identity);
cmd.SetGlobalFloat(ShaderProperty.mainLightCookieTextureFormat, (float)LightCookieShaderFormat.None);
}

return isMainLightCookieEnabled;
}
Expand Down
5 changes: 4 additions & 1 deletion com.unity.render-pipelines.universal/ShaderLibrary/LightCookie/LightCookie.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ float2 ComputeLightCookieUVDirectional(float4x4 worldToLight, float3 samplePosit
{
// Translate and rotate 'positionWS' into the light space.
// Project point to light "view" plane, i.e. discard Z.
float2 positionLS = mul(worldToLight, float4(samplePositionWS, 1)).xy;
float2 positionLS = mul(worldToLight, float4(samplePositionWS, 1)).xy;

// Remap [-1, 1] to [0, 1]
// (implies the transform has ortho projection mapping world space box to [-1, 1])
Expand Down Expand Up @@ -70,6 +70,9 @@ float2 ComputeLightCookieUVPoint(float4x4 worldToLight, float3 samplePositionWS,

real3 SampleMainLightCookie(float3 samplePositionWS)
{
if(!IsMainLightCookieEnabled())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing space between if and (

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:)

return real3(1,1,1);

float2 uv = ComputeLightCookieUVDirectional(_MainLightWorldToLight, samplePositionWS, float4(1, 1, 0, 0), URP_TEXTURE_WRAP_MODE_NONE);
real4 color = SampleMainLightCookieTexture(uv);

Expand Down
4 changes: 4 additions & 0 deletions com.unity.render-pipelines.universal/ShaderLibrary/LightCookie/LightCookieInput.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ real4 SampleAdditionalLightsCookieAtlasTexture(float2 uv)
}

// Helpers
bool IsMainLightCookieEnabled()
{
return _MainLightCookieTextureFormat != URP_LIGHT_COOKIE_FORMAT_NONE;
}

bool IsLightCookieEnabled(int lightBufferIndex)
{
Expand Down
1 change: 1 addition & 0 deletions com.unity.render-pipelines.universal/ShaderLibrary/LightCookie/LightCookieTypes.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

// Types

#define URP_LIGHT_COOKIE_FORMAT_NONE (-1)
#define URP_LIGHT_COOKIE_FORMAT_RGB (0)
#define URP_LIGHT_COOKIE_FORMAT_ALPHA (1)
#define URP_LIGHT_COOKIE_FORMAT_RED (2)
Expand Down