AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/meta: Rename anv_cmd_buffer_save/restore

Browse Source 
As the functions are now exposed in anv_meta.h, let's rename them
to clarify that they are meta functions.

    anv_cmd_buffer_save -> anv_meta_save
    anv_cmd_buffer_restore -> anv_meta_restore
This commit is contained in:
Chad Versace
2015-11-03 14:31:19 -08:00
parent 16b2a489db
commit 2bdb9e2ed9
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vulkan/anv_meta.c
+8 -8
View File
@@ -120,9 +120,9 @@ build_nir_copy_fragment_shader(enum glsl_sampler_dim tex_dim)
}
void
anv_cmd_buffer_save(struct anv_cmd_buffer *cmd_buffer,
struct anv_meta_saved_state *state,
uint32_t dynamic_state)
anv_meta_save(struct anv_meta_saved_state *state,
const struct anv_cmd_buffer *cmd_buffer,
uint32_t dynamic_state)
{
state->old_pipeline = cmd_buffer->state.pipeline;
state->old_descriptor_set0 = cmd_buffer->state.descriptors[0];
@@ -134,8 +134,8 @@ anv_cmd_buffer_save(struct anv_cmd_buffer *cmd_buffer,
}
void
anv_cmd_buffer_restore(struct anv_cmd_buffer *cmd_buffer,
const struct anv_meta_saved_state *state)
anv_meta_restore(const struct anv_meta_saved_state *state,
struct anv_cmd_buffer *cmd_buffer)
{
cmd_buffer->state.pipeline = state->old_pipeline;
cmd_buffer->state.descriptors[0] = state->old_descriptor_set0;
@@ -434,8 +434,8 @@ static void
meta_prepare_blit(struct anv_cmd_buffer *cmd_buffer,
struct anv_meta_saved_state *saved_state)
{
anv_cmd_buffer_save(cmd_buffer, saved_state,
(1 << VK_DYNAMIC_STATE_VIEWPORT));
anv_meta_save(saved_state, cmd_buffer,
(1 << VK_DYNAMIC_STATE_VIEWPORT));
}
struct blit_region {
@@ -625,7 +625,7 @@ static void
meta_finish_blit(struct anv_cmd_buffer *cmd_buffer,
const struct anv_meta_saved_state *saved_state)
{
anv_cmd_buffer_restore(cmd_buffer, saved_state);
anv_meta_restore(saved_state, cmd_buffer);
}
static VkFormat
src/vulkan/anv_meta.h
+5 -5
View File
@@ -40,13 +40,13 @@ struct anv_meta_saved_state {
};
void
anv_cmd_buffer_save(struct anv_cmd_buffer *cmd_buffer,
struct anv_meta_saved_state *state,
uint32_t dynamic_state);
anv_meta_save(struct anv_meta_saved_state *state,
const struct anv_cmd_buffer *cmd_buffer,
uint32_t dynamic_state);
void
anv_cmd_buffer_restore(struct anv_cmd_buffer *cmd_buffer,
const struct anv_meta_saved_state *state);
anv_meta_restore(const struct anv_meta_saved_state *state,
struct anv_cmd_buffer *cmd_buffer);
#ifdef __cplusplus
}
src/vulkan/anv_meta_clear.c
+6 -8
View File
@@ -140,8 +140,8 @@ anv_cmd_buffer_clear_attachments(struct anv_cmd_buffer *cmd_buffer,
}
}
anv_cmd_buffer_save(cmd_buffer, &saved_state,
(1 << VK_DYNAMIC_STATE_VIEWPORT));
anv_meta_save(&saved_state, cmd_buffer,
(1 << VK_DYNAMIC_STATE_VIEWPORT));
cmd_buffer->state.dynamic.viewport.count = 0;
struct anv_subpass subpass = {
@@ -156,8 +156,7 @@ anv_cmd_buffer_clear_attachments(struct anv_cmd_buffer *cmd_buffer,
meta_emit_clear(cmd_buffer, pass->num_color_clear_attachments,
instance_data, ds_clear_value);
/* Restore API state */
anv_cmd_buffer_restore(cmd_buffer, &saved_state);
anv_meta_restore(&saved_state, cmd_buffer);
}
static nir_shader *
@@ -401,8 +400,8 @@ void anv_CmdClearColorImage(
ANV_FROM_HANDLE(anv_image, image, _image);
struct anv_meta_saved_state saved_state;
anv_cmd_buffer_save(cmd_buffer, &saved_state,
(1 << VK_DYNAMIC_STATE_VIEWPORT));
anv_meta_save(&saved_state, cmd_buffer,
(1 << VK_DYNAMIC_STATE_VIEWPORT));
cmd_buffer->state.dynamic.viewport.count = 0;
for (uint32_t r = 0; r < rangeCount; r++) {
@@ -514,8 +513,7 @@ void anv_CmdClearColorImage(
}
}
/* Restore API state */
anv_cmd_buffer_restore(cmd_buffer, &saved_state);
anv_meta_restore(&saved_state, cmd_buffer);
}
void anv_CmdClearDepthStencilImage(