Skip to content

Commit

Permalink
Fix 1299233 ies resize bug (#3094)
Browse files Browse the repository at this point in the history
* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060)

* Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063)

* Implement custom drawer for layer mask parameters (#3066)

* Adding mixed light baking shadowmask test (#3052)

* adding a shadow mask test

* Update reference images

* Changed the clamping approach for RTR and RTGI (in both perf and quality) to improve visual quality. (#3020)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). (#3027)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Changed the warning message for ray traced area shadows (case 1303410). (#3029)

* - Changed the warning message for ray traced area shadows (case 1303410).

* Adds approximation information about ray-traced area shadows

Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>
Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix 1299233 ies resize bug

* change log

* Update CHANGELOG.md

* fix merge issue

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Pavlos Mavridis <pavlos.mavridis@unity3d.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>
Co-authored-by: slunity <37302815+slunity@users.noreply.github.com>
Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com>
Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com>
Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>
  • Loading branch information
11 people committed Feb 8, 2021
1 parent 7f76157 commit a8b316c
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ public void ReserveSpace(Texture cookieA, Texture cookieB)
if (width < k_MinCookieSize || height < k_MinCookieSize)
return;

if (!m_CookieAtlas.ReserveSpace(m_CookieAtlas.GetTextureID(cookieA, cookieB), width, height))
if (!m_CookieAtlas.ReserveSpace(cookieA, cookieB, width, height))
m_2DCookieAtlasNeedsLayouting = true;
}

Expand Down Expand Up @@ -369,7 +369,7 @@ public void ReserveSpaceCube(Texture cookie)
if (projectionSize < k_MinCookieSize)
return;

if (!m_CookieAtlas.ReserveSpace(m_CookieAtlas.GetTextureID(cookie), projectionSize, projectionSize))
if (!m_CookieAtlas.ReserveSpace(cookie, projectionSize, projectionSize))
m_2DCookieAtlasNeedsLayouting = true;
}

Expand All @@ -385,7 +385,7 @@ public void ReserveSpaceCube(Texture cookieA, Texture cookieB)
if (projectionSize < k_MinCookieSize)
return;

if (!m_CookieAtlas.ReserveSpace(m_CookieAtlas.GetTextureID(cookieA, cookieB), projectionSize, projectionSize))
if (!m_CookieAtlas.ReserveSpace(cookieA, cookieB, projectionSize, projectionSize))
m_2DCookieAtlasNeedsLayouting = true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ public bool ReserveSpace(Texture texture)
{
m_RequestedTextures[texture.GetInstanceID()] = new Vector2Int(texture.width, texture.height);

if (NeedsUpdate(texture))
return false;

// new texture
if (!IsCached(out _, texture))
{
Expand All @@ -205,10 +208,34 @@ public bool ReserveSpace(Texture texture)
return true;
}

public bool ReserveSpace(int id, int width, int height)
// pass width and height for CubeMap (use 2*width) & Texture2D (use width)
public bool ReserveSpace(Texture texture, int width, int height)
{
int id = GetTextureID(texture);
m_RequestedTextures[id] = new Vector2Int(width, height);

if (NeedsUpdate(texture))
return false;

// new texture
if (!IsCached(out _, id))
{
Vector4 scaleBias = Vector4.zero;
if (!AllocateTextureWithoutBlit(id, width, height, ref scaleBias))
return false;
}
return true;
}

// pass width and height for CubeMap (use 2*width) & Texture2D (use width)
public bool ReserveSpace(Texture textureA, Texture textureB, int width, int height)
{
int id = GetTextureID(textureA, textureB);
m_RequestedTextures[id] = new Vector2Int(width, height);

if (NeedsUpdate(textureA, textureB))
return false;

// new texture
if (!IsCached(out _, id))
{
Expand Down

0 comments on commit a8b316c

Please sign in to comment.