diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 9c051d32996..a64c01852a6 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -4798,12 +4798,6 @@ struct gl_driver_flags
     */
    uint64_t NewImageUnits;
 
-   /**
-    * gl_context::TessCtrlProgram::patch_default_*
-    * gl_context::TessCtrlProgram::patch_vertices
-    */
-   uint64_t NewTessState;
-
    /**
     * gl_context::Scissor::WindowRects
     */
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index f6dfeb0fd06..5fae7e92ec4 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -68,6 +68,7 @@
 #include "api_exec_decl.h"
 
 #include "state_tracker/st_cb_program.h"
+#include "state_tracker/st_context.h"
 
 #ifdef ENABLE_SHADER_CACHE
 #if CUSTOM_SHADER_REPLACEMENT
@@ -2768,7 +2769,7 @@ set_patch_vertices(struct gl_context *ctx, GLint value)
 {
    if (ctx->TessCtrlProgram.patch_vertices != value) {
       FLUSH_VERTICES(ctx, 0, GL_CURRENT_BIT);
-      ctx->NewDriverState |= ctx->DriverFlags.NewTessState;
+      ctx->NewDriverState |= ST_NEW_TESS_STATE;
       ctx->TessCtrlProgram.patch_vertices = value;
    }
 }
@@ -2824,13 +2825,13 @@ _mesa_PatchParameterfv(GLenum pname, const GLfloat *values)
       FLUSH_VERTICES(ctx, 0, 0);
       memcpy(ctx->TessCtrlProgram.patch_default_outer_level, values,
              4 * sizeof(GLfloat));
-      ctx->NewDriverState |= ctx->DriverFlags.NewTessState;
+      ctx->NewDriverState |= ST_NEW_TESS_STATE;
       return;
    case GL_PATCH_DEFAULT_INNER_LEVEL:
       FLUSH_VERTICES(ctx, 0, 0);
       memcpy(ctx->TessCtrlProgram.patch_default_inner_level, values,
              2 * sizeof(GLfloat));
-      ctx->NewDriverState |= ctx->DriverFlags.NewTessState;
+      ctx->NewDriverState |= ST_NEW_TESS_STATE;
       return;
    default:
       _mesa_error(ctx, GL_INVALID_ENUM, "glPatchParameterfv");
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 0150e799ff7..8dc9f2f9dc3 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -448,7 +448,6 @@ st_init_driver_flags(struct st_context *st)
    struct gl_driver_flags *f = &st->ctx->DriverFlags;
 
    f->NewUniformBuffer = ST_NEW_UNIFORM_BUFFER;
-   f->NewTessState = ST_NEW_TESS_STATE;
 
    /* Shader resources */
    f->NewTextureBuffer = ST_NEW_SAMPLER_VIEWS;