diff options
| author | Chad Versace <[email protected]> | 2015-11-04 13:48:31 -0800 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2015-11-04 15:15:19 -0800 |
| commit | 7f82cc718f0faffc23a790914710f0b97db377d1 (patch) | |
| tree | 59f4d97238cd04c64a45c23762f67279a643e261 /src | |
| parent | 2bdb9e2ed9eab016220f1e365dd135f023f1920f (diff) | |
anv/meta: Use consistent naming for dynamic state mask
Consistently rename bitmasks of Vulkan dynamic state to 'dynamic_mask'.
anv_meta_saved_state::dynamic_flags -> dynamic_mask
anv_meta_save(dynamic_state) -> dynamic_mask
Diffstat (limited to 'src')
| -rw-r--r-- | src/vulkan/anv_meta.c | 11 | ||||
| -rw-r--r-- | src/vulkan/anv_meta.h | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index 976d028127e..ba03dff9d3a 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -122,15 +122,16 @@ build_nir_copy_fragment_shader(enum glsl_sampler_dim tex_dim) void anv_meta_save(struct anv_meta_saved_state *state, const struct anv_cmd_buffer *cmd_buffer, - uint32_t dynamic_state) + uint32_t dynamic_mask) { state->old_pipeline = cmd_buffer->state.pipeline; state->old_descriptor_set0 = cmd_buffer->state.descriptors[0]; memcpy(state->old_vertex_bindings, cmd_buffer->state.vertex_bindings, sizeof(state->old_vertex_bindings)); - state->dynamic_flags = dynamic_state; + + state->dynamic_mask = dynamic_mask; anv_dynamic_state_copy(&state->dynamic, &cmd_buffer->state.dynamic, - dynamic_state); + dynamic_mask); } void @@ -147,8 +148,8 @@ anv_meta_restore(const struct anv_meta_saved_state *state, cmd_buffer->state.descriptors_dirty |= VK_SHADER_STAGE_VERTEX_BIT; anv_dynamic_state_copy(&cmd_buffer->state.dynamic, &state->dynamic, - state->dynamic_flags); - cmd_buffer->state.dirty |= state->dynamic_flags; + state->dynamic_mask); + cmd_buffer->state.dirty |= state->dynamic_mask; } static VkImageViewType diff --git a/src/vulkan/anv_meta.h b/src/vulkan/anv_meta.h index 2f26d944516..d798c6e909f 100644 --- a/src/vulkan/anv_meta.h +++ b/src/vulkan/anv_meta.h @@ -35,14 +35,19 @@ struct anv_meta_saved_state { struct anv_vertex_binding old_vertex_bindings[ANV_META_VERTEX_BINDING_COUNT]; struct anv_descriptor_set *old_descriptor_set0; struct anv_pipeline *old_pipeline; - uint32_t dynamic_flags; + + /** + * Bitmask of (1 << VK_DYNAMIC_STATE_*). Defines the set of saved dynamic + * state. + */ + uint32_t dynamic_mask; struct anv_dynamic_state dynamic; }; void anv_meta_save(struct anv_meta_saved_state *state, const struct anv_cmd_buffer *cmd_buffer, - uint32_t dynamic_state); + uint32_t dynamic_mask); void anv_meta_restore(const struct anv_meta_saved_state *state, |