Commit 6d8001f4 authored by Eric Anholt's avatar Eric Anholt

Compile fixes for non-DRI case and for non-C99 compiler.

parent 1be4b2d5
......@@ -378,6 +378,8 @@ RadeonSwitchTo3D(void)
ADVANCE_RING();
}
#endif /* USE_DRI */
static Bool
ATIUploadToScreen(PixmapPtr pDst, char *src, int src_pitch)
{
......@@ -424,9 +426,6 @@ ATIUploadToScratch(PixmapPtr pSrc, PixmapPtr pDst)
return ATIUploadToScreen(pDst, pSrc->devPrivate.ptr, pSrc->devKind);
}
#endif /* USE_DRI */
static Bool
R128GetDatatypePict(CARD32 format, CARD32 *type)
{
......
......@@ -34,8 +34,8 @@
#include "ati_sarea.h"
#define TAG(x) x##DMA
#define LOCALS (void)atic; \
RING_LOCALS
#define LOCALS RING_LOCALS; \
(void)atic;
#define BEGIN(x) BEGIN_RING(x * 2)
#define OUT_REG(reg, val) OUT_RING_REG(reg, val)
#define END() ADVANCE_RING()
......@@ -322,8 +322,8 @@ RadeonComposite(int srcX, int srcY, int maskX, int maskY, int dstX, int dstY,
{
ATIScreenInfo *atis = accel_atis;
ATICardInfo *atic = atis->atic;
LOCALS;
struct blend_vertex vtx[4];
LOCALS;
/*ErrorF("RadeonComposite %d %d %d %d %d %d\n", srcX, srcY, maskX, maskY,
dstX, dstY, w, h);*/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment