diff options
| author | Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 2009-04-28 14:20:45 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 2009-04-28 14:22:33 +0200 |
| commit | 8cfa6546c9aa25edad3e7bc3cf6f1a9399052b79 (patch) | |
| tree | 4b7a9428e785773a472fb3cd4729d58396ba777d /src/gallium/state_trackers/dri/dri_drawable.c | |
| parent | 3d2bba0d10d59a9c2d6d09c5dc3fabe148d5e0d7 (diff) | |
| download | external_mesa3d-8cfa6546c9aa25edad3e7bc3cf6f1a9399052b79.zip external_mesa3d-8cfa6546c9aa25edad3e7bc3cf6f1a9399052b79.tar.gz external_mesa3d-8cfa6546c9aa25edad3e7bc3cf6f1a9399052b79.tar.bz2 | |
gallium dri st: Use st_get_current() instead of GET_CURRENT_CONTEXT()
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Diffstat (limited to 'src/gallium/state_trackers/dri/dri_drawable.c')
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_drawable.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c index fd4bae5..15a2088 100644 --- a/src/gallium/state_trackers/dri/dri_drawable.c +++ b/src/gallium/state_trackers/dri/dri_drawable.c @@ -537,15 +537,14 @@ dri_swap_buffers(__DRIdrawablePrivate * dPriv) struct dri_drawable *draw = dri_drawable(dPriv); struct pipe_screen *screen = dri_screen(draw->sPriv)->pipe_screen; struct pipe_fence_handle *fence; - - GET_CURRENT_CONTEXT(glCtx); + struct st_context *st = st_get_current(); assert(__dri1_api_hooks != NULL); - if (!glCtx) + if (!st) return; /* For now */ - ctx = (struct dri_context *)glCtx->st->pipe->priv; + ctx = (struct dri_context *)st->pipe->priv; st_get_framebuffer_surface(draw->stfb, ST_SURFACE_BACK_LEFT, &back_surf); if (back_surf) { @@ -571,15 +570,14 @@ dri_copy_sub_buffer(__DRIdrawablePrivate * dPriv, int x, int y, int w, int h) struct pipe_surface *back_surf; struct dri_drawable *draw = dri_drawable(dPriv); struct pipe_fence_handle *dummy_fence; - - GET_CURRENT_CONTEXT(glCtx); + struct st_context *st = st_get_current(); assert(__dri1_api_hooks != NULL); - if (!glCtx) + if (!st) return; - ctx = (struct dri_context *)glCtx->st->pipe->priv; + ctx = (struct dri_context *)st->pipe->priv; sub_bbox.x1 = x; sub_bbox.x2 = x + w; |