summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-11-03 10:04:24 -0600
committerBrian <[email protected]>2007-11-05 08:04:48 -0700
commitecb41279d6c9f7fd0b2dc44309fd71fad5db33a9 (patch)
tree92563c4e31662243001ec70f8edaf12a1aab927c
parentc4a9c49cdb6740da7a7bda8804ffe04fe04c0b0e (diff)
use st_make_current()
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 35e90f967e4..721f73bcd96 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -228,9 +228,10 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
if (driContextPriv) {
struct intel_context *intel =
(struct intel_context *) driContextPriv->driverPrivate;
- struct intel_framebuffer *intel_fb =
- (struct intel_framebuffer *) driDrawPriv->driverPrivate;
- GLframebuffer *readFb = (GLframebuffer *) driReadPriv->driverPrivate;
+ struct st_framebuffer *draw_fb
+ = (struct st_framebuffer *) driDrawPriv->driverPrivate;
+ struct st_framebuffer *read_fb
+ = (struct st_framebuffer *) driReadPriv->driverPrivate;
GLcontext *ctx = intel->st->ctx;
/* this is a hack so we have a valid context when the region allocation
@@ -244,7 +245,7 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
intelUpdateFramebufferSize(ctx, driReadPriv);
}
- _mesa_make_current(ctx, &intel_fb->Base, readFb);
+ st_make_current(intel->st, draw_fb, read_fb);
if ((intel->driDrawable != driDrawPriv) ||
(intel->lastStamp != driDrawPriv->lastStamp)) {
@@ -254,7 +255,7 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
}
}
else {
- _mesa_make_current(NULL, NULL, NULL);
+ st_make_current(NULL, NULL, NULL);
}
return GL_TRUE;