This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
[Impeller] added static check that fragment shader and vertex shaders slots match #52174
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,8 +87,73 @@ PipelineFuture<ComputePipelineDescriptor> CreatePipelineFuture( | |
| const Context& context, | ||
| std::optional<ComputePipelineDescriptor> desc); | ||
|
|
||
| /// This is a classed use to check that the input slots of fragment shaders | ||
| /// match the output slots of the vertex shaders. | ||
| /// It's not used at runtime. | ||
| template <typename VertexShaderT, typename FragmentShaderT> | ||
| class ShaderBindingComparator { | ||
|
||
| public: | ||
| static constexpr bool CompileTimeStrEqual(const char* str1, | ||
gaaclarke marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| const char* str2) { | ||
| return *str1 == *str2 && | ||
| (*str1 == '\0' || CompileTimeStrEqual(str1 + 1, str2 + 1)); | ||
| } | ||
|
|
||
| static constexpr bool Compare() { | ||
gaaclarke marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| constexpr size_t num_outputs = VertexShaderT::kAllShaderStageOutputs.size(); | ||
| constexpr size_t num_inputs = FragmentShaderT::kAllShaderStageInputs.size(); | ||
|
|
||
| if (num_inputs > num_outputs) { | ||
| return false; | ||
| } | ||
|
|
||
| for (size_t i = 0; i < num_inputs; ++i) { | ||
| const ShaderStageIOSlot* input_slot = | ||
| FragmentShaderT::kAllShaderStageInputs[i]; | ||
| for (size_t j = 0; j < num_outputs; ++j) { | ||
| const ShaderStageIOSlot* output_slot = | ||
| VertexShaderT::kAllShaderStageOutputs[j]; | ||
| if (input_slot->location == output_slot->location) { | ||
| if (!CompileTimeStrEqual(input_slot->name, output_slot->name) || | ||
| input_slot->set != output_slot->set || | ||
| input_slot->binding != output_slot->binding || | ||
| input_slot->type != output_slot->type || | ||
| input_slot->bit_width != output_slot->bit_width || | ||
| input_slot->vec_size != output_slot->vec_size || | ||
| input_slot->columns != output_slot->columns || | ||
| input_slot->offset != output_slot->offset) { | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
| }; | ||
|
|
||
| // The following shaders don't define output slots. | ||
| // TODO(tbd): Make impellerc emit an empty array for output slots. | ||
| struct CheckerboardVertexShader; | ||
gaaclarke marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| struct ClipVertexShader; | ||
|
|
||
| template <typename FragmentShaderT> | ||
| class ShaderBindingComparator<CheckerboardVertexShader, FragmentShaderT> { | ||
|
||
| public: | ||
| static constexpr bool Compare() { return true; } | ||
| }; | ||
|
|
||
| template <typename FragmentShaderT> | ||
| class ShaderBindingComparator<ClipVertexShader, FragmentShaderT> { | ||
| public: | ||
| static constexpr bool Compare() { return true; } | ||
| }; | ||
|
|
||
| template <class VertexShader_, class FragmentShader_> | ||
| class RenderPipelineT { | ||
| static_assert( | ||
gaaclarke marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ShaderBindingComparator<VertexShader_, FragmentShader_>::Compare()); | ||
|
|
||
| public: | ||
| using VertexShader = VertexShader_; | ||
| using FragmentShader = FragmentShader_; | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.