diff options
| author | Brian Paul <brianp@vmware.com> | 2010-03-17 10:31:57 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-03-17 10:31:59 -0600 |
| commit | c11d582411a999ed40db4c02143dd380113e0ffd (patch) | |
| tree | 91fa0eafcf6fcb26a6ada94af62a502bfa9f9a4c /src/mesa/state_tracker/st_cb_drawpixels.c | |
| parent | a196a5d3303a49c5f79a283f91f8e0cc8aa87f69 (diff) | |
st/mesa: plug in default for pipe_context::surface_copy() if needed
This lets us avoid conditionals and duplicated code in several places.
Diffstat (limited to 'src/mesa/state_tracker/st_cb_drawpixels.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_drawpixels.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index 72a2ddb379..07529ab6af 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -59,7 +59,6 @@ #include "util/u_draw_quad.h" #include "util/u_format.h" #include "util/u_math.h" -#include "util/u_rect.h" #include "shader/prog_instruction.h" #include "cso_cache/cso_context.h" @@ -1057,19 +1056,11 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy, PIPE_BUFFER_USAGE_GPU_READ); struct pipe_surface *psTex = screen->get_tex_surface(screen, pt, 0, 0, 0, PIPE_BUFFER_USAGE_GPU_WRITE ); - if (pipe->surface_copy) { - pipe->surface_copy(pipe, - psTex, /* dest surf */ - unpack.SkipPixels, unpack.SkipRows, /* dest pos */ - psRead, /* src surf */ - readX, readY, readW, readH); /* src region */ - } else { - util_surface_copy(pipe, FALSE, - psTex, - unpack.SkipPixels, unpack.SkipRows, - psRead, - readX, readY, readW, readH); - } + pipe->surface_copy(pipe, + psTex, /* dest surf */ + unpack.SkipPixels, unpack.SkipRows, /* dest pos */ + psRead, /* src surf */ + readX, readY, readW, readH); /* src region */ if (0) { /* debug */ |