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

Workaround errors when loading wallpapers made recently #244

Merged
merged 3 commits into from
Sep 2, 2024

Conversation

moetayuko
Copy link
Contributor

Recent assets introduced new types such as sampler2DComparison:

❯ rg sampler2DComparison
assets/shaders/volumetricsfront.frag
11:uniform sampler2DComparison g_Texture0; // {"hidden":true,"default":"_rt_shadowAtlas"}

assets/shaders/chroma4.frag
23:uniform sampler2DComparison g_Texture6; // {"hidden":true,"default":"_rt_shadowAtlas"}

assets/shaders/generic4.frag
24:uniform sampler2DComparison g_Texture6; // {"hidden":true,"default":"_rt_shadowAtlas"}

assets/shaders/foliage4.frag
25:uniform sampler2DComparison g_Texture6; // {"hidden":true,"default":"_rt_shadowAtlas"}

assets/shaders/genericimage4.frag
9:uniform sampler2DComparison g_Texture6; // {"hidden":true,"default":"_rt_shadowAtlas"}

assets/shaders/fur4.frag
23:uniform sampler2DComparison g_Texture6; // {"hidden":true,"default":"_rt_shadowAtlas"}

assets/effects/fluidsimulation/shaders/effects/fluidsimulation_combine.frag
12:uniform sampler2DComparison g_Texture6; // {"hidden":true,"default":"_rt_shadowAtlas"}

This PR adds some workarounds to make new wallpapers load (but not guaranteed to render correctly)

For example, 3312993556 loads after this PR, but is not correctly rendered, so further work is required.

`#require LightingV1` is found in generic4.frag, genericimage4.frag, ...
Currently not supported, but prevents loading from the file, thereby
avoiding CAssetLoadException
Copy link

coderabbitai bot commented Sep 1, 2024

Walkthrough

The changes involve modifications to the CPass class's setupUniforms method to include an additional texture name prefix check, allowing for more flexible texture resolution. Additionally, the Compiler class has been enhanced to support #require directives in shader compilation and to accommodate a new sampler type, sampler2DComparison, alongside existing types. These updates improve the handling of texture names and shader parameters.

Changes

Files Change Summary
src/WallpaperEngine/Render/Objects/Effects/CPass.cpp, src/WallpaperEngine/Render/Shaders/Compiler.cpp Expanded texture name checks in CPass::setupUniforms to include "alias". Enhanced Compiler class to handle #require directives and added support for sampler2DComparison in shader parameter configuration. Updated sTypes to include new shader types.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between d4687f0 and d079eae.

Files selected for processing (2)
  • src/WallpaperEngine/Render/Objects/Effects/CPass.cpp (1 hunks)
  • src/WallpaperEngine/Render/Shaders/Compiler.cpp (3 hunks)
Additional comments not posted (2)
src/WallpaperEngine/Render/Shaders/Compiler.cpp (1)

767-770: Update sTypes to include new shader types.

The addition of "sampler2DComparison" and "uint" to the sTypes vector is essential for the compiler to recognize and handle these new types. This update is well-aligned with the PR's objectives to support new shader features.

Ensure that all new types are correctly used throughout the shader compilation process. This can be verified by checking other parts of the code where sTypes is utilized.

src/WallpaperEngine/Render/Objects/Effects/CPass.cpp (1)

454-454: LGTM!

The code change looks good. It broadens the criteria for resolving the texture reference by allowing the method to accommodate textures prefixed with either "rt" or "alias", potentially altering the behavior of texture resolution in the rendering process. This aligns with the AI-generated summary.

@Almamu Almamu merged commit 5a45c9a into Almamu:main Sep 2, 2024
5 checks passed
@Almamu
Copy link
Owner

Almamu commented Sep 2, 2024

Changes look good, proper support for these features will require some reverse engineering on RenderDoc, so this should at least get things somewhat there. Thanks for your contribution!

@Almamu
Copy link
Owner

Almamu commented Sep 2, 2024

I've created issue #246 for tracking as this might require some proper investigation.

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.

2 participants