-
Notifications
You must be signed in to change notification settings - Fork 14
chore: upgrade to unity 6.4 #7831
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
Open
GBirch33
wants to merge
2
commits into
dev
Choose a base branch
from
chore/U6_4
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 58 additions & 58 deletions
116
.../Assets/DCL/Rendering/GPUInstancing/GPUInstancingRenderFeature.GPUInstancingRenderPass.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,58 @@ | ||
| using ECS; | ||
| using UnityEngine.Rendering; | ||
| using UnityEngine.Rendering.Universal; | ||
|
|
||
| namespace DCL.Rendering.GPUInstancing | ||
| { | ||
| public partial class GPUInstancingRenderFeature | ||
| { | ||
| public class GPUInstancingRenderPass : ScriptableRenderPass | ||
| { | ||
| private const string PROFILER_TAG = "_DCL.GPUInstancingRenderPass"; | ||
|
|
||
| private GPUInstancingService instancingService; | ||
| private IRealmData realmData; | ||
|
|
||
| public GPUInstancingRenderPass(GPUInstancingService service) | ||
| { | ||
| this.instancingService = service; | ||
| } | ||
|
|
||
| public void SetService(GPUInstancingService service, IRealmData realmData) | ||
| { | ||
| instancingService = service; | ||
| this.realmData = realmData; | ||
| } | ||
|
|
||
| // Called before executing the render pass. | ||
| public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData) | ||
| { | ||
| // Configure camera targets, if needed | ||
| } | ||
|
|
||
| // The actual execution of the pass | ||
| public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) | ||
| { | ||
| if(instancingService == null || !realmData.Configured) return; | ||
|
|
||
| CommandBuffer cmd = CommandBufferPool.Get(PROFILER_TAG); | ||
|
|
||
| try | ||
| { | ||
| instancingService.RenderIndirect(); | ||
| } | ||
| finally | ||
| { | ||
| context.ExecuteCommandBuffer(cmd); | ||
| CommandBufferPool.Release(cmd); | ||
| } | ||
| } | ||
|
|
||
| // Called after executing the render pass, if needed | ||
| public override void OnCameraCleanup(CommandBuffer cmd) { } | ||
|
|
||
| /// Cleanup any allocated resources that were created during the execution of this render pass. | ||
| public override void FrameCleanup(CommandBuffer cmd) { } | ||
| } | ||
| } | ||
| } | ||
| // using ECS; | ||
| // using UnityEngine.Rendering; | ||
| // using UnityEngine.Rendering.Universal; | ||
| // | ||
| // namespace DCL.Rendering.GPUInstancing | ||
| // { | ||
| // public partial class GPUInstancingRenderFeature | ||
| // { | ||
| // public class GPUInstancingRenderPass : ScriptableRenderPass | ||
| // { | ||
| // private const string PROFILER_TAG = "_DCL.GPUInstancingRenderPass"; | ||
| // | ||
| // private GPUInstancingService instancingService; | ||
| // private IRealmData realmData; | ||
| // | ||
| // public GPUInstancingRenderPass(GPUInstancingService service) | ||
| // { | ||
| // this.instancingService = service; | ||
| // } | ||
| // | ||
| // public void SetService(GPUInstancingService service, IRealmData realmData) | ||
| // { | ||
| // instancingService = service; | ||
| // this.realmData = realmData; | ||
| // } | ||
| // | ||
| // // Called before executing the render pass. | ||
| // public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData) | ||
| // { | ||
| // // Configure camera targets, if needed | ||
| // } | ||
| // | ||
| // // The actual execution of the pass | ||
| // public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) | ||
| // { | ||
| // if(instancingService == null || !realmData.Configured) return; | ||
| // | ||
| // CommandBuffer cmd = CommandBufferPool.Get(PROFILER_TAG); | ||
| // | ||
| // try | ||
| // { | ||
| // instancingService.RenderIndirect(); | ||
| // } | ||
| // finally | ||
| // { | ||
| // context.ExecuteCommandBuffer(cmd); | ||
| // CommandBufferPool.Release(cmd); | ||
| // } | ||
| // } | ||
| // | ||
| // // Called after executing the render pass, if needed | ||
| // public override void OnCameraCleanup(CommandBuffer cmd) { } | ||
| // | ||
| // /// Cleanup any allocated resources that were created during the execution of this render pass. | ||
| // public override void FrameCleanup(CommandBuffer cmd) { } | ||
| // } | ||
| // } | ||
| // } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The entire file is commented out. As @pravusjif noted, this should either be deleted entirely (if GPU instancing render pass is being permanently removed) or properly migrated to the new URP RenderGraph API. Leaving 58 lines of dead commented-out code adds noise and confusion about intent.
If this is a temporary measure during migration, it should be tracked in a follow-up issue. If permanent, delete the file with
git rm.Fix this →