diff options
| author | Jon Smirl <jonsmirl@gmail.com> | 2004-06-02 22:45:00 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@gmail.com> | 2004-06-02 22:45:00 +0000 |
| commit | ffb36d57a5f6359b5b91b73af60482a0016dd431 (patch) | |
| tree | 5b9ba0f257974b5a28a220a57d8d49c2dfe2d8f7 /src/mesa/drivers/dri/ffb | |
| parent | 1960182ece3f1eca06d2e439f64dd61be8a03ff5 (diff) | |
Removed need for sarea.h, various touch ups to get rid of type mismatches.
Diffstat (limited to 'src/mesa/drivers/dri/ffb')
| -rw-r--r-- | src/mesa/drivers/dri/ffb/ffb_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/ffb/ffb_tex.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/ffb/ffb_context.h b/src/mesa/drivers/dri/ffb/ffb_context.h index 80fb221e3e..33f6f7cff8 100644 --- a/src/mesa/drivers/dri/ffb/ffb_context.h +++ b/src/mesa/drivers/dri/ffb/ffb_context.h @@ -263,7 +263,7 @@ do { if ((STATE_MASK) & ~((FMESA)->state_dirty)) { \ float Znear, Zfar; drm_context_t hHWContext; - drmLock *driHwLock; + drm_hw_lock_t *driHwLock; int driFd; unsigned int clear_pixel; diff --git a/src/mesa/drivers/dri/ffb/ffb_tex.c b/src/mesa/drivers/dri/ffb/ffb_tex.c index 24d7fe3cd2..d6763b7cd3 100644 --- a/src/mesa/drivers/dri/ffb/ffb_tex.c +++ b/src/mesa/drivers/dri/ffb/ffb_tex.c @@ -27,6 +27,7 @@ #include "glheader.h" #include "mtypes.h" +#include "ffb_tex.h" /* No texture unit, all software. */ /* XXX this function isn't needed since _mesa_init_driver_functions() |