diff options
| author | Kristian Høgsberg <[email protected]> | 2010-01-05 10:31:11 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2010-01-05 10:31:11 -0500 |
| commit | ae44b92f61b78c9991060a8dd7fa7327d428c138 (patch) | |
| tree | b83c49ccac84c9467566bf3526355f7dea1eae7c /src/mesa/drivers/dri/savage/savagespan.c | |
| parent | c727fa6dbf5a9fca5fc94de06c309f54402449d1 (diff) | |
| parent | 51362a75a70f982dc076064ff266e8eb6a0e3a8b (diff) | |
Merge branch 'remove-intel-dri1'
* remove-intel-dri1:
intel: intelScreenContext() is no longer used
intel: Remove remaining dri2.enabled tests
intel: Drop more cliprect bookkeeping
intel: Remove struct intel_framebuffer
intel: Remove client-side vblank code
intel: Drop intelWindowMoved()
intel: Drop batchbuffer cliprect_mode tracking
intel: Drop DRI1 static regions
intel: Use depth buffer from ctx.DrawBuffer in copypix_src_region()
intel: Drop LOCK/UNLOCK_HARDWARE()
intel: Drop DRI1 SwapBuffer implementation
intel: Drop DRI1 CopySubBuffer implementation
intel: Drop DRI1 support
Push __driDriverExtensions out of dri_util.c and into the drivers
Remove leftover __DRI{screen,drawable,context}Private references
Check for libdrm_$chipset.pc when needed
Diffstat (limited to 'src/mesa/drivers/dri/savage/savagespan.c')
| -rw-r--r-- | src/mesa/drivers/dri/savage/savagespan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/savage/savagespan.c b/src/mesa/drivers/dri/savage/savagespan.c index 3bb6fbcc63c..792e166d9c7 100644 --- a/src/mesa/drivers/dri/savage/savagespan.c +++ b/src/mesa/drivers/dri/savage/savagespan.c @@ -34,7 +34,7 @@ #define LOCAL_VARS \ driRenderbuffer *drb = (driRenderbuffer *) rb; \ - __DRIdrawablePrivate *const dPriv = drb->dPriv; \ + __DRIdrawable *const dPriv = drb->dPriv; \ GLuint cpp = drb->cpp; \ GLuint pitch = drb->pitch; \ GLuint height = dPriv->h; \ @@ -44,7 +44,7 @@ #define LOCAL_DEPTH_VARS \ driRenderbuffer *drb = (driRenderbuffer *) rb; \ - __DRIdrawablePrivate *const dPriv = drb->dPriv; \ + __DRIdrawable *const dPriv = drb->dPriv; \ GLuint zpp = drb->cpp; \ GLuint pitch = drb->pitch; \ GLuint height = dPriv->h; \ |