Skip to content

Commit

Permalink
Sorting on shorter patches outperforms hashing, with negative optimiz…
Browse files Browse the repository at this point in the history
…ation on longer global patches.
  • Loading branch information
troublemaker52025 committed Sep 15, 2023
1 parent 31e763f commit ecbdd68
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions cocos/render-scene/scene/submodel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ export class SubModel {
protected _shaders: Shader[] | null = null;
protected _subMesh: RenderingSubMesh | null = null;
protected _patches: IMacroPatch[] | null = null;
protected _globalPatches: MacroRecord = {};
protected _priority: RenderPriority = RenderPriority.DEFAULT;
protected _inputAssembler: InputAssembler | null = null;
protected _descriptorSet: DescriptorSet | null = null;
Expand Down Expand Up @@ -326,20 +325,6 @@ export class SubModel {
* @zh 管线更新回调
*/
public onPipelineStateChanged (): void {
const root = cclegacy.director.root as Root;
const pipeline = root.pipeline;
const pipelinePatches = Object.entries(pipeline.macros);
const globalPatches = Object.entries(this._globalPatches);
if (globalPatches.length === 0 && pipelinePatches.length === 0) {
return;
}

if (pipelinePatches.length === globalPatches.length) {
const patchesStateUnchanged = JSON.stringify(pipelinePatches.sort()) === JSON.stringify(globalPatches.sort());
if (patchesStateUnchanged) return;
}
overrideMacros(this._globalPatches, pipeline.macros);

const passes = this._passes;
if (!passes) { return; }

Expand All @@ -362,6 +347,7 @@ export class SubModel {
return;
} else if (patches) {
patches = patches.sort();
// Sorting on shorter patches outperforms hashing, with negative optimization on longer global patches.
if (this._patches && patches.length === this._patches.length) {
const patchesStateUnchanged = JSON.stringify(patches) === JSON.stringify(this._patches);
if (patchesStateUnchanged) return;
Expand Down

0 comments on commit ecbdd68

Please sign in to comment.