Mesa (main): anv: use anv_cmd_dirty_mask_t type for dynamic state

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d07ec3f038ef6575781829cd1dd1e0ddc30e352c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d07ec3f038ef6575781829cd1dd1e0ddc30e352c

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Fri Jun  3 08:43:07 2022 +0300

anv: use anv_cmd_dirty_mask_t type for dynamic state

We were using both uint32_t and anv_cmd_dirty_mask_t, this is
a cleanup making type usage consistent. Commit also changes type of
the mask to be enum anv_cmd_dirty_bits.

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16849>

---

 src/intel/vulkan/anv_private.h   |  8 ++++----
 src/intel/vulkan/genX_pipeline.c | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index d75c06a8f62..c2e7f8edeaf 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -2230,7 +2230,7 @@ enum anv_cmd_dirty_bits {
    ANV_CMD_DIRTY_DYNAMIC_LOGIC_OP                    = 1 << 29, /* VK_DYNAMIC_STATE_LOGIC_OP_EXT */
    ANV_CMD_DIRTY_DYNAMIC_PRIMITIVE_RESTART_ENABLE    = 1 << 30, /* VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE */
 };
-typedef uint32_t anv_cmd_dirty_mask_t;
+typedef enum anv_cmd_dirty_bits anv_cmd_dirty_mask_t;
 
 #define ANV_CMD_DIRTY_DYNAMIC_ALL                       \
    (ANV_CMD_DIRTY_DYNAMIC_VIEWPORT |                    \
@@ -2728,9 +2728,9 @@ struct anv_dynamic_state {
 extern const struct anv_dynamic_state default_dynamic_state;
 
 void anv_dynamic_state_init(struct anv_dynamic_state *state);
-uint32_t anv_dynamic_state_copy(struct anv_dynamic_state *dest,
-                                const struct anv_dynamic_state *src,
-                                uint32_t copy_mask);
+anv_cmd_dirty_mask_t anv_dynamic_state_copy(struct anv_dynamic_state *dest,
+                                            const struct anv_dynamic_state *src,
+                                            anv_cmd_dirty_mask_t copy_mask);
 
 static inline struct intel_sample_position *
 anv_dynamic_state_get_sample_locations(struct anv_dynamic_state *state,
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index e5071dbaa60..a71a71446a0 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -763,7 +763,7 @@ emit_rs_state(struct anv_graphics_pipeline *pipeline,
               const VkPipelineMultisampleStateCreateInfo *ms_info,
               const VkPipelineRasterizationLineStateCreateInfoEXT *line_info,
               const VkPipelineRenderingCreateInfo *rendering_info,
-              const uint32_t dynamic_states,
+              const anv_cmd_dirty_mask_t dynamic_states,
               enum intel_urb_deref_block_size urb_deref_block_size)
 {
    struct GENX(3DSTATE_SF) sf = {
@@ -922,7 +922,7 @@ emit_rs_state(struct anv_graphics_pipeline *pipeline,
 static void
 emit_ms_state(struct anv_graphics_pipeline *pipeline,
               const VkPipelineMultisampleStateCreateInfo *info,
-              uint32_t dynamic_states)
+              const anv_cmd_dirty_mask_t dynamic_states)
 {
 #if GFX_VER >= 8
    /* On Gfx8+ 3DSTATE_MULTISAMPLE only holds the number of samples. */
@@ -1170,7 +1170,7 @@ static void
 emit_ds_state(struct anv_graphics_pipeline *pipeline,
               const VkPipelineDepthStencilStateCreateInfo *pCreateInfo,
               const VkPipelineRenderingCreateInfo *rendering_info,
-              const uint32_t dynamic_states)
+              const anv_cmd_dirty_mask_t dynamic_states)
 {
 #if GFX_VER == 7
 #  define depth_stencil_dw pipeline->gfx7.depth_stencil_state
@@ -1288,7 +1288,7 @@ static void
 emit_cb_state(struct anv_graphics_pipeline *pipeline,
               const VkPipelineColorBlendStateCreateInfo *info,
               const VkPipelineMultisampleStateCreateInfo *ms_info,
-              uint32_t dynamic_states)
+              const anv_cmd_dirty_mask_t dynamic_states)
 {
    struct anv_device *device = pipeline->base.device;
    const struct brw_wm_prog_data *wm_prog_data = get_wm_prog_data(pipeline);
@@ -1448,7 +1448,7 @@ emit_3dstate_clip(struct anv_graphics_pipeline *pipeline,
                   const VkPipelineInputAssemblyStateCreateInfo *ia_info,
                   const VkPipelineViewportStateCreateInfo *vp_info,
                   const VkPipelineRasterizationStateCreateInfo *rs_info,
-                  const uint32_t dynamic_states)
+                  const anv_cmd_dirty_mask_t dynamic_states)
 {
    const struct brw_wm_prog_data *wm_prog_data = get_wm_prog_data(pipeline);
    (void) wm_prog_data;
@@ -1564,7 +1564,7 @@ emit_3dstate_clip(struct anv_graphics_pipeline *pipeline,
 static void
 emit_3dstate_streamout(struct anv_graphics_pipeline *pipeline,
                        const VkPipelineRasterizationStateCreateInfo *rs_info,
-                       const uint32_t dynamic_states)
+                       const anv_cmd_dirty_mask_t dynamic_states)
 {
    const struct brw_vue_prog_data *prog_data =
       anv_pipeline_get_last_vue_prog_data(pipeline);
@@ -2170,7 +2170,7 @@ emit_3dstate_wm(struct anv_graphics_pipeline *pipeline,
                 const VkPipelineMultisampleStateCreateInfo *multisample,
                 const VkPipelineRasterizationLineStateCreateInfoEXT *line,
                 const VkRenderingSelfDependencyInfoMESA *rsd,
-                const uint32_t dynamic_states)
+                const anv_cmd_dirty_mask_t dynamic_states)
 {
    const struct brw_wm_prog_data *wm_prog_data = get_wm_prog_data(pipeline);
 
@@ -2713,7 +2713,7 @@ genX(graphics_pipeline_create)(
       return result;
    }
 
-   uint32_t dynamic_states = pipeline->dynamic_states;
+   anv_cmd_dirty_mask_t dynamic_states = pipeline->dynamic_states;
 
    /* If rasterization is not enabled, various CreateInfo structs must be
     * ignored.