diff options
| author | Jon Smirl <jonsmirl@gmail.com> | 2004-03-11 20:35:38 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@gmail.com> | 2004-03-11 20:35:38 +0000 |
| commit | ae4a1cc0666860bf5cc37a5cb549afc9aa5448b0 (patch) | |
| tree | 495f1f0249dc177e65f956e16ae79f7ab5a0cb83 /src/mesa/drivers/dri/r200/r200_lock.c | |
| parent | 157ec8bcf8b56d7951416d9ee13c98b7e82d099d (diff) | |
Adjustments to make everything use IOCTL/sarea defines in DRM instead
of glx/mini. removes glx/mini/drm.h glx/mini/sarea.h
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_lock.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_lock.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_lock.c b/src/mesa/drivers/dri/r200/r200_lock.c index 3c3356eecb..794a29972a 100644 --- a/src/mesa/drivers/dri/r200/r200_lock.c +++ b/src/mesa/drivers/dri/r200/r200_lock.c @@ -32,7 +32,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Authors: * Keith Whitwell <keith@tungstengraphics.com> */ - +#include <string.h> + #include "r200_context.h" #include "r200_lock.h" #include "r200_tex.h" @@ -50,7 +51,7 @@ static void r200UpdatePageFlipping( r200ContextPtr rmesa ) { int use_back; - rmesa->doPageFlip = rmesa->sarea->pfAllowPageFlip; + rmesa->doPageFlip = rmesa->sarea->pfState; use_back = (rmesa->glCtx->Color._DrawDestMask == BACK_LEFT_BIT); use_back ^= (rmesa->sarea->pfCurrentPage == 1); @@ -83,7 +84,7 @@ void r200GetLock( r200ContextPtr rmesa, GLuint flags ) { __DRIdrawablePrivate *dPriv = rmesa->dri.drawable; __DRIscreenPrivate *sPriv = rmesa->dri.screen; - RADEONSAREAPrivPtr sarea = rmesa->sarea; + drm_radeon_sarea_t *sarea = rmesa->sarea; int i; drmGetLock( rmesa->dri.fd, rmesa->dri.hwContext, flags ); @@ -108,8 +109,8 @@ void r200GetLock( r200ContextPtr rmesa, GLuint flags ) rmesa->lastStamp = dPriv->lastStamp; } - if ( sarea->ctxOwner != rmesa->dri.hwContext ) { - sarea->ctxOwner = rmesa->dri.hwContext; + if ( sarea->ctx_owner != rmesa->dri.hwContext ) { + sarea->ctx_owner = rmesa->dri.hwContext; } for ( i = 0 ; i < rmesa->nr_heaps ; i++ ) { |