diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index 1d72dff7f89..e0927b5dddc 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -867,19 +867,6 @@ struct pipe_context {
    void (*sampler_view_release)(struct pipe_context *ctx,
                                 struct pipe_sampler_view *view);
 
-
-   /**
-    * Get a surface which is a "view" into a resource, used by
-    * render target / depth stencil stages.
-    */
-   struct pipe_surface *(*create_surface)(struct pipe_context *ctx,
-                                          struct pipe_resource *resource,
-                                          const struct pipe_surface *templat);
-
-   void (*surface_destroy)(struct pipe_context *ctx,
-                           struct pipe_surface *);
-
-
    /**
     * Map a resource.
     *
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 5bdcc3afdf9..0e37ce32d08 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -454,9 +454,9 @@ enum pipe_flush_flags
  * Resource binding flags -- gallium frontends must specify in advance all
  * the ways a resource might be used.
  */
-#define PIPE_BIND_DEPTH_STENCIL        (1 << 0) /* create_surface */
-#define PIPE_BIND_RENDER_TARGET        (1 << 1) /* create_surface */
-#define PIPE_BIND_BLENDABLE            (1 << 2) /* create_surface */
+#define PIPE_BIND_DEPTH_STENCIL        (1 << 0) /* set_framebuffer_state */
+#define PIPE_BIND_RENDER_TARGET        (1 << 1) /* set_framebuffer_state */
+#define PIPE_BIND_BLENDABLE            (1 << 2) /* set_framebuffer_state */
 #define PIPE_BIND_SAMPLER_VIEW         (1 << 3) /* create_sampler_view */
 #define PIPE_BIND_VERTEX_BUFFER        (1 << 4) /* set_vertex_buffers */
 #define PIPE_BIND_INDEX_BUFFER         (1 << 5) /* draw_elements */