diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2005-04-24 09:08:31 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2005-04-24 09:08:31 +0000 |
| commit | 6ffd0a4cf1aae2b5ea0fd683a2d7607e59cd3f68 (patch) | |
| tree | 39fa877aeee98f7e14598c67269c39a7293761a3 /src/mesa/drivers/dri/r300/radeon_context.h | |
| parent | 5c906924ed6ee664ba61764dd21bee36dce06d02 (diff) | |
Modifying to build against current Mesa. Disabled r200*.c files since they didnt want to build anymore.
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_context.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_context.h b/src/mesa/drivers/dri/r300/radeon_context.h index f0e10dd805..84fcaee718 100644 --- a/src/mesa/drivers/dri/r300/radeon_context.h +++ b/src/mesa/drivers/dri/r300/radeon_context.h @@ -80,6 +80,7 @@ static __inline GLuint radeonPackColor(GLuint cpp, #define RADEON_FALLBACK_DISABLE 0x40 #define RADEON_FALLBACK_BORDER_MODE 0x80 +#if R200_MERGED extern void radeonFallback(GLcontext * ctx, GLuint bit, GLboolean mode); #define FALLBACK( radeon, bit, mode ) do { \ @@ -87,7 +88,9 @@ extern void radeonFallback(GLcontext * ctx, GLuint bit, GLboolean mode); __FUNCTION__, bit, mode ); \ radeonFallback( (radeon)->glCtx, bit, mode ); \ } while (0) - +#else +#define FALLBACK( radeon, bit, mode ) fprintf(stderr, "%s:%s\n", __LINE__, __FILE__); +#endif /* TCL fallbacks */ extern void radeonTclFallback(GLcontext * ctx, GLuint bit, GLboolean mode); @@ -106,7 +109,11 @@ extern void radeonTclFallback(GLcontext * ctx, GLuint bit, GLboolean mode); #define RADEON_TCL_FALLBACK_BITMAP 0x0800 /* draw bitmap with points */ #define RADEON_TCL_FALLBACK_VERTEX_PROGRAM 0x1000 /* vertex program active */ +#if R200_MERGED #define TCL_FALLBACK( ctx, bit, mode ) radeonTclFallback( ctx, bit, mode ) +#else +#define TCL_FALLBACK( ctx, bit, mode ) ; +#endif struct radeon_dri_mirror { |