Attachment 6236 Details for Bug 6242 – private DMA buffers / mach64-dri - try 1

[patch] private DMA buffers / mach64-dri - try 1

mach64-dri-private-dma-1.patch (text/plain), 3.03 KB, created by George - on 2006-07-16 07:03:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2006-07-16 07:03:59 UTC

Size: 3.03 KB

patch

obsolete

>Common subdirectories: mach64/CVS and mach64-tst/CVS
>diff -aup -x '.*' -x 'depend*' -x '*o' mach64/mach64_ioctl.c mach64-tst/mach64_ioctl.c
>--- mach64/mach64_ioctl.c	2006-04-01 05:37:38.000000000 +0300
>+++ mach64-tst/mach64_ioctl.c	2006-04-11 18:53:05.000000000 +0300
>@@ -180,14 +180,14 @@ void mach64FlushVerticesLocked( mach64Co
>  * Texture uploads
>  */
> 
>-void mach64FireBlitLocked( mach64ContextPtr mmesa, drmBufPtr buffer,
>+void mach64FireBlitLocked( mach64ContextPtr mmesa, void *buffer,
> 			   GLint offset, GLint pitch, GLint format,
> 			   GLint x, GLint y, GLint width, GLint height )
> {
>    drm_mach64_blit_t blit;
>    GLint ret;
> 
>-   blit.idx = buffer->idx;
>+   blit.buf = buffer;
>    blit.offset = offset;
>    blit.pitch = pitch;
>    blit.format = format;
>diff -aup -x '.*' -x 'depend*' -x '*o' mach64/mach64_ioctl.h mach64-tst/mach64_ioctl.h
>--- mach64/mach64_ioctl.h	2005-02-01 01:40:05.000000000 +0200
>+++ mach64-tst/mach64_ioctl.h	2006-04-11 18:52:56.000000000 +0300
>@@ -74,7 +74,7 @@ static __inline void *mach64AllocDmaLock
>    return head;
> }
> 
>-extern void mach64FireBlitLocked( mach64ContextPtr mmesa, drmBufPtr buffer,
>+extern void mach64FireBlitLocked( mach64ContextPtr mmesa, void *buffer,
> 				  GLint offset, GLint pitch, GLint format,
> 				  GLint x, GLint y, GLint width, GLint height );
> 
>diff -aup -x '.*' -x 'depend*' -x '*o' mach64/mach64_screen.c mach64-tst/mach64_screen.c
>--- mach64/mach64_screen.c	2005-10-19 05:46:42.000000000 +0300
>+++ mach64-tst/mach64_screen.c	2006-07-16 04:58:55.000000000 +0300
>@@ -520,7 +520,7 @@ void * __driCreateNewScreen_20050727( __
>    __DRIscreenPrivate *psp;
>    static const __DRIversion ddx_expected = { 6, 4, 0 };
>    static const __DRIversion dri_expected = { 4, 0, 0 };
>-   static const __DRIversion drm_expected = { 1, 0, 0 };
>+   static const __DRIversion drm_expected = { 2, 0, 0 };
> 
>    dri_interface = interface;
> 
>diff -aup -x '.*' -x 'depend*' -x '*o' mach64/mach64_texmem.c mach64-tst/mach64_texmem.c
>--- mach64/mach64_texmem.c	2004-06-03 01:45:00.000000000 +0300
>+++ mach64-tst/mach64_texmem.c	2006-04-11 18:54:09.000000000 +0300
>@@ -569,27 +569,17 @@ static void mach64UploadLocalSubImage( m
> 	 remaining > 0 ;
> 	 remaining -= rows, y += rows, i++ )
>    {
>-       drmBufPtr buffer;
>-       CARD32 *dst;
>-
>        height = MIN2(remaining, rows);
> 
>-       /* Grab the dma buffer for the texture blit */
>-       buffer = mach64GetBufferLocked( mmesa );
>-
>-       dst = (CARD32 *)((char *)buffer->address + MACH64_HOSTDATA_BLIT_OFFSET);
>-
>        assert(image->Data);
> 
>        {
>           const GLubyte *src = (const GLubyte *) image->Data +
>              (y * image->Width + x) * image->TexFormat->TexelBytes;
>-          const GLuint bytes = width * height * image->TexFormat->TexelBytes;
>-          memcpy(dst, src, bytes);
>-       }
> 
>-       mach64FireBlitLocked( mmesa, buffer, offset, pitch, format,
>-			     x, y, width, height );
>+          mach64FireBlitLocked( mmesa, (void *)src, offset, pitch, format,
>+				x, y, width, height );
>+       }
> 
>    }
> 
>Common subdirectories: mach64/server and mach64-tst/server

Actions: View | Splinter Review

Attachments on bug 6242: 4911 | 4912 | 4913 | 4925 | 5123 | 5269 | 5270 | 5271 | 5283 | 5284 | 6234 | 6235 | 6236 | 6241 | 6270 | 6271 | 7232

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.