diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-12 09:08:40 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-12 09:08:40 +0000 |
| commit | 915b3529b9794c0d41f37b33365eeeb9b2152e9d (patch) | |
| tree | 1ed1377274966d413b6e390013afcf47abd611b6 /src/mesa/state_tracker/st_inlines.h | |
| parent | 51bff09f72632fbe431175bc81b49da7b2cc731c (diff) | |
| parent | dfeab49a96fb520b5cb21b4cb5a8a5a0c1bf61e1 (diff) | |
Merge commit 'origin/gallium-context-transfers-2'
Diffstat (limited to 'src/mesa/state_tracker/st_inlines.h')
| -rw-r--r-- | src/mesa/state_tracker/st_inlines.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_inlines.h b/src/mesa/state_tracker/st_inlines.h index e105870bc7..7fcde7b1a9 100644 --- a/src/mesa/state_tracker/st_inlines.h +++ b/src/mesa/state_tracker/st_inlines.h @@ -53,11 +53,11 @@ st_cond_flush_get_tex_transfer(struct st_context *st, unsigned int x, unsigned int y, unsigned int w, unsigned int h) { - struct pipe_screen *screen = st->pipe->screen; + struct pipe_context *context = st->pipe; st_teximage_flush_before_map(st, pt, face, level, usage); - return screen->get_tex_transfer(screen, pt, face, level, zslice, usage, - x, y, w, h); + return context->get_tex_transfer(context, pt, face, level, zslice, usage, + x, y, w, h); } static INLINE struct pipe_transfer * @@ -70,9 +70,9 @@ st_no_flush_get_tex_transfer(struct st_context *st, unsigned int x, unsigned int y, unsigned int w, unsigned int h) { - struct pipe_screen *screen = st->pipe->screen; + struct pipe_context *context = st->pipe; - return screen->get_tex_transfer(screen, pt, face, level, + return context->get_tex_transfer(context, pt, face, level, zslice, usage, x, y, w, h); } |