diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c
index fca740990fa..64409e21692 100644
--- a/src/gallium/auxiliary/draw/draw_context.c
+++ b/src/gallium/auxiliary/draw/draw_context.c
@@ -794,12 +794,6 @@ draw_texture_sampler(struct draw_context *draw,
    case PIPE_SHADER_GEOMETRY:
       draw->gs.tgsi.sampler = sampler;
       break;
-   case PIPE_SHADER_TESS_CTRL:
-      draw->tcs.tgsi.sampler = sampler;
-      break;
-   case PIPE_SHADER_TESS_EVAL:
-      draw->tes.tgsi.sampler = sampler;
-      break;
    default:
       assert(0);
       break;
@@ -824,12 +818,6 @@ draw_image(struct draw_context *draw,
    case PIPE_SHADER_GEOMETRY:
       draw->gs.tgsi.image = image;
       break;
-   case PIPE_SHADER_TESS_CTRL:
-      draw->tcs.tgsi.image = image;
-      break;
-   case PIPE_SHADER_TESS_EVAL:
-      draw->tes.tgsi.image = image;
-      break;
    default:
       assert(0);
       break;
@@ -854,12 +842,6 @@ draw_buffer(struct draw_context *draw,
    case PIPE_SHADER_GEOMETRY:
       draw->gs.tgsi.buffer = buffer;
       break;
-   case PIPE_SHADER_TESS_CTRL:
-      draw->tcs.tgsi.buffer = buffer;
-      break;
-   case PIPE_SHADER_TESS_EVAL:
-      draw->tes.tgsi.buffer = buffer;
-      break;
    default:
       assert(0);
       break;
diff --git a/src/gallium/auxiliary/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h
index c62445a5506..9110093d4ec 100644
--- a/src/gallium/auxiliary/draw/draw_private.h
+++ b/src/gallium/auxiliary/draw/draw_private.h
@@ -327,15 +327,6 @@ struct draw_context
    /* Tessellation state */
    struct {
       struct draw_tess_ctrl_shader *tess_ctrl_shader;
-
-      /** Fields for TGSI interpreter / execution */
-      struct {
-         struct tgsi_exec_machine *machine;
-
-         struct tgsi_sampler *sampler;
-         struct tgsi_image *image;
-         struct tgsi_buffer *buffer;
-      } tgsi;
    } tcs;
 
    struct {
@@ -343,15 +334,6 @@ struct draw_context
       uint num_tes_outputs;  /**< convenience, from tess_eval_shader */
       uint position_output;
       uint clipvertex_output;
-
-      /** Fields for TGSI interpreter / execution */
-      struct {
-         struct tgsi_exec_machine *machine;
-
-         struct tgsi_sampler *sampler;
-         struct tgsi_image *image;
-         struct tgsi_buffer *buffer;
-      } tgsi;
    } tes;
 
    /** Fragment shader state */
diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
index b3c8ab37a47..f3d18e94b0b 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
@@ -632,8 +632,6 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle,
       struct draw_vertex_shader *vshader = draw->vs.vertex_shader;
       if (tcs_shader) {
          draw_tess_ctrl_shader_run(tcs_shader,
-                                   draw->pt.user.tcs_constants,
-                                   draw->pt.user.tcs_constants_size,
                                    vert_info,
                                    prim_info,
                                    &vshader->info,
@@ -652,8 +650,6 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle,
 
       if (tes_shader) {
          draw_tess_eval_shader_run(tes_shader,
-                                   draw->pt.user.tes_constants,
-                                   draw->pt.user.tes_constants_size,
                                    tcs_shader ? tcs_shader->vertices_out : draw->pt.vertices_per_patch,
                                    vert_info,
                                    prim_info,
diff --git a/src/gallium/auxiliary/draw/draw_tess.c b/src/gallium/auxiliary/draw/draw_tess.c
index 84085fae706..b7997b64137 100644
--- a/src/gallium/auxiliary/draw/draw_tess.c
+++ b/src/gallium/auxiliary/draw/draw_tess.c
@@ -155,8 +155,6 @@ llvm_tcs_run(struct draw_tess_ctrl_shader *shader, uint32_t prim_id)
  * Execute tess ctrl shader.
  */
 int draw_tess_ctrl_shader_run(struct draw_tess_ctrl_shader *shader,
-                              const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
-                              const unsigned constants_size[PIPE_MAX_CONSTANT_BUFFERS],
                               const struct draw_vertex_info *input_verts,
                               const struct draw_prim_info *input_prim,
                               const struct tgsi_shader_info *input_info,
@@ -320,8 +318,6 @@ llvm_tes_run(struct draw_tess_eval_shader *shader,
  * Execute tess eval shader.
  */
 int draw_tess_eval_shader_run(struct draw_tess_eval_shader *shader,
-                              const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
-                              const unsigned constants_size[PIPE_MAX_CONSTANT_BUFFERS],
                               unsigned num_input_vertices_per_patch,
                               const struct draw_vertex_info *input_verts,
                               const struct draw_prim_info *input_prim,
diff --git a/src/gallium/auxiliary/draw/draw_tess.h b/src/gallium/auxiliary/draw/draw_tess.h
index f76f57da960..3c75e0cc8b4 100644
--- a/src/gallium/auxiliary/draw/draw_tess.h
+++ b/src/gallium/auxiliary/draw/draw_tess.h
@@ -104,8 +104,6 @@ struct draw_tess_eval_shader {
 enum mesa_prim get_tes_output_prim(struct draw_tess_eval_shader *shader);
 
 int draw_tess_ctrl_shader_run(struct draw_tess_ctrl_shader *shader,
-                              const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
-                              const unsigned constants_size[PIPE_MAX_CONSTANT_BUFFERS],
                               const struct draw_vertex_info *input_verts,
                               const struct draw_prim_info *input_prim,
                               const struct tgsi_shader_info *input_info,
@@ -113,8 +111,6 @@ int draw_tess_ctrl_shader_run(struct draw_tess_ctrl_shader *shader,
                               struct draw_prim_info *output_prims );
 
 int draw_tess_eval_shader_run(struct draw_tess_eval_shader *shader,
-                              const void *constants[PIPE_MAX_CONSTANT_BUFFERS],
-                              const unsigned constants_size[PIPE_MAX_CONSTANT_BUFFERS],
                               unsigned num_input_vertices_per_patch,
                               const struct draw_vertex_info *input_verts,
                               const struct draw_prim_info *input_prim,