Basic shader generation refactoring #6250
Merged
Conversation
This file contains 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
slimbuck
reviewed
Apr 12, 2024
slimbuck
reviewed
Apr 12, 2024
slimbuck
approved these changes
Apr 12, 2024
kpal81xd
reviewed
Apr 12, 2024
| import { ShaderGenerator } from './shader-generator.js'; | ||
|
|
||
| const vShader = ` |
There was a problem hiding this comment.
Suggested change
| const vShader = ` | |
| const vShader = /* glsl */` |
kpal81xd
reviewed
Apr 12, 2024
| } | ||
| `; | ||
|
|
||
| const fShader = ` |
There was a problem hiding this comment.
Suggested change
| const fShader = ` | |
| const fShader = /* glsl */` |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR uses recently added support for
#includein the Preprocessor (#6242) to refactor the basic shader generation. Instead of a JS code that glues strings and chunks together, it creates a list of defines based on the generation options, and the vertex and fragment code is simply processed with those. This makes it a lot easier to understand the shader code, which is now specified as a single string.This is a prototype of where we want to go with the standard shader in the future.
New public API: