From 058023655595399b5339657970f8a92e468da64c Mon Sep 17 00:00:00 2001 From: PETS automation <299490404+pets-svc[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2026 11:51:57 -0400 Subject: [PATCH] trunk shadow changes: com.unity.probuilder [skip ci] --- Content/Shader/EdgePicker.shader | 2 +- Content/Shader/FaceHighlight.shader | 2 +- Content/Shader/FacePicker.shader | 2 +- Content/Shader/HideVertices.shader | 2 +- Content/Shader/LineBillboard.shader | 2 +- Content/Shader/LineBillboardMetal.shader | 2 +- Content/Shader/NormalPreview.shader | 2 +- Content/Shader/PointBillboard.shader | 2 +- Content/Shader/ReferenceUnlit.shader | 2 +- Content/Shader/ScrollHighlight.shader | 2 +- Content/Shader/SmoothingPreview.shader | 2 +- Content/Shader/TransparentOverlay.shader | 2 +- Content/Shader/UnlitSolidColor.shader | 2 +- Content/Shader/UnlitVertexColor.shader | 2 +- Content/Shader/VertexPicker.shader | 2 +- Content/Shader/VertexShader.shader | 2 +- Tests/Runtime/MeshOps/BridgeEdgesTests.cs | 2 ++ Tests/Runtime/MeshOps/CollapseVerticesTests.cs | 2 ++ Tests/Runtime/MeshOps/DeleteElementsTests.cs | 2 ++ Tests/Runtime/MeshOps/ExtrudeTests.cs | 3 +++ Tests/Runtime/MeshOps/TextureUnwrapTests.cs | 2 ++ Tests/Runtime/MeshOps/VertexColorTests.cs | 2 ++ Tests/Runtime/Shape/ShapeGeneratorTests.cs | 2 ++ Tests/Runtime/Type/VertexTests.cs | 4 ++++ 24 files changed, 35 insertions(+), 16 deletions(-) diff --git a/Content/Shader/EdgePicker.shader b/Content/Shader/EdgePicker.shader index a12c811ed..cc74aa800 100644 --- a/Content/Shader/EdgePicker.shader +++ b/Content/Shader/EdgePicker.shader @@ -49,7 +49,7 @@ CGPROGRAM return o; } - float4 frag (v2f i) : COLOR + float4 frag (v2f i) : SV_Target { return i.color; } diff --git a/Content/Shader/FaceHighlight.shader b/Content/Shader/FaceHighlight.shader index 745bad138..ea8f6582c 100644 --- a/Content/Shader/FaceHighlight.shader +++ b/Content/Shader/FaceHighlight.shader @@ -45,7 +45,7 @@ Shader "Hidden/ProBuilder/FaceHighlight" return o; } - half4 frag (v2f i) : COLOR + half4 frag (v2f i) : SV_Target { i.pos.xy = floor(i.pos.xy * 1) * .5; float checker = -frac(i.pos.x + i.pos.y); diff --git a/Content/Shader/FacePicker.shader b/Content/Shader/FacePicker.shader index 78d729789..90ada9cc5 100644 --- a/Content/Shader/FacePicker.shader +++ b/Content/Shader/FacePicker.shader @@ -41,7 +41,7 @@ Shader "Hidden/ProBuilder/FacePicker" return o; } - float4 frag (v2f i) : COLOR + float4 frag (v2f i) : SV_Target { return i.color; } diff --git a/Content/Shader/HideVertices.shader b/Content/Shader/HideVertices.shader index fa83ce030..14148ae68 100644 --- a/Content/Shader/HideVertices.shader +++ b/Content/Shader/HideVertices.shader @@ -33,7 +33,7 @@ Shader "Hidden/ProBuilder/HideVertices" return o; } - half4 frag (v2f i) : COLOR + half4 frag (v2f i) : SV_Target { return fixed4(0,0,0,0); } diff --git a/Content/Shader/LineBillboard.shader b/Content/Shader/LineBillboard.shader index b2284b3a2..3e8a58616 100644 --- a/Content/Shader/LineBillboard.shader +++ b/Content/Shader/LineBillboard.shader @@ -94,7 +94,7 @@ Shader "Hidden/ProBuilder/LineBillboard" triStream.Append(geo_out); } - fixed4 frag (v2f i) : COLOR + fixed4 frag (v2f i) : SV_Target { return i.color * _Color; } diff --git a/Content/Shader/LineBillboardMetal.shader b/Content/Shader/LineBillboardMetal.shader index e433a7e98..fa03ee02f 100644 --- a/Content/Shader/LineBillboardMetal.shader +++ b/Content/Shader/LineBillboardMetal.shader @@ -67,7 +67,7 @@ Shader "Hidden/ProBuilder/LineBillboardMetal" return o; } - half4 frag (v2f i) : COLOR + half4 frag (v2f i) : SV_Target { return _Color; } diff --git a/Content/Shader/NormalPreview.shader b/Content/Shader/NormalPreview.shader index 992e28117..21d21a6da 100644 --- a/Content/Shader/NormalPreview.shader +++ b/Content/Shader/NormalPreview.shader @@ -44,7 +44,7 @@ Shader "Hidden/ProBuilder/NormalPreview" return o; } - half4 frag (v2f i) : COLOR + half4 frag (v2f i) : SV_Target { return i.color; } diff --git a/Content/Shader/PointBillboard.shader b/Content/Shader/PointBillboard.shader index 1c57b0d6c..42d8ed926 100644 --- a/Content/Shader/PointBillboard.shader +++ b/Content/Shader/PointBillboard.shader @@ -118,7 +118,7 @@ Shader "Hidden/ProBuilder/PointBillboard" triStream.Append(geo_out); } - float4 frag(FS_INPUT input) : COLOR + float4 frag(FS_INPUT input) : SV_Target { return _Color * input.color; } diff --git a/Content/Shader/ReferenceUnlit.shader b/Content/Shader/ReferenceUnlit.shader index 9f9582f0f..c01ded0af 100644 --- a/Content/Shader/ReferenceUnlit.shader +++ b/Content/Shader/ReferenceUnlit.shader @@ -56,7 +56,7 @@ Shader "ProBuilder/Reference Unlit" return o; } - half4 frag (v2f i) : COLOR + half4 frag (v2f i) : SV_Target { return tex2D(_MainTex, i.uv); } diff --git a/Content/Shader/ScrollHighlight.shader b/Content/Shader/ScrollHighlight.shader index e71c7b6ce..66d292064 100644 --- a/Content/Shader/ScrollHighlight.shader +++ b/Content/Shader/ScrollHighlight.shader @@ -54,7 +54,7 @@ Shader "Hidden/ProBuilder/ScrollHighlight" { o.pos = UnityObjectToClipPos(v.vertex ); return o; } - float4 frag(VertexOutput i, float facing : VFACE) : COLOR { + float4 frag(VertexOutput i, float facing : VFACE) : SV_Target { float isFrontFace = ( facing >= 0 ? 1 : 0 ); float faceSign = ( facing >= 0 ? 1 : -1 ); ////// Lighting: diff --git a/Content/Shader/SmoothingPreview.shader b/Content/Shader/SmoothingPreview.shader index fc2b44e43..af9846522 100644 --- a/Content/Shader/SmoothingPreview.shader +++ b/Content/Shader/SmoothingPreview.shader @@ -47,7 +47,7 @@ Shader "Hidden/ProBuilder/SmoothingPreview" return o; } - half4 frag (v2f i) : COLOR + half4 frag (v2f i) : SV_Target { i.pos.xy = floor(i.pos.xy * 1) * .5; float checker = -frac(i.pos.x + i.pos.y); diff --git a/Content/Shader/TransparentOverlay.shader b/Content/Shader/TransparentOverlay.shader index 350a2dae8..7acd6fc6e 100644 --- a/Content/Shader/TransparentOverlay.shader +++ b/Content/Shader/TransparentOverlay.shader @@ -50,7 +50,7 @@ Shader "Hidden/ProBuilder/TransparentOverlay" return o; } - half4 frag (v2f i) : COLOR + half4 frag (v2f i) : SV_Target { return tex2D(_MainTex, i.uv) * i.color; } diff --git a/Content/Shader/UnlitSolidColor.shader b/Content/Shader/UnlitSolidColor.shader index 24d61a3c2..52cebe5a8 100644 --- a/Content/Shader/UnlitSolidColor.shader +++ b/Content/Shader/UnlitSolidColor.shader @@ -44,7 +44,7 @@ Shader "ProBuilder/Unlit Solid Color" return o; } - half4 frag (v2f i) : COLOR + half4 frag (v2f i) : SV_Target { return _Color; } diff --git a/Content/Shader/UnlitVertexColor.shader b/Content/Shader/UnlitVertexColor.shader index 46be8269b..f1e3b117d 100644 --- a/Content/Shader/UnlitVertexColor.shader +++ b/Content/Shader/UnlitVertexColor.shader @@ -40,7 +40,7 @@ Shader "ProBuilder/UnlitVertexColor" return o; } - half4 frag (v2f i) : COLOR + half4 frag (v2f i) : SV_Target { return i.color; } diff --git a/Content/Shader/VertexPicker.shader b/Content/Shader/VertexPicker.shader index 3c8995c24..d4b153872 100644 --- a/Content/Shader/VertexPicker.shader +++ b/Content/Shader/VertexPicker.shader @@ -65,7 +65,7 @@ CGPROGRAM return o; } - float4 frag (v2f i) : COLOR + float4 frag (v2f i) : SV_Target { return i.color; } diff --git a/Content/Shader/VertexShader.shader b/Content/Shader/VertexShader.shader index 8bfb542d4..b29cce7be 100644 --- a/Content/Shader/VertexShader.shader +++ b/Content/Shader/VertexShader.shader @@ -71,7 +71,7 @@ Shader "Hidden/ProBuilder/VertexShader" return o; } - half4 frag (v2f i) : COLOR + half4 frag (v2f i) : SV_Target { return _Color; } diff --git a/Tests/Runtime/MeshOps/BridgeEdgesTests.cs b/Tests/Runtime/MeshOps/BridgeEdgesTests.cs index f7ad39fcc..235fd4b4b 100644 --- a/Tests/Runtime/MeshOps/BridgeEdgesTests.cs +++ b/Tests/Runtime/MeshOps/BridgeEdgesTests.cs @@ -6,7 +6,9 @@ using UnityEngine.ProBuilder.Shapes; using UnityEngine.ProBuilder.Tests; using UnityEngine.ProBuilder.Tests.Framework; +using UnityEngine.TestTools; +[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148933", "ProBuilder test mesh templates resolve their asset path from StackTrace calling-method info, which fails on CoreCLR")] static class BridgeEdgesTests { [Test] diff --git a/Tests/Runtime/MeshOps/CollapseVerticesTests.cs b/Tests/Runtime/MeshOps/CollapseVerticesTests.cs index 6926a1335..3ff5bdfb6 100644 --- a/Tests/Runtime/MeshOps/CollapseVerticesTests.cs +++ b/Tests/Runtime/MeshOps/CollapseVerticesTests.cs @@ -5,7 +5,9 @@ using UnityEngine.ProBuilder.Shapes; using UnityEngine.ProBuilder.Tests; using UnityEngine.ProBuilder.Tests.Framework; +using UnityEngine.TestTools; +[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148933", "ProBuilder test mesh templates resolve their asset path from StackTrace calling-method info, which fails on CoreCLR")] static class CollapseVerticesTests { [Test] diff --git a/Tests/Runtime/MeshOps/DeleteElementsTests.cs b/Tests/Runtime/MeshOps/DeleteElementsTests.cs index a25b988ae..a39480844 100644 --- a/Tests/Runtime/MeshOps/DeleteElementsTests.cs +++ b/Tests/Runtime/MeshOps/DeleteElementsTests.cs @@ -8,6 +8,7 @@ using UnityEngine.ProBuilder.Shapes; using UnityEngine.ProBuilder.Tests; using UnityEngine.ProBuilder.Tests.Framework; +using UnityEngine.TestTools; static class DeleteElementsTests { @@ -89,6 +90,7 @@ public static void Cleanup() } [Test] + [UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148933", "ProBuilder test mesh templates resolve their asset path from StackTrace calling-method info, which fails on CoreCLR")] public static void DeleteFirstFace_CreatesValidMesh([ValueSource("shapeTypes")] Type shape) { var mesh = ShapeFactory.Instantiate(shape); diff --git a/Tests/Runtime/MeshOps/ExtrudeTests.cs b/Tests/Runtime/MeshOps/ExtrudeTests.cs index b33035edc..3e1718f38 100644 --- a/Tests/Runtime/MeshOps/ExtrudeTests.cs +++ b/Tests/Runtime/MeshOps/ExtrudeTests.cs @@ -81,6 +81,7 @@ public static void Extrude_MultipleEdges_CreatesValidGeometry() } [Test] + [UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148933", "ProBuilder test mesh templates resolve their asset path from StackTrace calling-method info, which fails on CoreCLR")] public static void ExtrudeAllFaces_FaceNormal([ValueSource("m_AvailableShapeTypes")] Type shape) { var mesh = ShapeFactory.Instantiate(shape); @@ -107,6 +108,7 @@ public static void ExtrudeAllFaces_FaceNormal([ValueSource("m_AvailableShapeType } [Test] + [UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148933", "ProBuilder test mesh templates resolve their asset path from StackTrace calling-method info, which fails on CoreCLR")] public static void ExtrudeAllFaces_IndividualFaces([ValueSource("m_AvailableShapeTypes")] Type shape) { var mesh = ShapeFactory.Instantiate(shape); @@ -135,6 +137,7 @@ public static void ExtrudeAllFaces_IndividualFaces([ValueSource("m_AvailableShap } [Test] + [UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148933", "ProBuilder test mesh templates resolve their asset path from StackTrace calling-method info, which fails on CoreCLR")] public static void ExtrudeAllFaces_VertexNormal([ValueSource("m_AvailableShapeTypes")] Type shape) { var mesh = ShapeFactory.Instantiate(shape); diff --git a/Tests/Runtime/MeshOps/TextureUnwrapTests.cs b/Tests/Runtime/MeshOps/TextureUnwrapTests.cs index 39fc38964..6cb8a79b4 100644 --- a/Tests/Runtime/MeshOps/TextureUnwrapTests.cs +++ b/Tests/Runtime/MeshOps/TextureUnwrapTests.cs @@ -6,7 +6,9 @@ using UnityEngine.ProBuilder.Shapes; using UnityEngine.ProBuilder.Tests; using UnityEngine.ProBuilder.Tests.Framework; +using UnityEngine.TestTools; +[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148933", "ProBuilder test mesh templates resolve their asset path from StackTrace calling-method info, which fails on CoreCLR")] static class TextureUnwrapTests { static readonly Type[] offsetRotationShapes = new Type[] diff --git a/Tests/Runtime/MeshOps/VertexColorTests.cs b/Tests/Runtime/MeshOps/VertexColorTests.cs index ea67656cb..db8ab2258 100644 --- a/Tests/Runtime/MeshOps/VertexColorTests.cs +++ b/Tests/Runtime/MeshOps/VertexColorTests.cs @@ -5,7 +5,9 @@ using UnityEngine.ProBuilder.Shapes; using UnityEngine.ProBuilder.Tests; using UnityEngine.ProBuilder.Tests.Framework; +using UnityEngine.TestTools; +[UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148933", "ProBuilder test mesh templates resolve their asset path from StackTrace calling-method info, which fails on CoreCLR")] static class VertexColorTests { [Test] diff --git a/Tests/Runtime/Shape/ShapeGeneratorTests.cs b/Tests/Runtime/Shape/ShapeGeneratorTests.cs index 0472224d8..b36183b4d 100644 --- a/Tests/Runtime/Shape/ShapeGeneratorTests.cs +++ b/Tests/Runtime/Shape/ShapeGeneratorTests.cs @@ -6,6 +6,7 @@ using System; using UnityEngine.ProBuilder.Shapes; using UnityEngine.ProBuilder.Tests.Framework; +using UnityEngine.TestTools; class ShapeGeneratorTests { @@ -25,6 +26,7 @@ public static List shapeTypes { } [Test] + [UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148933", "ProBuilder test mesh templates resolve their asset path from StackTrace calling-method info, which fails on CoreCLR")] public void ShapeGenerator_MatchesTemplate([ValueSource("shapeTypes")] Type type) { ProBuilderMesh pb = ShapeFactory.Instantiate(type); diff --git a/Tests/Runtime/Type/VertexTests.cs b/Tests/Runtime/Type/VertexTests.cs index 8b04df701..ecb7fe545 100644 --- a/Tests/Runtime/Type/VertexTests.cs +++ b/Tests/Runtime/Type/VertexTests.cs @@ -4,6 +4,7 @@ using System.Linq; using System; using UnityEngine.ProBuilder; +using UnityEngine.TestTools; static class TestHashUtility { @@ -56,6 +57,7 @@ static Vertex RandVertex() } [Test] + [UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148935", "ProBuilder IntVec3/VectorHash float hashing produces different values on CoreCLR")] public static void TestHashCollisions_IVEC3() { #if UNITY_EDITOR_OSX @@ -68,6 +70,7 @@ public static void TestHashCollisions_IVEC3() } [Test] + [UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148935", "ProBuilder IntVec3/VectorHash float hashing produces different values on CoreCLR")] public static void TestVectorHashOverflow() { #if UNITY_EDITOR_OSX @@ -88,6 +91,7 @@ public static void TestVectorHashOverflow() } [Test] + [UnityCoreClrExplicitDisabled("https://jira.unity3d.com/browse/UUM-148935", "ProBuilder IntVec3/VectorHash float hashing produces different values on CoreCLR")] public static void TestComparison_IVEC3() { #if UNITY_EDITOR_OSX