summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-11-05 11:59:09 -0700
committerBrian <brian.paul@tungstengraphics.com>2007-11-05 11:59:09 -0700
commit3f80be3cb5dcd1378316c0330446a72a2095d9ca (patch)
tree4054cfac676b1cf923711b5bc546807d96f230ad
parent6ad4656cc475b170f419627ff6c4a43ebab09b7c (diff)
move intel_context_mesa() into intel_swapbuffers.c (the only place it's used now)
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.h8
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c9
2 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h
index 9d24ca124a..5aa07d4ed1 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.h
@@ -145,14 +145,6 @@ extern int __intel_debug;
/** Cast wrapper */
static INLINE struct intel_context *
-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;
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
index f3bbbe874d..8a35a71669 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
@@ -39,6 +39,15 @@
#include "state_tracker/st_cb_fbo.h"
+
+/** Cast wrapper */
+static INLINE struct intel_context *
+intel_context_mesa(GLcontext * ctx)
+{
+ return (struct intel_context *) ctx->DriverCtx;
+}
+
+
/** XXX temporary - want to get rid of this */
static struct intel_context *
intelScreenContext(struct intel_screen *intelScreen)