diff --git a/src/panfrost/vulkan/csf/panvk_cmd_buffer.h b/src/panfrost/vulkan/csf/panvk_cmd_buffer.h
index 6c2c68f3b75..7419fe6295d 100644
--- a/src/panfrost/vulkan/csf/panvk_cmd_buffer.h
+++ b/src/panfrost/vulkan/csf/panvk_cmd_buffer.h
@@ -394,7 +394,6 @@ struct panvk_cmd_graphics_state {
       struct panvk_buffer *buffer;
       uint64_t offset;
       uint8_t index_size;
-      uint32_t first_vertex, base_vertex, base_instance;
       bool dirty;
    } ib;
 
diff --git a/src/panfrost/vulkan/jm/panvk_cmd_buffer.h b/src/panfrost/vulkan/jm/panvk_cmd_buffer.h
index 52f1be63f4e..bb66fd5629b 100644
--- a/src/panfrost/vulkan/jm/panvk_cmd_buffer.h
+++ b/src/panfrost/vulkan/jm/panvk_cmd_buffer.h
@@ -121,8 +121,6 @@ struct panvk_cmd_graphics_state {
       struct vk_sample_locations_state sl;
    } dynamic;
 
-   uint32_t dirty;
-
    struct panvk_graphics_sysvals sysvals;
 
    struct panvk_shader_link link;
@@ -155,7 +153,6 @@ struct panvk_cmd_graphics_state {
       struct panvk_buffer *buffer;
       uint64_t offset;
       uint8_t index_size;
-      uint32_t first_vertex, base_vertex, base_instance;
    } ib;
 
    struct panvk_rendering_state render;
diff --git a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c
index a05f104b591..779a83099da 100644
--- a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c
+++ b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c
@@ -1367,7 +1367,6 @@ panvk_cmd_draw(struct panvk_cmd_buffer *cmdbuf, struct panvk_draw_info *draw)
 
    /* Clear the dirty flags all at once */
    vk_dynamic_graphics_state_clear_dirty(&cmdbuf->vk.dynamic_graphics_state);
-   cmdbuf->state.gfx.dirty = 0;
 }
 
 static unsigned