Skip to content

Commit 7f8e050

Browse files
authored
builtin pipeline add global uniform (#18694)
1 parent 57481a8 commit 7f8e050

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

editor/assets/default_renderpipeline/builtin-dof-pass.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ export class BuiltinDepthOfFieldPass extends BuiltinPipelinePassBuilder
288288
const blurPass = ppl.addRenderPass(width, height, 'cc-dof-blur');
289289
blurPass.addRenderTarget(tempRadiance, LoadOp.CLEAR, StoreOp.STORE, this._clearColorTransparentBlack);
290290
blurPass.addTexture(inputRadiance, 'screenTex');
291-
blurPass.setVec4('g_platform', pplConfigs.platform);
292291
blurPass.setVec4('blurParams', this._cocParams);
293292
blurPass.setVec4('mainTexTexelSize', this._cocTexSize);
294293
blurPass
@@ -300,7 +299,6 @@ export class BuiltinDepthOfFieldPass extends BuiltinPipelinePassBuilder
300299
cocPass.addTexture(tempRadiance, 'colorTex');
301300
cocPass.addTexture(inputDepthStencil, "DepthTex");
302301
cocPass.addTexture(inputRadiance, "screenTex");
303-
cocPass.setVec4('g_platform', pplConfigs.platform);
304302
cocPass.setMat4('proj', camera.matProj);
305303
cocPass.setMat4('invProj', camera.matProjInv);
306304
cocPass.setMat4('viewMatInv', camera.node.worldMatrix);

editor/assets/default_renderpipeline/builtin-pipeline.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ function addCopyToScreenPass(
188188
LoadOp.CLEAR, StoreOp.STORE,
189189
sClearColorTransparentBlack);
190190
pass.addTexture(input, 'inputTexture');
191-
pass.setVec4('g_platform', pplConfigs.platform);
192191
pass.addQueue(rendering.QueueHint.OPAQUE)
193192
.addFullscreenQuad(cameraConfigs.copyAndTonemapMaterial, 1);
194193
return pass;
@@ -521,6 +520,9 @@ export class BuiltinForwardPassBuilder implements rendering.PipelinePassBuilder
521520
cameraConfigs: CameraConfigs & ForwardPassConfigs,
522521
camera: renderer.scene.Camera,
523522
context: PipelineContext): rendering.BasicRenderPassBuilder | undefined {
523+
// Add global constants
524+
ppl.setVec4('g_platform', pplConfigs.platform);
525+
524526
const id = camera.window.renderWindowId;
525527

526528
const scene = camera.scene!;
@@ -1095,7 +1097,6 @@ export class BuiltinBloomPassBuilder implements rendering.PipelinePassBuilder {
10951097
this._clearColorTransparentBlack,
10961098
);
10971099
prefilterPass.addTexture(radianceName, 'inputTexture');
1098-
prefilterPass.setVec4('g_platform', pplConfigs.platform);
10991100
prefilterPass.setVec4('bloomParams', this._bloomParams);
11001101
prefilterPass
11011102
.addQueue(QueueHint.OPAQUE)
@@ -1108,7 +1109,6 @@ export class BuiltinBloomPassBuilder implements rendering.PipelinePassBuilder {
11081109
downPass.addTexture(this._bloomTexNames[i - 1], 'bloomTexture');
11091110
this._bloomTexSize.x = this._bloomWidths[i - 1];
11101111
this._bloomTexSize.y = this._bloomHeights[i - 1];
1111-
downPass.setVec4('g_platform', pplConfigs.platform);
11121112
downPass.setVec4('bloomTexSize', this._bloomTexSize);
11131113
downPass
11141114
.addQueue(QueueHint.OPAQUE)
@@ -1122,7 +1122,6 @@ export class BuiltinBloomPassBuilder implements rendering.PipelinePassBuilder {
11221122
upPass.addTexture(this._bloomTexNames[i + 1], 'bloomTexture');
11231123
this._bloomTexSize.x = this._bloomWidths[i + 1];
11241124
this._bloomTexSize.y = this._bloomHeights[i + 1];
1125-
upPass.setVec4('g_platform', pplConfigs.platform);
11261125
upPass.setVec4('bloomTexSize', this._bloomTexSize);
11271126
upPass
11281127
.addQueue(QueueHint.OPAQUE)
@@ -1133,7 +1132,6 @@ export class BuiltinBloomPassBuilder implements rendering.PipelinePassBuilder {
11331132
const combinePass = ppl.addRenderPass(width, height, 'cc-bloom-combine');
11341133
combinePass.addRenderTarget(radianceName, LoadOp.LOAD, StoreOp.STORE);
11351134
combinePass.addTexture(this._bloomTexNames[0], 'bloomTexture');
1136-
combinePass.setVec4('g_platform', pplConfigs.platform);
11371135
combinePass.setVec4('bloomParams', this._bloomParams);
11381136
combinePass
11391137
.addQueue(QueueHint.BLEND)
@@ -1256,7 +1254,6 @@ export class BuiltinToneMappingPassBuilder implements rendering.PipelinePassBuil
12561254
}
12571255
pass.addRenderTarget(colorName, LoadOp.CLEAR, StoreOp.STORE, sClearColorTransparentBlack);
12581256
pass.addTexture(radianceName, 'sceneColorMap');
1259-
pass.setVec4('g_platform', pplConfigs.platform);
12601257
pass.setVec2('lutTextureSize', this._colorGradingTexSize);
12611258
pass.setFloat('contribute', settings.colorGrading.contribute);
12621259
pass.addQueue(rendering.QueueHint.OPAQUE)
@@ -1265,7 +1262,6 @@ export class BuiltinToneMappingPassBuilder implements rendering.PipelinePassBuil
12651262
pass = ppl.addRenderPass(width, height, 'cc-tone-mapping');
12661263
pass.addRenderTarget(colorName, LoadOp.CLEAR, StoreOp.STORE, sClearColorTransparentBlack);
12671264
pass.addTexture(radianceName, 'inputTexture');
1268-
pass.setVec4('g_platform', pplConfigs.platform);
12691265
if (settings.toneMapping.material) {
12701266
pass.addQueue(rendering.QueueHint.OPAQUE)
12711267
.addFullscreenQuad(settings.toneMapping.material, 0);
@@ -1371,7 +1367,6 @@ export class BuiltinFXAAPassBuilder implements rendering.PipelinePassBuilder {
13711367
const pass = ppl.addRenderPass(width, height, 'cc-fxaa');
13721368
pass.addRenderTarget(colorName, LoadOp.CLEAR, StoreOp.STORE, sClearColorTransparentBlack);
13731369
pass.addTexture(ldrColorName, 'sceneColorMap');
1374-
pass.setVec4('g_platform', pplConfigs.platform);
13751370
pass.setVec4('texSize', this._fxaaParams);
13761371
pass.addQueue(rendering.QueueHint.OPAQUE)
13771372
.addFullscreenQuad(fxaaMaterial, 0);
@@ -1465,7 +1460,6 @@ export class BuiltinFsrPassBuilder implements rendering.PipelinePassBuilder {
14651460
const easuPass = ppl.addRenderPass(nativeWidth, nativeHeight, 'cc-fsr-easu');
14661461
easuPass.addRenderTarget(fsrColorName, LoadOp.CLEAR, StoreOp.STORE, sClearColorTransparentBlack);
14671462
easuPass.addTexture(inputColorName, 'outputResultMap');
1468-
easuPass.setVec4('g_platform', pplConfigs.platform);
14691463
easuPass.setVec4('fsrTexSize', this._fsrTexSize);
14701464
easuPass
14711465
.addQueue(rendering.QueueHint.OPAQUE)
@@ -1474,7 +1468,6 @@ export class BuiltinFsrPassBuilder implements rendering.PipelinePassBuilder {
14741468
const rcasPass = ppl.addRenderPass(nativeWidth, nativeHeight, 'cc-fsr-rcas');
14751469
rcasPass.addRenderTarget(outputColorName, LoadOp.CLEAR, StoreOp.STORE, sClearColorTransparentBlack);
14761470
rcasPass.addTexture(fsrColorName, 'outputResultMap');
1477-
rcasPass.setVec4('g_platform', pplConfigs.platform);
14781471
rcasPass.setVec4('fsrTexSize', this._fsrTexSize);
14791472
rcasPass.setVec4('fsrParams', this._fsrParams);
14801473
rcasPass
@@ -1718,6 +1711,7 @@ if (rendering) {
17181711
if (this._initMaterials(ppl)) {
17191712
return;
17201713
}
1714+
17211715
// Render cameras
17221716
// log(`==================== One Frame ====================`);
17231717
for (const camera of cameras) {

0 commit comments

Comments
 (0)