Attachment 34007 Details for Bug 27043 – enable meta ops for draw/coopy pixels

[patch] enable meta ops for draw/coopy pixels

0001-r100-r200-r300-r600-enable-accel-for-Copy-DrawPixel.patch (text/plain), 3.83 KB, created by Alex Deucher on 2010-03-12 12:09:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2010-03-12 12:09:02 UTC

Size: 3.83 KB

patch

obsolete

>From 3905fe8259059de1c67d95484d22459a880b9913 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Fri, 12 Mar 2010 13:58:56 -0500
>Subject: [PATCH] r100/r200/r300/r600: enable accel for Copy/DrawPixels without kms
>
>meta ops should work ok without kms.
>---
> src/mesa/drivers/dri/r200/r200_state.c     |    7 +++----
> src/mesa/drivers/dri/r300/r300_state.c     |    7 +++----
> src/mesa/drivers/dri/r600/r700_state.c     |    7 +++----
> src/mesa/drivers/dri/radeon/radeon_state.c |    7 +++----
> 4 files changed, 12 insertions(+), 16 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
>index 9c2ac05..29d7bed 100644
>--- a/src/mesa/drivers/dri/r200/r200_state.c
>+++ b/src/mesa/drivers/dri/r200/r200_state.c
>@@ -2496,11 +2496,10 @@ void r200InitStateFuncs( radeonContextPtr radeon, struct dd_function_table *func
>    functions->DrawBuffer		= radeonDrawBuffer;
>    functions->ReadBuffer		= radeonReadBuffer;
> 
>-   if (radeon->radeonScreen->kernel_mm) {
>-	   functions->CopyPixels                = _mesa_meta_CopyPixels;
>-	   functions->DrawPixels                = _mesa_meta_DrawPixels;
>+   functions->CopyPixels                = _mesa_meta_CopyPixels;
>+   functions->DrawPixels                = _mesa_meta_DrawPixels;
>+   if (radeon->radeonScreen->kernel_mm)
> 	   functions->ReadPixels                = radeonReadPixels;
>-   }
> 
>    functions->AlphaFunc			= r200AlphaFunc;
>    functions->BlendColor		= r200BlendColor;
>diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
>index 749a246..e660b1f 100644
>--- a/src/mesa/drivers/dri/r300/r300_state.c
>+++ b/src/mesa/drivers/dri/r300/r300_state.c
>@@ -2396,11 +2396,10 @@ void r300InitStateFuncs(radeonContextPtr radeon, struct dd_function_table *funct
> 	functions->DrawBuffer = radeonDrawBuffer;
> 	functions->ReadBuffer = radeonReadBuffer;
> 
>-	if (radeon->radeonScreen->kernel_mm) {
>-		functions->CopyPixels = _mesa_meta_CopyPixels;
>-		functions->DrawPixels = _mesa_meta_DrawPixels;
>+	functions->CopyPixels = _mesa_meta_CopyPixels;
>+	functions->DrawPixels = _mesa_meta_DrawPixels;
>+	if (radeon->radeonScreen->kernel_mm)
> 		functions->ReadPixels = radeonReadPixels;
>-	}
> }
> 
> void r300InitShaderFunctions(r300ContextPtr r300)
>diff --git a/src/mesa/drivers/dri/r600/r700_state.c b/src/mesa/drivers/dri/r600/r700_state.c
>index 2953ffd..9dacf97 100644
>--- a/src/mesa/drivers/dri/r600/r700_state.c
>+++ b/src/mesa/drivers/dri/r600/r700_state.c
>@@ -1861,10 +1861,9 @@ void r700InitStateFuncs(radeonContextPtr radeon, struct dd_function_table *funct
> 	functions->DrawBuffer = radeonDrawBuffer;
> 	functions->ReadBuffer = radeonReadBuffer;
> 
>-	if (radeon->radeonScreen->kernel_mm) {
>-		functions->CopyPixels = _mesa_meta_CopyPixels;
>-		functions->DrawPixels = _mesa_meta_DrawPixels;
>+	functions->CopyPixels = _mesa_meta_CopyPixels;
>+	functions->DrawPixels = _mesa_meta_DrawPixels;
>+	if (radeon->radeonScreen->kernel_mm)
> 		functions->ReadPixels = radeonReadPixels;
>-	}
> }
> 
>diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
>index 0afbc19..539b067 100644
>--- a/src/mesa/drivers/dri/radeon/radeon_state.c
>+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
>@@ -2249,11 +2249,10 @@ void radeonInitStateFuncs( GLcontext *ctx , GLboolean dri2 )
> 
>    ctx->Driver.DrawBuffer		= radeonDrawBuffer;
>    ctx->Driver.ReadBuffer		= radeonReadBuffer;
>-   if (dri2) {
>-	   ctx->Driver.CopyPixels               = _mesa_meta_CopyPixels;
>-	   ctx->Driver.DrawPixels               = _mesa_meta_DrawPixels;
>+   ctx->Driver.CopyPixels               = _mesa_meta_CopyPixels;
>+   ctx->Driver.DrawPixels               = _mesa_meta_DrawPixels;
>+   if (dri2)
> 	   ctx->Driver.ReadPixels               = radeonReadPixels;
>-   }
> 
>    ctx->Driver.AlphaFunc		= radeonAlphaFunc;
>    ctx->Driver.BlendEquationSeparate	= radeonBlendEquationSeparate;
>-- 
>1.5.6.3
>

Actions: View | Splinter Review

Attachments on bug 27043: 34007

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.