diff --git a/src/virgl_hw.h b/src/virgl_hw.h
index cdc56f8..ba0f758 100644
--- a/src/virgl_hw.h
+++ b/src/virgl_hw.h
@@ -211,6 +211,10 @@ enum virgl_formats {
    VIRGL_FORMAT_MAX,
 };
 
+/* These are used by the capability_bits field in virgl_caps_v2. */
+#define VIRGL_CAP_NONE 0
+#define VIRGL_CAP_TGSI_INVARIANT       (1 << 0)
+
 struct virgl_caps_bool_set1 {
         unsigned indep_blend_enable:1;
         unsigned indep_blend_func:1;
@@ -298,8 +302,8 @@ struct virgl_caps_v2 {
         int32_t max_texture_gather_offset;
         uint32_t texture_buffer_offset_alignment;
         uint32_t uniform_buffer_offset_alignment;
-        uint32_t tgsi_invariant;
         uint32_t shader_buffer_offset_alignment;
+        uint32_t capability_bits;
 };
 
 union virgl_caps {
diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
index 1d687e4..2f52d7a 100644
--- a/src/vrend_renderer.c
+++ b/src/vrend_renderer.c
@@ -7081,7 +7081,7 @@ void vrend_renderer_fill_caps(uint32_t set, uint32_t version,
       glGetIntegerv(GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT, (GLint*)&caps->v2.shader_buffer_offset_alignment);
    }
 
-   caps->v2.tgsi_invariant = 1;
+   caps->v2.capability_bits |= VIRGL_CAP_TGSI_INVARIANT;
 }
 
 GLint64 vrend_renderer_get_timestamp(void)