diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 34d2eb8aba1..f6e47790c3b 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -199,13 +199,6 @@ struct dd_function_table {
                                   struct gl_buffer_object *indexbuf,
                                   uint32_t enabled_attribs);
 
-   /**
-    * \name GREMEDY debug/marker functions
-    */
-   /*@{*/
-   void (*EmitStringMarker)(struct gl_context *ctx, const GLchar *string, GLsizei len);
-   /*@}*/
-
    /**
     * \name Support for multiple T&L engines
     */
diff --git a/src/mesa/main/debug_output.c b/src/mesa/main/debug_output.c
index 04889a69290..4ee0ac44724 100644
--- a/src/mesa/main/debug_output.c
+++ b/src/mesa/main/debug_output.c
@@ -1089,8 +1089,8 @@ _mesa_DebugMessageInsert(GLenum source, GLenum type, GLuint id,
                  gl_enum_to_debug_severity(severity),
                  length, buf);
 
-   if (type == GL_DEBUG_TYPE_MARKER && ctx->Driver.EmitStringMarker) {
-      ctx->Driver.EmitStringMarker(ctx, buf, length);
+   if (type == GL_DEBUG_TYPE_MARKER && ctx->pipe->emit_string_marker) {
+      ctx->pipe->emit_string_marker(ctx->pipe, buf, length);
    }
 }
 
@@ -1376,7 +1376,7 @@ _mesa_StringMarkerGREMEDY(GLsizei len, const GLvoid *string)
       /* if length not specified, string will be null terminated: */
       if (len <= 0)
          len = strlen(string);
-      ctx->Driver.EmitStringMarker(ctx, string, len);
+      ctx->pipe->emit_string_marker(ctx->pipe, string, len);
    } else {
       _mesa_error(ctx, GL_INVALID_OPERATION, "StringMarkerGREMEDY");
    }
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index c8916f60520..eb304a2b79c 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -810,15 +810,6 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
    return st;
 }
 
-
-static void
-st_emit_string_marker(struct gl_context *ctx, const GLchar *string, GLsizei len)
-{
-   struct st_context *st = ctx->st;
-   st->pipe->emit_string_marker(st->pipe, string, len);
-}
-
-
 void
 st_set_background_context(struct gl_context *ctx,
                           struct util_queue_monitoring *queue_info)
@@ -855,9 +846,6 @@ st_init_driver_functions(struct pipe_screen *screen,
 
    st_init_vdpau_functions(functions);
 
-   if (screen->get_param(screen, PIPE_CAP_STRING_MARKER))
-      functions->EmitStringMarker = st_emit_string_marker;
-
    /* GL_ARB_get_program_binary */
    functions->GetProgramBinaryDriverSHA1 = st_get_program_binary_driver_sha1;