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
Add setImageSampler (for replacing setSampler) #37821
Merged
Merged
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
f1daacf
Add setImageSampler (for replacing setSampler)
bdero ecb29be
Includes
bdero 4190467
Remove deprecation tag, just in case there are roll problems
bdero 5a5021f
Remove comment
bdero 6e9c9a0
Fix comment
bdero e43e5f5
Add setImageSampler for canvaskit
bdero f56bfed
Remove arg
bdero 0a353bb
Fix conversion
bdero 0109a0d
Float64List
bdero 0d00c73
final...
bdero da6f1cb
Pass along the engine handle
bdero 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
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 |
|---|---|---|
|
|
@@ -4314,13 +4314,27 @@ class FragmentShader extends Shader { | |
| _floats[index] = value; | ||
| } | ||
|
|
||
| /// Sets the sampler uniform at [index] to [image]. | ||
| /// | ||
| /// The index provided to setSampler is the index of the sampler uniform defined | ||
| /// in the fragment program, excluding all non-sampler uniforms. | ||
| /// | ||
| /// All the sampler uniforms that a shader expects must be provided or the | ||
| /// results will be undefined. | ||
| void setImageSampler(int index, Image image) { | ||
| assert(!debugDisposed, 'Tried to access uniforms on a disposed Shader: $this'); | ||
| _setImageSampler(index, image); | ||
| } | ||
|
|
||
| /// Sets the sampler uniform at [index] to [sampler]. | ||
| /// | ||
| /// The index provided to setSampler is the index of the sampler uniform defined | ||
| /// in the fragment program, excluding all non-sampler uniforms. | ||
| /// | ||
| /// All the sampler uniforms that a shader expects must be provided or the | ||
| /// results will be undefined. | ||
| /// | ||
| /// Use of this method may result in poor performance with the Impeller backend. | ||
|
||
| void setSampler(int index, ImageShader sampler) { | ||
| assert(!debugDisposed, 'Tried to access uniforms on a disposed Shader: $this'); | ||
| _setSampler(index, sampler); | ||
|
|
@@ -4341,6 +4355,9 @@ class FragmentShader extends Shader { | |
| @FfiNative<Handle Function(Handle, Handle, Handle, Handle)>('ReusableFragmentShader::Create') | ||
| external Float32List _constructor(FragmentProgram program, int floatUniforms, int samplerUniforms); | ||
|
|
||
| @FfiNative<Void Function(Pointer<Void>, Handle, Handle)>('ReusableFragmentShader::SetImageSampler') | ||
| external void _setImageSampler(int index, Image sampler); | ||
|
|
||
| @FfiNative<Void Function(Pointer<Void>, Handle, Handle)>('ReusableFragmentShader::SetSampler') | ||
| external void _setSampler(int index, ImageShader sampler); | ||
|
|
||
|
|
||
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.