Skip to content

Fix 1299233 ies resize bug #3094

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 23 commits into from
Jan 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
77bae01
Fixed Render Graph immediate mode. (#3033)
JulienIgnace-Unity Jan 8, 2021
47bd6c2
Fix issue with shadow mask and area lights (#3019)
FrancescoC-unity Jan 8, 2021
88daab3
Fix issue with capture callback (now includes post processing results…
pmavridis Jan 8, 2021
4313b48
[HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)
alelievr Jan 8, 2021
a9c4c27
Fixed various Look Dev issues after exiting Playmode (#2956)
JulienIgnace-Unity Jan 11, 2021
d358740
Merge branch 'master' into hd/bugfix
sebastienlagarde Jan 11, 2021
11b5984
Merge branch 'master' into hd/bugfix
sebastienlagarde Jan 11, 2021
a22cfa4
StackLit: Fix SG surface option property block to only display energy…
slunity Jan 12, 2021
a3c36a5
Fixed missing BeginCameraRendering call for custom render mode of a C…
sebastienlagarde Jan 12, 2021
6cb6820
Implement custom drawer for layer mask parameters (#3066)
adrien-de-tocqueville Jan 12, 2021
ccf4f96
Adding mixed light baking shadowmask test (#3052)
remi-chapelain Jan 12, 2021
6149540
Changed the clamping approach for RTR and RTGI (in both perf and qual…
anisunity Jan 12, 2021
cf36177
Fixed the condition on temporal accumulation in the reflection denois…
anisunity Jan 12, 2021
5fecd49
Changed the warning message for ray traced area shadows (case 1303410…
anisunity Jan 12, 2021
55bb6ff
Disabled specular occlusion for what we consider medium and larger sc…
anisunity Jan 12, 2021
fd53759
Merge branch 'master' into hd/bugfix
sebastienlagarde Jan 12, 2021
f3699e8
Merge branch 'master' into hd/bugfix
sebastienlagarde Jan 13, 2021
9085d3b
Fix 1299233 ies resize bug
skhiat Jan 13, 2021
4759e1e
change log
skhiat Jan 13, 2021
729e781
Merge branch 'hd/bugfix' into HDRP/fix_1299233_IES_Resize
sebastienlagarde Jan 14, 2021
bcaa8cd
Update CHANGELOG.md
sebastienlagarde Jan 14, 2021
e035113
fix merge issue
sebastienlagarde Jan 14, 2021
9262089
Merge branch 'hd/bugfix' into HDRP/fix_1299233_IES_Resize
skhiat Jan 14, 2021
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
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed
- Fixed GC allocations from XR occlusion mesh when using multipass.
- Fixed XR depth copy when using MSAA.
- Fixed resize IES when already baked in the Atlas 1299233
- Fixed after post process custom pass scale issue when dynamic resolution is enabled (case 1299194).
- Fixed an issue with light intensity prefab override application not visible in the inspector (case 1299563).
- Fixed Undo/Redo instability of light temperature.
Expand Down
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