Metal: new binding model and SPIRV support #1576
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
msiglreith
approved these changes
Oct 16, 2017
| @@ -233,13 +235,15 @@ fn main() { | |||
|
|
|||
| // | |||
| let pipelines = { | |||
| #[cfg(any(feature = "vulkan", feature = "dx12", feature = "gl"))] | |||
| //TODO: remove the type annotations when we have support for | |||
| // inidirect argument buffers in SPIRV-Cross | |||
There was a problem hiding this comment.
nit: inidirect -> indirect
| self.samplers.clear(); | ||
| } | ||
|
|
||
| fn add_buffer(&mut self, slot: usize, buffer: MTLBuffer, offset: usize) { |
There was a problem hiding this comment.
Could be also extended for multiple buffers for the future.
| }); | ||
| }; | ||
| inner.viewport = Some(vp); | ||
| if let EncoderState::Render(ref encoder) = inner.encoder_state { |
There was a problem hiding this comment.
General question: Caching still required if we are already inside an encoder? Will the states in MTL be reset at encoder boundaries?
There was a problem hiding this comment.
Yes, they will be reset. That's why we still fill the cache, so that when we exit a render pass and then enter another one, we can re-bind everything that is active.
| } | ||
|
|
||
| command_buffer.encoder_state = EncoderState::Render(render_encoder); | ||
| command_buffer.begin_renderpass(render_encoder); |
…binding locations
kvark
force-pushed
the
metal-spirv
branch
3 times, most recently
from
54e072f
to
be59a2d
Compare
|
Huge thanks to @grovesNL for fixing the OSX Travis build issues with |
bors bot
added a commit
that referenced
this pull request
Oct 17, 2017
1576: [metal] New binding model and SPIRV support r=msiglreith a=kvark This PR grew out of scope (basic SPIRV-support), but that was necessary. Major changes: - Argument buffer support is turned into a run-time feature flag, disabled until SPIRV gets support for it (KhronosGroup/SPIRV-Cross#293) - Proper resource binding/state inheritance for command buffers - SPIRV-cross integration Also fixes #1581 ## New binding model Assignment from (descriptor_set, binding) to MSL buffer/texture/sampler index is figured out for the pipeline layout and stored inside it as a hashmap. A shader is not really compiled at `create_shader_module`, but rather - at PSO creation time, since this is where we know about the pipeline layout. The resource binding overrides of that layout are fed directly into SPIRV-cross compile options. A command buffer caches all bound resources at the MSL level (not descriptor set level, like it previously did). Binding descriptor sets would update the caches and potentially set the active encoder values. Both argument and regular vertex buffers just participate without extra semantics at this stage, simplifying the command buffer handling and solving the question of how to map those to not conflict.
kvark
changed the title
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 grew out of scope (basic SPIRV-support), but that was necessary.
Major changes:
Also fixes #1581
New binding model
Assignment from (descriptor_set, binding) to MSL buffer/texture/sampler index is figured out for the pipeline layout and stored inside it as a hashmap.
A shader is not really compiled at
create_shader_module, but rather - at PSO creation time, since this is where we know about the pipeline layout. The resource binding overrides of that layout are fed directly into SPIRV-cross compile options.A command buffer caches all bound resources at the MSL level (not descriptor set level, like it previously did). Binding descriptor sets would update the caches and potentially set the active encoder values. Both argument and regular vertex buffers just participate without extra semantics at this stage, simplifying the command buffer handling and solving the question of how to map those to not conflict.