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/gallium/state_trackers/vega/st_inlines.h | |
| parent | 51bff09f72632fbe431175bc81b49da7b2cc731c (diff) | |
| parent | dfeab49a96fb520b5cb21b4cb5a8a5a0c1bf61e1 (diff) | |
Merge commit 'origin/gallium-context-transfers-2'
Diffstat (limited to 'src/gallium/state_trackers/vega/st_inlines.h')
| -rw-r--r-- | src/gallium/state_trackers/vega/st_inlines.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/vega/st_inlines.h b/src/gallium/state_trackers/vega/st_inlines.h index 419151c3ae..4d12a4efdd 100644 --- a/src/gallium/state_trackers/vega/st_inlines.h +++ b/src/gallium/state_trackers/vega/st_inlines.h @@ -51,7 +51,6 @@ st_cond_flush_get_tex_transfer(struct vg_context *st, unsigned int x, unsigned int y, unsigned int w, unsigned int h) { - struct pipe_screen *screen = st->pipe->screen; struct pipe_context *pipe = st->pipe; unsigned referenced = pipe->is_texture_referenced(pipe, pt, face, level); @@ -60,7 +59,7 @@ st_cond_flush_get_tex_transfer(struct vg_context *st, (usage & PIPE_TRANSFER_WRITE))) vgFlush(); - return screen->get_tex_transfer(screen, pt, face, level, zslice, usage, + return pipe->get_tex_transfer(pipe, pt, face, level, zslice, usage, x, y, w, h); } @@ -74,10 +73,10 @@ st_no_flush_get_tex_transfer(struct vg_context *st, unsigned int x, unsigned int y, unsigned int w, unsigned int h) { - struct pipe_screen *screen = st->pipe->screen; + struct pipe_context *pipe = st->pipe; - return screen->get_tex_transfer(screen, pt, face, level, - zslice, usage, x, y, w, h); + return pipe->get_tex_transfer(pipe, pt, face, level, + zslice, usage, x, y, w, h); } static INLINE void * |