diff options
| author | Keith Whitwell <[email protected]> | 2010-03-16 09:02:38 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-03-16 09:02:38 +0000 |
| commit | 8cdfd1219a2d13d252a8691ee6dddb0d773bdc77 (patch) | |
| tree | 087318efba7eb0fb5e1c1d8422eca611abdee3e7 /src/gallium/state_trackers/dri/dri_context.c | |
| parent | 6420aca08ba6910dce22ab9f813cc57d611b0aa8 (diff) | |
| parent | e0ce4a4a0994211ead8e5a77cccdd2a084e8a288 (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix.
Conflicts:
src/gallium/drivers/nv50/nv50_tex.c
Diffstat (limited to 'src/gallium/state_trackers/dri/dri_context.c')
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_context.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c index 2f991c39e33..f772ba5d16b 100644 --- a/src/gallium/state_trackers/dri/dri_context.c +++ b/src/gallium/state_trackers/dri/dri_context.c @@ -35,7 +35,6 @@ #include "state_tracker/drm_api.h" #include "state_tracker/dri1_api.h" #include "state_tracker/st_public.h" -#include "state_tracker/st_context.h" #include "pipe/p_context.h" #include "dri_context.h" @@ -167,7 +166,7 @@ dri_make_current(__DRIcontext * cPriv, * flush_frontbuffer directly (in front-buffer rendering), it * will have access to the drawable argument: */ - st_make_current(ctx->st, draw->stfb, read->stfb, NULL); + st_make_current(ctx->st, draw->stfb, read->stfb, ctx); if (__dri1_api_hooks) { dri1_update_drawables(ctx, draw, read); |