OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: store the dynamic state mask into radv_dynamic_state

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Samuel Pitoiset
2017-09-13 12:10:00 +02:00
parent 672cf692fb
commit b1e31c1911
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/amd/vulkan/radv_cmd_buffer.c
View File

@@ -80,9 +80,10 @@ const struct radv_dynamic_state default_dynamic_state = {
static void static void
radv_dynamic_state_copy(struct radv_dynamic_state *dest, radv_dynamic_state_copy(struct radv_dynamic_state *dest,
const struct radv_dynamic_state *src, const struct radv_dynamic_state *src)
uint32_t copy_mask)
{ {
uint32_t copy_mask = src->mask;
/* Make sure to copy the number of viewports/scissors because they can /* Make sure to copy the number of viewports/scissors because they can
* only be specified at pipeline creation time. * only be specified at pipeline creation time.
*/ */
@@ -2531,10 +2532,9 @@ void radv_CmdBindPipeline(
cmd_buffer->push_constant_stages |= pipeline->active_stages; cmd_buffer->push_constant_stages |= pipeline->active_stages;
/* Apply the dynamic state from the pipeline */ /* Apply the dynamic state from the pipeline */
cmd_buffer->state.dirty |= pipeline->dynamic_state_mask; cmd_buffer->state.dirty |= pipeline->dynamic_state.mask;
radv_dynamic_state_copy(&cmd_buffer->state.dynamic, radv_dynamic_state_copy(&cmd_buffer->state.dynamic,
&pipeline->dynamic_state, &pipeline->dynamic_state);
pipeline->dynamic_state_mask);
if (pipeline->graphics.esgs_ring_size > cmd_buffer->esgs_ring_size_needed) if (pipeline->graphics.esgs_ring_size > cmd_buffer->esgs_ring_size_needed)
cmd_buffer->esgs_ring_size_needed = pipeline->graphics.esgs_ring_size; cmd_buffer->esgs_ring_size_needed = pipeline->graphics.esgs_ring_size;

2
src/amd/vulkan/radv_pipeline.c
View File

@@ -1137,7 +1137,7 @@ radv_pipeline_init_dynamic_state(struct radv_pipeline *pipeline,
} }
} }
pipeline->dynamic_state_mask = states; pipeline->dynamic_state.mask = states;
} }
static void calculate_gfx9_gs_info(const VkGraphicsPipelineCreateInfo *pCreateInfo, static void calculate_gfx9_gs_info(const VkGraphicsPipelineCreateInfo *pCreateInfo,

7
src/amd/vulkan/radv_private.h
View File

@@ -733,6 +733,12 @@ struct radv_scissor_state {
}; };
struct radv_dynamic_state { struct radv_dynamic_state {
/**
* Bitmask of (1 << VK_DYNAMIC_STATE_*).
* Defines the set of saved dynamic state.
*/
uint32_t mask;
struct radv_viewport_state viewport; struct radv_viewport_state viewport;
struct radv_scissor_state scissor; struct radv_scissor_state scissor;
@@ -1091,7 +1097,6 @@ struct radv_vertex_elements_info {
struct radv_pipeline { struct radv_pipeline {
struct radv_device * device; struct radv_device * device;
uint32_t dynamic_state_mask;
struct radv_dynamic_state dynamic_state; struct radv_dynamic_state dynamic_state;
struct radv_pipeline_layout * layout; struct radv_pipeline_layout * layout;