diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2004-04-26 10:10:22 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2004-04-26 10:10:22 +0000 |
| commit | 462183fe4cb6df6d90632d9e2cee881c8d26b1cb (patch) | |
| tree | 0fb5d1c17d80026bec0fe3c2e0449fe30ea9e69e /src/mesa/drivers/dri/mga | |
| parent | 08fa6de85035c428d77cb88b11a4638b706794b5 (diff) | |
bring over build fixes from stable branch
Diffstat (limited to 'src/mesa/drivers/dri/mga')
| -rw-r--r-- | src/mesa/drivers/dri/mga/mgacontext.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/mga/mgavb.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/mga/mgacontext.h b/src/mesa/drivers/dri/mga/mgacontext.h index 83aaa27bdf..2009634b13 100644 --- a/src/mesa/drivers/dri/mga/mgacontext.h +++ b/src/mesa/drivers/dri/mga/mgacontext.h @@ -29,7 +29,6 @@ #ifndef MGALIB_INC #define MGALIB_INC -#include <inttypes.h> #include "drm.h" #include "mga_drm.h" #include "dri_util.h" diff --git a/src/mesa/drivers/dri/mga/mgavb.c b/src/mesa/drivers/dri/mga/mgavb.c index 2d5d6825f3..dacb38dd9f 100644 --- a/src/mesa/drivers/dri/mga/mgavb.c +++ b/src/mesa/drivers/dri/mga/mgavb.c @@ -115,8 +115,8 @@ static struct { #define PTEX_FALLBACK() FALLBACK(ctx, MGA_FALLBACK_TEXTURE, 1) -#define INTERP_VERTEX setup_tab[MGA_CONTEXT(ctx)->SetupIndex].interp -#define COPY_PV_VERTEX setup_tab[MGA_CONTEXT(ctx)->SetupIndex].copy_pv +#define INTERP_VERTEX setup_tab[mmesa->SetupIndex].interp +#define COPY_PV_VERTEX setup_tab[mmesa->SetupIndex].copy_pv /*********************************************************************** |