st/mesa: plug in default for pipe_context::surface_copy() if needed

This lets us avoid conditionals and duplicated code in several places.

1 files changed, 6 insertions, 15 deletions

diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index ef97d873e5..5809927852 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -342,21 +342,12 @@ st_texture_image_copy(struct pipe_context *pipe,
       src_surface = screen->get_tex_surface(screen, src, face, srcLevel, i,
                                             PIPE_BUFFER_USAGE_GPU_READ);
 
-      if (pipe->surface_copy) {
-         pipe->surface_copy(pipe,
-			    dst_surface,
-			    0, 0, /* destX, Y */
-			    src_surface,
-			    0, 0, /* srcX, Y */
-			    width, height);
-      } else {
-         util_surface_copy(pipe, FALSE,
-			   dst_surface,
-			   0, 0, /* destX, Y */
-			   src_surface,
-			   0, 0, /* srcX, Y */
-			   width, height);
-      }
+      pipe->surface_copy(pipe,
+                         dst_surface,
+                         0, 0, /* destX, Y */
+                         src_surface,
+                         0, 0, /* srcX, Y */
+                         width, height);
 
       pipe_surface_reference(&src_surface, NULL);
       pipe_surface_reference(&dst_surface, NULL);