Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
## [1.2.4] - 2024-08-14

### Fixed
* Pink materials when causing a domain reload while a subscene is open with lightmapped materials.
* Fixed an issue with entities.graphics and Burst 1.8.12
  • Loading branch information
Unity Technologies committed Aug 14, 2024
1 parent 834ec7a commit 8d2d1ce
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 14 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ uid: changelog

# Changelog

## [1.2.4] - 2024-08-14


### Fixed
* Pink materials when causing a domain reload while a subscene is open with lightmapped materials.
* Fixed an issue with entities.graphics and Burst 1.8.12


## [1.2.3] - 2024-05-30

### Changed
Expand Down
2 changes: 0 additions & 2 deletions Unity.Entities.Graphics/DrawCommandGeneration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ internal struct ChunkDrawCommand : IComparable<ChunkDrawCommand>
}

[BurstCompile]
[NoAlias]
internal unsafe struct DrawStream<T> where T : unmanaged
{
public const int kArraySizeElements = 16;
Expand Down Expand Up @@ -374,7 +373,6 @@ internal unsafe struct Header
// UnsafeUtility.Free(header, allocator);
// }

[return: NoAlias]
public T* AppendElement(RewindableAllocator* allocator)
{
if (m_Count >= ElementsPerArray)
Expand Down
2 changes: 1 addition & 1 deletion Unity.Entities.Graphics/EntitiesGraphicsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ private JobHandle RegisterMaterialsAndMeshes(JobHandle inputDeps)
sortedKeys.Sort();

// Single pass O(n) algorithm. Both arrays are guaranteed to be sorted.
for (int i = 0, j = 0; (i < sortedKeys.Length) && (j < renderArrays.Count); i++)
for (int i = 0, j = 0; i < sortedKeys.Length; i++)
{
var oldKey = sortedKeys[i];
while ((j < renderArrays.Count) && (sharedIndices[j] < oldKey))
Expand Down
4 changes: 2 additions & 2 deletions Unity.Entities.Graphics/RenderMeshBakingContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public struct LightMapReference
private int m_NumLightMappedMaterialCacheMisses;

private Dictionary<LightMapKey, LightMapReference> m_LightMapArrayCache;
private Dictionary<MaterialLookupKey, UnityObjectRef<Material>> m_LightMappedMaterialCache = new ();
private Dictionary<MaterialLookupKey, Material> m_LightMappedMaterialCache = new ();

private List<int> m_UsedLightmapIndices = new List<int>();
private Dictionary<int, LightMapReference> m_LightMapReferences;
Expand Down Expand Up @@ -226,7 +226,7 @@ public UnityObjectRef<Material> GetLightMappedMaterial(UnityObjectRef<Material>
}
}

private static UnityObjectRef<Material> CreateLightMappedMaterial(UnityObjectRef<Material> material, LightMaps lightMaps)
private static Material CreateLightMappedMaterial(UnityObjectRef<Material> material, LightMaps lightMaps)
{
var lightMappedMaterial = new Material(material);
lightMappedMaterial.name = $"{lightMappedMaterial.name}_Lightmapped_";
Expand Down
8 changes: 4 additions & 4 deletions ValidationExceptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
{
"ValidationTest": "API Updater Configuration Validation",
"ExceptionMessage": "stdout:\nAPIUpdater Configuration Validation\n-----------------------------------\n\nConfiguration Validation Tests (Failed: 0, Total: 1, Ignored 0):\n----------------------------------------------------------------\n\n\nAuto Generated Tests (Failed: 1, Total: 1, Ignored 0):\n------------------------------------------------------\n1) Expected updates not applied for configuration:\n[*] System.SByte [*] Unity.Rendering.MaterialMeshInfo::Submesh -> * Unity.Rendering.MaterialMeshInfo::SubMesh\n\nInput : unsafe class Test : object { System.SByte Method(System.SByte memberValue, Unity.Rendering.MaterialMeshInfo obj) { System.SByte local = obj.Submesh; return Method(obj.Submesh, obj); } }\nExpected: unsafe class Test : object { System.UInt16 Method(System.UInt16 memberValue, Unity.Rendering.MaterialMeshInfo obj) { System.UInt16 local = obj.SubMesh; return Method(obj.SubMesh, obj); } }\nActual : unsafe class Test : object { System.SByte Method(System.SByte memberValue, Unity.Rendering.MaterialMeshInfo obj) { System.SByte local = obj.SubMesh; return Method(obj.SubMesh, obj); } }\n\n\nBase type validation (Failed: 0, Total: 0, Ignored 0):\n------------------------------------------------------\nstderr:\n",
"PackageVersion": "1.2.3"
"PackageVersion": "1.2.4"
}
],
"WarningExceptions": [
{
"ValidationTest": "Manifest Validation",
"ExceptionMessage": "Package dependency [email protected] must be promoted to production before this package is promoted to production. (Except for core packages)",
"PackageVersion": "1.2.3"
"PackageVersion": "1.2.4"
},
{
"ValidationTest": "Folder Structure Validation",
"ExceptionMessage": "The Resources Directory should not be used in packages. For more guidance, please visit https://docs.unity3d.com/Manual/BestPracticeUnderstandingPerformanceInUnity6.html",
"PackageVersion": "1.2.3"
"PackageVersion": "1.2.4"
},
{
"ValidationTest": "Package Lifecycle Validation",
"ExceptionMessage": "com.unity.entities.graphics has never been promoted to production before. Please contact Release Management through slack in #devs-pkg-promotion to promote the first version of your package before trying to use this automated pipeline. Read more about this error and potential solutions at https://docs.unity3d.com/Packages/com.unity.package-validation-suite@latest/index.html?preview=1&subfolder=/manual/lifecycle_validation_error.html#the-very-first-version-of-a-package-must-be-promoted-by-release-management",
"PackageVersion": "1.2.3"
"PackageVersion": "1.2.4"
}
]
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "com.unity.entities.graphics",
"displayName": "Entities Graphics",
"version": "1.2.3",
"version": "1.2.4",
"unity": "2022.3",
"unityRelease": "11f1",
"description": "The Entities Graphics package provides systems and components for drawing meshes using DOTS, including support for instanced mesh rendering and LOD.",
"dependencies": {
"com.unity.entities": "1.2.3",
"com.unity.entities": "1.2.4",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.render-pipelines.core": "14.0.9"
},
Expand All @@ -17,15 +17,15 @@
"unity"
],
"_upm": {
"changelog": "### Changed\n* Updated entities packages dependencies"
"changelog": "### Fixed\n* Pink materials when causing a domain reload while a subscene is open with lightmapped materials.\n* Fixed an issue with entities.graphics and Burst 1.8.12"
},
"upmCi": {
"footprint": "3d447ce6b724068b8f44179703e6adb7c513b04f"
"footprint": "b2322db79d78d4d13909a46aef92d5e6db4c3026"
},
"documentationUrl": "https://docs.unity3d.com/Packages/[email protected]/manual/index.html",
"repository": {
"url": "https://github.cds.internal.unity3d.com/unity/dots.git",
"type": "git",
"revision": "0e866f29be5f7742acc14fad89281f547835ef01"
"revision": "3229c084d74b90980f151fe926f426ae38a63b44"
}
}

0 comments on commit 8d2d1ce

Please sign in to comment.