summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-11-05 09:28:28 -0700
committerBrian <brian.paul@tungstengraphics.com>2007-11-05 09:28:28 -0700
commit29c1fdd0ce57a7a69e4d90eaacff7102b69bca9c (patch)
treea1cd089984f1eb48039c21811ab967ebe31b2d54
parent2edc87eb3d7283274c3d0714e90078736f8d985e (diff)
better use of intel_context() cast wrappers
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.c9
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.h10
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c7
3 files changed, 15 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index ac2e71d6dc..c1169c621f 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -163,8 +163,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
void
intelDestroyContext(__DRIcontextPrivate * driContextPriv)
{
- struct intel_context *intel =
- (struct intel_context *) driContextPriv->driverPrivate;
+ struct intel_context *intel = intel_context(driContextPriv);
assert(intel); /* should never be null */
if (intel) {
@@ -191,8 +190,7 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
GLboolean
intelUnbindContext(__DRIcontextPrivate * driContextPriv)
{
- struct intel_context *intel
- = (struct intel_context *) driContextPriv->driverPrivate;
+ struct intel_context *intel = intel_context(driContextPriv);
st_flush(intel->st);
return GL_TRUE;
}
@@ -204,8 +202,7 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
__DRIdrawablePrivate * driReadPriv)
{
if (driContextPriv) {
- struct intel_context *intel
- = (struct intel_context *) driContextPriv->driverPrivate;
+ struct intel_context *intel = intel_context(driContextPriv);
struct intel_framebuffer *draw_fb = intel_framebuffer(driDrawPriv);
struct intel_framebuffer *read_fb = intel_framebuffer(driReadPriv);
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index b2c5bfc9a2..32fb37dd94 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -145,13 +145,21 @@ extern int __intel_debug;
/** Cast wrapper */
static INLINE struct intel_context *
-intel_context(GLcontext * ctx)
+intel_context_mesa(GLcontext * ctx)
{
return (struct intel_context *) ctx->DriverCtx;
}
/** Cast wrapper */
+static INLINE struct intel_context *
+intel_context(__DRIcontextPrivate *driContextPriv)
+{
+ return (struct intel_context *) driContextPriv->driverPrivate;
+}
+
+
+/** Cast wrapper */
static INLINE struct intel_framebuffer *
intel_framebuffer(__DRIdrawablePrivate * driDrawPriv)
{
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
index 7083e813b0..b1cbebb944 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
@@ -58,7 +58,7 @@ intelScreenContext(intelScreenPrivate *intelScreen)
return intelScreen->dummyctxptr;
}
- return intel_context(ctx);
+ return intel_context_mesa(ctx);
}
@@ -117,7 +117,7 @@ intelDisplaySurface(__DRIdrawablePrivate * dPriv,
/* if this drawable isn't currently bound the LOCK_HARDWARE done on the
current context (which is what intelScreenContext should return) might
not get a contended lock and thus cliprects not updated (tests/manywin) */
- if ((struct intel_context *)dPriv->driContextPriv->driverPrivate != intel)
+ if (intel_context(dPriv->driContextPriv) != intel)
DRI_VALIDATE_DRAWABLE_INFO(intel->driScreen, dPriv);
@@ -277,8 +277,7 @@ void
intelCopySubBuffer(__DRIdrawablePrivate * dPriv, int x, int y, int w, int h)
{
if (dPriv->driContextPriv && dPriv->driContextPriv->driverPrivate) {
- struct intel_context *intel =
- (struct intel_context *) dPriv->driContextPriv->driverPrivate;
+ struct intel_context *intel = intel_context(dPriv->driContextPriv);
GLcontext *ctx = intel->st->ctx;
if (ctx->Visual.doubleBufferMode) {