Skip to content

Commit 9a8ada4

Browse files
committed
Revert the MIP copy changes
1 parent 9ef7a6d commit 9a8ada4

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

Assets/ScriptableRenderLoop/HDRenderLoop/Sky/SkyRenderer.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ public bool IsSkyValid(SkyParameters parameters)
209209

210210
private void RenderSky(Camera camera, SkyParameters skyParameters, Mesh skyMesh, RenderLoop renderLoop)
211211
{
212-
Shader.EnableKeyword("PERFORM_SKY_OCCLUSION_TEST");
213-
214212
m_RenderSkyPropertyBlock.SetTexture("_Cubemap", skyParameters.skyHDRI);
215213
m_RenderSkyPropertyBlock.SetVector("_SkyParam", new Vector4(skyParameters.exposure, skyParameters.multiplier, skyParameters.rotation, 0.0f));
216214
m_RenderSkyPropertyBlock.SetMatrix("_InvViewProjMatrix", Utilities.GetViewProjectionMatrix(camera).inverse);
@@ -223,8 +221,6 @@ private void RenderSky(Camera camera, SkyParameters skyParameters, Mesh skyMesh,
223221

224222
private void RenderSkyToCubemap(SkyParameters skyParameters, RenderTexture target, RenderLoop renderLoop)
225223
{
226-
Shader.DisableKeyword("PERFORM_SKY_OCCLUSION_TEST");
227-
228224
for (int i = 0; i < 6; ++i)
229225
{
230226
Utilities.SetRenderTarget(renderLoop, target, 0, (CubemapFace)i);
@@ -244,12 +240,16 @@ private void RenderCubemapGGXConvolution(Texture input, RenderTexture target, Re
244240
return;
245241
}
246242

247-
var cmd = new CommandBuffer { name = "" };
248-
249243
// Copy the first mip.
250244

251245
// TEMP code until CopyTexture is implemented for command buffer
252-
cmd.CopyTexture(input, target);
246+
// All parameters are neutral because exposure/multiplier have already been applied in the first copy.
247+
SkyParameters skyParams = new SkyParameters();
248+
skyParams.exposure = 0.0f;
249+
skyParams.multiplier = 1.0f;
250+
skyParams.rotation = 0.0f;
251+
skyParams.skyHDRI = input;
252+
RenderSkyToCubemap(skyParams, target, renderLoop);
253253
// End temp
254254

255255
//for (int f = 0; f < 6; f++)
@@ -271,6 +271,7 @@ private void RenderCubemapGGXConvolution(Texture input, RenderTexture target, Re
271271
{
272272
Utilities.SetRenderTarget(renderLoop, target, mip, (CubemapFace)face);
273273

274+
var cmd = new CommandBuffer { name = "" };
274275
cmd.DrawMesh(m_CubemapFaceMesh[face], Matrix4x4.identity, m_GGXConvolveMaterial, 0, 0, propertyBlock);
275276
renderLoop.ExecuteCommandBuffer(cmd);
276277
cmd.Dispose();

0 commit comments

Comments
 (0)