Merge branch 'Dev'

Pjbomb2 · Pjbomb2 · commit 6b244c8a5cdc · 2025-04-21T15:24:50.000-07:00
diff --git a/TrueTrace.unitypackage b/TrueTrace.unitypackage
diff --git a/TrueTrace/Resources/MainCompute/CommonData.cginc b/TrueTrace/Resources/MainCompute/CommonData.cginc
@@ -209,9 +209,9 @@ Texture2D<half4> _EmissiveAtlas;
 Texture2D<half> _IESAtlas;
 Texture2D<half> Heightmap;
 
+SamplerState my_trilinear_repeat_sampler;
+SamplerState my_point_repeat_sampler;
 #if defined(UseBindless) && !defined(DX11)
-	SamplerState my_trilinear_repeat_sampler;
-	SamplerState my_point_repeat_sampler;
 	Texture2D<float4> _BindlessTextures[2048] : register(t31);
 #endif
 
diff --git a/TrueTrace/Resources/RayTracingMaster.cs b/TrueTrace/Resources/RayTracingMaster.cs
@@ -18,7 +18,7 @@ public class RayTracingMaster : MonoBehaviour
     {
         public static RayTracingMaster RayMaster;
         [HideInInspector] public static Camera _camera;
-        public static bool DoKernelProfiling = true;
+        public static bool DoKernelProfiling = false;
         [HideInInspector] [SerializeField] public string LocalTTSettingsName = "TTGlobalSettings";
         private bool OverriddenResolutionIsActive = false;
         public bool HDRPorURPRenderInScene = false;

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class RayTracingMaster : MonoBehaviour`
`18`	`18`	`{`
`19`	`19`	`public static RayTracingMaster RayMaster;`
`20`	`20`	`[HideInInspector] public static Camera _camera;`
`21`		`- public static bool DoKernelProfiling = true;`
	`21`	`+ public static bool DoKernelProfiling = false;`
`22`	`22`	`[HideInInspector] [SerializeField] public string LocalTTSettingsName = "TTGlobalSettings";`
`23`	`23`	`private bool OverriddenResolutionIsActive = false;`
`24`	`24`	`public bool HDRPorURPRenderInScene = false;`