summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/radeon
diff options
context:
space:
mode:
authorOliver McFadden <z3ro.geek@gmail.com>2007-05-11 21:56:10 +0000
committerOliver McFadden <z3ro.geek@gmail.com>2007-05-11 21:56:10 +0000
commit0aa998b2ab6fdfe139b54de9868e2383440685d0 (patch)
tree71e1987c4c5e293253389af73a0d4f5b3a3d2a26 /src/mesa/drivers/dri/radeon
parentb6087270a092adc18223864a9e961c59404ce1dd (diff)
r300: Merged radeon_span.c.
Diffstat (limited to 'src/mesa/drivers/dri/radeon')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_span.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c
index 732a85ecf0..4551190d10 100644
--- a/src/mesa/drivers/dri/radeon/radeon_span.c
+++ b/src/mesa/drivers/dri/radeon/radeon_span.c
@@ -43,11 +43,16 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "glheader.h"
#include "swrast/swrast.h"
+#ifdef COMPILE_R300
+#include "r300_ioctl.h"
+#include "r300_state.h"
+#else
#include "radeon_context.h"
#include "radeon_ioctl.h"
#include "radeon_state.h"
-#include "radeon_span.h"
#include "radeon_tex.h"
+#endif
+#include "radeon_span.h"
#include "drirenderbuffer.h"