Skip to content

[HDRP] Merge hd/bugfix #2787

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.

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 10 commits into from
Nov 30, 2020
Merged
Prev Previous commit
Next Next commit
Formatting
  • Loading branch information
sebastienlagarde committed Nov 30, 2020
commit f6ad53e84d26c3de0add431ce89fb1acbca543b8
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,11 @@ void LIGHTLISTGEN(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_GroupID)
for(int i=0; i<g_iNumSamplesMSAA; i++)
{
const float fDpth = FetchDepthMSAA(uPixCrd, i);
#if defined(SHADER_API_METAL) // GetSamplePosition isn't supported on Metal yet in Unity. TODO: remove when support is added
#if defined(SHADER_API_METAL) // GetSamplePosition isn't supported on Metal yet in Unity. TODO: remove when support is added
const float2 fracSampleCoord = float2(0.0, 0.0);
#else
const float2 fracSampleCoord = g_depth_tex.GetSamplePosition(i).xy; // this is optimized away when USE_OBLIQUE_MODE is NOT set.
#endif
#else
const float2 fracSampleCoord = g_depth_tex.GetSamplePosition(i).xy; // this is optimized away when USE_OBLIQUE_MODE is NOT set.
#endif
#else
const float fDpth = FetchDepth(uPixCrd);
const float2 fracSampleCoord = float2(0.5,0.5);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ class SkyManager

// 2 by default: Static sky + one dynamic. Will grow if needed.
DynamicArray<CachedSkyContext> m_CachedSkyContexts = new DynamicArray<CachedSkyContext>(2);

public SkyManager()
{}

~SkyManager()
{}
public SkyManager()
{}

~SkyManager()
{}

internal static SkySettings GetSkySetting(VolumeStack stack)
{
Expand Down