Skip to content
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

remove deferred reflection shaders #18281

Merged
merged 10 commits into from
Feb 7, 2025
Merged

remove deferred reflection shaders #18281

merged 10 commits into from
Feb 7, 2025

Conversation

star-e
Copy link
Contributor

@star-e star-e commented Feb 6, 2025

To reduce texture count for WebGPU, remove unused reflectionTex in deferred pipeline.

Changelog


Continuous Integration

This pull request:

  • needs automatic test cases check.

    Manual trigger with @cocos-robot run test cases afterward.

  • does not change any runtime related code or build configuration

    If any reviewer thinks the CI checks are needed, please uncheck this option, then close and reopen the issue.


Compatibility Check

This pull request:

  • changes public API, and have ensured backward compatibility with deprecated features.
  • affects platform compatibility, e.g. system version, browser version, platform sdk version, platform toolchain, language version, hardware compatibility etc.
  • affects file structure of the build package or build configuration which requires user project upgrade.
  • introduces breaking changes, please list all changes, affected features and the scope of violation.

Copy link

github-actions bot commented Feb 6, 2025

👍 Package size ⤵ -1108 bytes, old: 5208459, new: 5207351

Interface Check Report

! WARNING this pull request has changed these public interfaces:

@@ -11820,10 +11820,8 @@
                 protected _priority: pipeline.RenderPriority;
                 protected _inputAssembler: gfx.InputAssembler | null;
                 protected _descriptorSet: gfx.DescriptorSet | null;
                 protected _worldBoundDescriptorSet: gfx.DescriptorSet | null;
-                protected _reflectionTex: gfx.Texture | null;
-                protected _reflectionSampler: gfx.Sampler | null;
                 protected _instancedAttributeBlock: IInstancedAttributeBlock;
                 protected _instancedWorldMatrixIndex: number;
                 protected _instancedSHIndex: number;
                 protected _useReflectionProbeType: number;
@@ -23562,15 +23560,13 @@
             SAMPLER_MORPH_NORMAL = 9,
             SAMPLER_MORPH_TANGENT = 10,
             SAMPLER_LIGHTMAP = 11,
             SAMPLER_SPRITE = 12,
-            SAMPLER_REFLECTION = 13,
-            STORAGE_REFLECTION = 14,
-            SAMPLER_REFLECTION_PROBE_CUBE = 15,
-            SAMPLER_REFLECTION_PROBE_PLANAR = 16,
-            SAMPLER_REFLECTION_PROBE_DATA_MAP = 17,
-            SAMPLER_REFLECTION_PROBE_BLEND_CUBE = 18,
-            COUNT = 19
+            SAMPLER_REFLECTION_PROBE_CUBE = 13,
+            SAMPLER_REFLECTION_PROBE_PLANAR = 14,
+            SAMPLER_REFLECTION_PROBE_DATA_MAP = 15,
+            SAMPLER_REFLECTION_PROBE_BLEND_CUBE = 16,
+            COUNT = 17
         }
         export const bindingMappingInfo: gfx.BindingMappingInfo;
         export enum UBOGlobalEnum {
             TIME_OFFSET = 0,
@@ -23922,10 +23918,8 @@
         export const UNIFORM_NORMAL_MORPH_TEXTURE_BINDING = ModelLocalBindings.SAMPLER_MORPH_NORMAL;
         export const UNIFORM_TANGENT_MORPH_TEXTURE_BINDING = ModelLocalBindings.SAMPLER_MORPH_TANGENT;
         export const UNIFORM_LIGHTMAP_TEXTURE_BINDING = ModelLocalBindings.SAMPLER_LIGHTMAP;
         export const UNIFORM_SPRITE_TEXTURE_BINDING = ModelLocalBindings.SAMPLER_SPRITE;
-        export const UNIFORM_REFLECTION_TEXTURE_BINDING = ModelLocalBindings.SAMPLER_REFLECTION;
-        export const UNIFORM_REFLECTION_STORAGE_BINDING = ModelLocalBindings.STORAGE_REFLECTION;
         export const UNIFORM_REFLECTION_PROBE_CUBEMAP_BINDING = ModelLocalBindings.SAMPLER_REFLECTION_PROBE_CUBE;
         export const UNIFORM_REFLECTION_PROBE_TEXTURE_BINDING = ModelLocalBindings.SAMPLER_REFLECTION_PROBE_PLANAR;
         export const UNIFORM_REFLECTION_PROBE_DATA_MAP_BINDING = ModelLocalBindings.SAMPLER_REFLECTION_PROBE_DATA_MAP;
         export const UNIFORM_REFLECTION_PROBE_BLEND_CUBEMAP_BINDING = ModelLocalBindings.SAMPLER_REFLECTION_PROBE_BLEND_CUBE;

@star-e
Copy link
Contributor Author

star-e commented Feb 6, 2025

@cocos-robot run test cases

Copy link

github-actions bot commented Feb 6, 2025

@star-e, Please check the result of run test cases:

Task Details

Platform build boot runned crashScene FailScene
web-mobile PASS PASS FAIL
ios PASS PASS FAIL reflection-probe
mac PASS PASS FAIL reflection-probe

Copy link

github-actions bot commented Feb 6, 2025

@star-e, Please check the result of run test cases:

Task Details

Platform build boot runned crashScene FailScene
windows PASS PASS PASS
android PASS PASS FAIL reflection-probe
wechatgame PASS PASS PASS

@star-e
Copy link
Contributor Author

star-e commented Feb 6, 2025

@cocos-robot run test cases

Copy link

github-actions bot commented Feb 6, 2025

@star-e, Please check the result of run test cases:

Task Details

Platform build boot runned crashScene FailScene
web-mobile PASS PASS FAIL
ios PASS PASS FAIL reflection-probe
mac PASS PASS FAIL reflection-probe

Copy link

github-actions bot commented Feb 6, 2025

@star-e, Please check the result of run test cases:

Task Details

Platform build boot runned crashScene FailScene
windows PASS PASS PASS
android PASS PASS FAIL reflection-probe
wechatgame PASS PASS PASS

@star-e
Copy link
Contributor Author

star-e commented Feb 7, 2025

@cocos-robot run test cases

@star-e
Copy link
Contributor Author

star-e commented Feb 7, 2025

@cocos-robot run test cases custom

Copy link

github-actions bot commented Feb 7, 2025

@star-e, Please check the result of run test cases:

Task Details

Platform build boot runned crashScene FailScene
web-mobile PASS PASS FAIL
ios PASS PASS FAIL reflection-probe
mac PASS PASS FAIL reflection-probe

Copy link

github-actions bot commented Feb 7, 2025

@star-e, Please check the result of run test cases:

Task Details

Platform build boot runned crashScene FailScene
windows PASS PASS PASS
android PASS PASS FAIL reflection-probe
wechatgame PASS PASS PASS

@star-e star-e requested a review from minggo February 7, 2025 05:50
@minggo
Copy link
Contributor

minggo commented Feb 7, 2025

  • these shaders are used in deferred rendering, and currently don't support deferred rendering, so delete these shaders, right?
  • it seems there is a problem in reflection probe test case

@star-e
Copy link
Contributor Author

star-e commented Feb 7, 2025

  • these shaders are used in deferred rendering, and currently don't support deferred rendering, so delete these shaders, right?

    • it seems there is a problem in reflection probe test case

The reason is the editor might not have been updated. After the pr is merged and editor is updated, the test error will be gone.

@minggo minggo merged commit 523d982 into cocos:v3.8.6 Feb 7, 2025
25 of 26 checks passed
@star-e star-e deleted the v3.8.6-gfx branch February 7, 2025 06:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants