Add color tiling support to miniglx for radeon

[mesa.git] / src / mesa / drivers / dri / mach64 / mach64_ioctl.c

diff --git a/src/mesa/drivers/dri/mach64/mach64_ioctl.c b/src/mesa/drivers/dri/mach64/mach64_ioctl.c
index 4c391fec246a368cd0aff6f46534ea44bb08d5f9..1889dc2b93c323cbf82848b89a5f162007c42339 100644 (file)
--- a/src/mesa/drivers/dri/mach64/mach64_ioctl.c
+++ b/src/mesa/drivers/dri/mach64/mach64_ioctl.c
@@ -26,7 +26,7 @@
  * Authors:
  *     Gareth Hughes <gareth@valinux.com>
  *     Leif Delgass <ldelgass@retinalburn.net>
- *     José Fonseca <j_r_fonseca@yahoo.co.uk>
+ *     Jos�Fonseca <j_r_fonseca@yahoo.co.uk>
  */
 #include <errno.h>
 
@@ -98,13 +98,13 @@ drmBufPtr mach64GetBufferLocked( mach64ContextPtr mmesa )
 
 void mach64FlushVerticesLocked( mach64ContextPtr mmesa )
 {
-   XF86DRIClipRectPtr pbox = mmesa->pClipRects;
+   drm_clip_rect_t *pbox = mmesa->pClipRects;
    int nbox = mmesa->numClipRects;
    void *buffer = mmesa->vert_buf;
    int count = mmesa->vert_used;
    int prim = mmesa->hw_primitive;
    int fd = mmesa->driScreen->fd;
-   drmMach64Vertex vertex;
+   drm_mach64_vertex_t vertex;
    int i, ret;
 
    mmesa->num_verts = 0;
@@ -133,7 +133,7 @@ void mach64FlushVerticesLocked( mach64ContextPtr mmesa )
       vertex.buf = buffer;
       vertex.used = count;
       vertex.discard = 1;
-      ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, &vertex, sizeof(drmMach64Vertex) );
+      ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, &vertex, sizeof(drm_mach64_vertex_t) );
       if ( ret ) {
         UNLOCK_HARDWARE( mmesa );
         fprintf( stderr, "Error flushing vertex buffer: return = %d\n", ret );
@@ -144,7 +144,7 @@ void mach64FlushVerticesLocked( mach64ContextPtr mmesa )
 
       for ( i = 0 ; i < nbox ; ) {
         int nr = MIN2( i + MACH64_NR_SAREA_CLIPRECTS, nbox );
-        XF86DRIClipRectPtr b = mmesa->sarea->boxes;
+        drm_clip_rect_t *b = mmesa->sarea->boxes;
         int discard = 0;
 
         mmesa->sarea->nbox = nr - i;
@@ -164,7 +164,7 @@ void mach64FlushVerticesLocked( mach64ContextPtr mmesa )
         vertex.buf = buffer;
         vertex.used = count;
         vertex.discard = discard;
-        ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, &vertex, sizeof(drmMach64Vertex) );
+        ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, &vertex, sizeof(drm_mach64_vertex_t) );
         if ( ret ) {
            UNLOCK_HARDWARE( mmesa );
            fprintf( stderr, "Error flushing vertex buffer: return = %d\n", ret );
@@ -184,7 +184,7 @@ void mach64FireBlitLocked( mach64ContextPtr mmesa, drmBufPtr buffer,
                           GLint offset, GLint pitch, GLint format,
                           GLint x, GLint y, GLint width, GLint height )
 {
-   drmMach64Blit blit;
+   drm_mach64_blit_t blit;
    GLint ret;
 
    blit.idx = buffer->idx;
@@ -197,7 +197,7 @@ void mach64FireBlitLocked( mach64ContextPtr mmesa, drmBufPtr buffer,
    blit.height = height;
 
    ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_BLIT, 
-                          &blit, sizeof(drmMach64Blit) );
+                          &blit, sizeof(drm_mach64_blit_t) );
 
    if ( ret ) {
       UNLOCK_HARDWARE( mmesa );
@@ -229,7 +229,7 @@ static int mach64WaitForFrameCompletion( mach64ContextPtr mmesa )
    int frames;
 
    while ( 1 ) {
-      drmMach64GetParam gp;
+      drm_mach64_getparam_t gp;
       int ret;
 
       if ( mmesa->sarea->frames_queued < MACH64_MAX_QUEUED_FRAMES ) {
@@ -269,7 +269,7 @@ void mach64CopyBuffer( const __DRIdrawablePrivate *dPriv )
 {
    mach64ContextPtr mmesa;
    GLint nbox, i, ret;
-   XF86DRIClipRectPtr pbox;
+   drm_clip_rect_t *pbox;
    GLboolean missed_target;
 
    assert(dPriv);
@@ -315,7 +315,7 @@ void mach64CopyBuffer( const __DRIdrawablePrivate *dPriv )
 
    for ( i = 0 ; i < nbox ; ) {
       GLint nr = MIN2( i + MACH64_NR_SAREA_CLIPRECTS , nbox );
-      XF86DRIClipRectPtr b = mmesa->sarea->boxes;
+      drm_clip_rect_t *b = mmesa->sarea->boxes;
       GLint n = 0;
 
       for ( ; i < nr ; i++ ) {
@@ -388,12 +388,12 @@ void mach64PerformanceCounters( mach64ContextPtr mmesa )
 void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa )
 {
    GLint ret;
-   drmMach64Clear clear;
+   drm_mach64_clear_t clear;
    GLint x, y, w, h;
    GLuint color;
    GLint nbox;
    GLint x1, y1, x2, y2;
-   XF86DRIClipRectPtr b = mmesa->sarea->boxes;
+   drm_clip_rect_t *b = mmesa->sarea->boxes;
 
    /* save cliprects */
    nbox = mmesa->sarea->nbox;
@@ -427,7 +427,7 @@ void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa )
       clear.clear_color = color;
 
       ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_CLEAR,
-                            &clear, sizeof(drmMach64Clear) );
+                            &clear, sizeof(drm_mach64_clear_t) );
 
       if (ret < 0) {
         UNLOCK_HARDWARE( mmesa );
@@ -452,7 +452,7 @@ void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa )
       clear.clear_color = color;
 
       ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_CLEAR,
-                            &clear, sizeof(drmMach64Clear) );
+                            &clear, sizeof(drm_mach64_clear_t) );
 
       if (ret < 0) {
         UNLOCK_HARDWARE( mmesa );
@@ -481,7 +481,7 @@ void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa )
         clear.clear_color = color;
 
         ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_CLEAR,
-                               &clear, sizeof(drmMach64Clear) );
+                               &clear, sizeof(drm_mach64_clear_t) );
 
         if (ret < 0) {
            UNLOCK_HARDWARE( mmesa );
@@ -506,7 +506,7 @@ void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa )
         clear.clear_color = color;
 
         ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_CLEAR,
-                               &clear, sizeof(drmMach64Clear) );
+                               &clear, sizeof(drm_mach64_clear_t) );
 
         if (ret < 0) {
            UNLOCK_HARDWARE( mmesa );
@@ -532,7 +532,7 @@ void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa )
       clear.clear_color = color;
 
       ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_CLEAR,
-                               &clear, sizeof(drmMach64Clear) );
+                               &clear, sizeof(drm_mach64_clear_t) );
 
       if (ret < 0) {
         UNLOCK_HARDWARE( mmesa );
@@ -565,7 +565,7 @@ void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa )
       clear.clear_color = color;
 
       ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_CLEAR,
-                               &clear, sizeof(drmMach64Clear) );
+                               &clear, sizeof(drm_mach64_clear_t) );
 
       if (ret < 0) {
         UNLOCK_HARDWARE( mmesa );
@@ -595,7 +595,7 @@ void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa )
       clear.clear_color = color;
 
       ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_CLEAR,
-                               &clear, sizeof(drmMach64Clear) );
+                               &clear, sizeof(drm_mach64_clear_t) );
 
       if (ret < 0) {
         UNLOCK_HARDWARE( mmesa );
@@ -627,7 +627,7 @@ void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa )
       clear.clear_color = color;
 
       ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_CLEAR,
-                               &clear, sizeof(drmMach64Clear) );
+                               &clear, sizeof(drm_mach64_clear_t) );
 
       if (ret < 0) {
         UNLOCK_HARDWARE( mmesa );
@@ -656,7 +656,7 @@ static void mach64DDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
 {
    mach64ContextPtr mmesa = MACH64_CONTEXT( ctx );
    __DRIdrawablePrivate *dPriv = mmesa->driDrawable;
-   drmMach64Clear clear;
+   drm_mach64_clear_t clear;
    GLuint flags = 0;
    GLint i;
    GLint ret;
@@ -683,19 +683,19 @@ static void mach64DDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
       mmesa->new_state = save_state & ~(MACH64_NEW_MASKS | MACH64_NEW_CLIP);
    }
 
-   if ( mask & DD_FRONT_LEFT_BIT ) {
+   if ( mask & BUFFER_BIT_FRONT_LEFT ) {
       flags |= MACH64_FRONT;
-      mask &= ~DD_FRONT_LEFT_BIT;
+      mask &= ~BUFFER_BIT_FRONT_LEFT;
    }
 
-   if ( mask & DD_BACK_LEFT_BIT ) {
+   if ( mask & BUFFER_BIT_BACK_LEFT ) {
       flags |= MACH64_BACK;
-      mask &= ~DD_BACK_LEFT_BIT;
+      mask &= ~BUFFER_BIT_BACK_LEFT;
    }
 
-   if ( ( mask & DD_DEPTH_BIT ) && ctx->Depth.Mask ) {
+   if ( ( mask & BUFFER_BIT_DEPTH ) && ctx->Depth.Mask ) {
       flags |= MACH64_DEPTH;
-      mask &= ~DD_DEPTH_BIT;
+      mask &= ~BUFFER_BIT_DEPTH;
    }
 
    if ( mask )
@@ -719,8 +719,8 @@ static void mach64DDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
 
    for ( i = 0 ; i < mmesa->numClipRects ; ) {
       int nr = MIN2( i + MACH64_NR_SAREA_CLIPRECTS, mmesa->numClipRects );
-      XF86DRIClipRectPtr box = mmesa->pClipRects;
-      XF86DRIClipRectPtr b = mmesa->sarea->boxes;
+      drm_clip_rect_t *box = mmesa->pClipRects;
+      drm_clip_rect_t *b = mmesa->sarea->boxes;
       GLint n = 0;
 
       if ( !all ) {
@@ -771,7 +771,7 @@ static void mach64DDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
       clear.clear_depth = mmesa->ClearDepth;
 
       ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_CLEAR,
-                            &clear, sizeof(drmMach64Clear) );
+                            &clear, sizeof(drm_mach64_clear_t) );
 
       if ( ret ) {
         UNLOCK_HARDWARE( mmesa );
@@ -831,9 +831,9 @@ void mach64FlushDMALocked( mach64ContextPtr mmesa )
 /* For client-side state emits - currently unused */
 void mach64UploadHwStateLocked( mach64ContextPtr mmesa )
 {
-   ATISAREAPrivPtr sarea = mmesa->sarea;
+   drm_mach64_sarea_t *sarea = mmesa->sarea;
    
-   mach64_context_regs_t *regs = &sarea->ContextState;
+   drm_mach64_context_regs_t *regs = &sarea->context_state;
    unsigned int dirty = sarea->dirty;
    CARD32 offset = ((regs->tex_size_pitch & 0xf0) >> 2);