diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-22 00:18:54 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-02-22 00:20:27 +0000 |
| commit | 1c718c0d78cf4eae9e02b03a0abbec384db948a6 (patch) | |
| tree | 6eb984875b15b05b0a0683f9e4bf5838b5da66ae /src/mesa/drivers/dri/i915 | |
| parent | 758b99894170c1c18370b370eb33dda7d0d14a8d (diff) | |
Use drm_i915_sarea instead of drmI830Sarea and remove i830_common.h
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_context.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_context.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index 40c5870e7c..1c340f7940 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -404,7 +404,7 @@ intelInitContext(struct intel_context *intel, GLcontext *shareCtx = (GLcontext *) sharedContextPrivate; __DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv; intelScreenPrivate *intelScreen = (intelScreenPrivate *) sPriv->private; - drmI830Sarea *saPriv = (drmI830Sarea *) + struct drm_i915_sarea *saPriv = (struct drm_i915_sarea *) (((GLubyte *) sPriv->pSAREA) + intelScreen->sarea_priv_offset); int fthrottle_mode; @@ -713,7 +713,7 @@ intelContendedLock(struct intel_context *intel, GLuint flags) { __DRIdrawablePrivate *dPriv = intel->driDrawable; __DRIscreenPrivate *sPriv = intel->driScreen; - drmI830Sarea *sarea = intel->sarea; + struct drm_i915_sarea *sarea = intel->sarea; int drawable_changed = 0; drmGetLock(intel->driFd, intel->hHWContext, flags); diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index 151e9e276d..5ca2fb7bd8 100644 --- a/src/mesa/drivers/dri/i915/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h @@ -39,7 +39,6 @@ #include "intel_screen.h" #include "intel_tex_obj.h" #include "i915_drm.h" -#include "i830_common.h" #include "tnl/t_vertex.h" #define TAG(x) intel##x @@ -236,7 +235,7 @@ struct intel_context __DRIdrawablePrivate *driDrawable; __DRIscreenPrivate *driScreen; intelScreenPrivate *intelScreen; - drmI830Sarea *sarea; + struct drm_i915_sarea *sarea; GLuint lastStamp; |