All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] dri/nouveau: Clean up magic numbers in get_rt_format
@ 2010-11-16 22:22 Viktor Novotný
       [not found] ` <1289946153-3024-1-git-send-email-noviktor-9Vj9tDbzfuSlVyrhU4qvOw@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Viktor Novotný @ 2010-11-16 22:22 UTC (permalink / raw)
  To: nouveau

From: Viktor Novotný <noviktor@seznam.cz>

Signed-off-by: Viktor Novotný <noviktor@seznam.cz>
---
Hi,

since the switch to rnn headers was pushed(thank you, curro), here is a patch
that I inteded to submit first, but somehow ended making the switch.
It is just a small clean up.

Regards
	Viktor

 src/mesa/drivers/dri/nouveau/nv04_state_fb.c |    6 +++---
 src/mesa/drivers/dri/nouveau/nv10_state_fb.c |   10 +++++-----
 src/mesa/drivers/dri/nouveau/nv20_state_fb.c |   10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_fb.c b/src/mesa/drivers/dri/nouveau/nv04_state_fb.c
index 730f91f..854571d 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_state_fb.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state_fb.c
@@ -36,11 +36,11 @@ get_rt_format(gl_format format)
 {
 	switch (format) {
 	case MESA_FORMAT_XRGB8888:
-		return 0x05;
+		return NV04_CONTEXT_SURFACES_3D_FORMAT_COLOR_X8R8G8B8_X8R8G8B8;
 	case MESA_FORMAT_ARGB8888:
-		return 0x08;
+		return NV04_CONTEXT_SURFACES_3D_FORMAT_COLOR_A8R8G8B8;
 	case MESA_FORMAT_RGB565:
-		return 0x03;
+		return NV04_CONTEXT_SURFACES_3D_FORMAT_COLOR_R5G6B5;
 	default:
 		assert(0);
 	}
diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
index 056054e..0505547 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
@@ -37,15 +37,15 @@ get_rt_format(gl_format format)
 {
 	switch (format) {
 	case MESA_FORMAT_XRGB8888:
-		return 0x05;
+		return NV10_3D_RT_FORMAT_COLOR_X8R8G8B8;
 	case MESA_FORMAT_ARGB8888:
-		return 0x08;
+		return NV10_3D_RT_FORMAT_COLOR_A8R8G8B8;
 	case MESA_FORMAT_RGB565:
-		return 0x03;
+		return NV10_3D_RT_FORMAT_COLOR_R5G6B5;
 	case MESA_FORMAT_Z16:
-		return 0x10;
+		return NV10_3D_RT_FORMAT_DEPTH_Z16;
 	case MESA_FORMAT_Z24_S8:
-		return 0x0;
+		return NV10_3D_RT_FORMAT_DEPTH_Z24S8;
 	default:
 		assert(0);
 	}
diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
index 8cabb55..cbde74e 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
@@ -37,15 +37,15 @@ get_rt_format(gl_format format)
 {
 	switch (format) {
 	case MESA_FORMAT_XRGB8888:
-		return 0x05;
+		return NV20_3D_RT_FORMAT_COLOR_X8R8G8B8;
 	case MESA_FORMAT_ARGB8888:
-		return 0x08;
+		return NV20_3D_RT_FORMAT_COLOR_A8R8G8B8;
 	case MESA_FORMAT_RGB565:
-		return 0x03;
+		return NV20_3D_RT_FORMAT_COLOR_R5G6B5;
 	case MESA_FORMAT_Z16:
-		return 0x10;
+		return NV20_3D_RT_FORMAT_DEPTH_Z16;
 	case MESA_FORMAT_Z24_S8:
-		return 0x20;
+		return NV20_3D_RT_FORMAT_DEPTH_Z24S8;
 	default:
 		assert(0);
 	}
-- 
1.7.3.2

_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH] dri/nouveau: Clean up magic numbers in get_rt_format
       [not found] ` <1289946153-3024-1-git-send-email-noviktor-9Vj9tDbzfuSlVyrhU4qvOw@public.gmane.org>
@ 2010-11-19 18:06   ` Francisco Jerez
  0 siblings, 0 replies; 2+ messages in thread
From: Francisco Jerez @ 2010-11-19 18:06 UTC (permalink / raw)
  To: nouveau


[-- Attachment #1.1.1: Type: text/plain, Size: 3141 bytes --]

Viktor Novotný <noviktor-9Vj9tDbzfuSlVyrhU4qvOw@public.gmane.org> writes:

> From: Viktor Novotný <noviktor-9Vj9tDbzfuSlVyrhU4qvOw@public.gmane.org>
>
> Signed-off-by: Viktor Novotný <noviktor-9Vj9tDbzfuSlVyrhU4qvOw@public.gmane.org>
> ---
> Hi,
>
> since the switch to rnn headers was pushed(thank you, curro), here is a patch
> that I inteded to submit first, but somehow ended making the switch.
> It is just a small clean up.
>
> Regards
> 	Viktor
>
>  src/mesa/drivers/dri/nouveau/nv04_state_fb.c |    6 +++---
>  src/mesa/drivers/dri/nouveau/nv10_state_fb.c |   10 +++++-----
>  src/mesa/drivers/dri/nouveau/nv20_state_fb.c |   10 +++++-----
>  3 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_fb.c b/src/mesa/drivers/dri/nouveau/nv04_state_fb.c
> index 730f91f..854571d 100644
> --- a/src/mesa/drivers/dri/nouveau/nv04_state_fb.c
> +++ b/src/mesa/drivers/dri/nouveau/nv04_state_fb.c
> @@ -36,11 +36,11 @@ get_rt_format(gl_format format)
>  {
>  	switch (format) {
>  	case MESA_FORMAT_XRGB8888:
> -		return 0x05;
> +		return NV04_CONTEXT_SURFACES_3D_FORMAT_COLOR_X8R8G8B8_X8R8G8B8;
>  	case MESA_FORMAT_ARGB8888:
> -		return 0x08;
> +		return NV04_CONTEXT_SURFACES_3D_FORMAT_COLOR_A8R8G8B8;
>  	case MESA_FORMAT_RGB565:
> -		return 0x03;
> +		return NV04_CONTEXT_SURFACES_3D_FORMAT_COLOR_R5G6B5;
>  	default:
>  		assert(0);
>  	}
> diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
> index 056054e..0505547 100644
> --- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
> +++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
> @@ -37,15 +37,15 @@ get_rt_format(gl_format format)
>  {
>  	switch (format) {
>  	case MESA_FORMAT_XRGB8888:
> -		return 0x05;
> +		return NV10_3D_RT_FORMAT_COLOR_X8R8G8B8;
>  	case MESA_FORMAT_ARGB8888:
> -		return 0x08;
> +		return NV10_3D_RT_FORMAT_COLOR_A8R8G8B8;
>  	case MESA_FORMAT_RGB565:
> -		return 0x03;
> +		return NV10_3D_RT_FORMAT_COLOR_R5G6B5;
>  	case MESA_FORMAT_Z16:
> -		return 0x10;
> +		return NV10_3D_RT_FORMAT_DEPTH_Z16;
>  	case MESA_FORMAT_Z24_S8:
> -		return 0x0;
> +		return NV10_3D_RT_FORMAT_DEPTH_Z24S8;
>  	default:
>  		assert(0);
>  	}
> diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
> index 8cabb55..cbde74e 100644
> --- a/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
> +++ b/src/mesa/drivers/dri/nouveau/nv20_state_fb.c
> @@ -37,15 +37,15 @@ get_rt_format(gl_format format)
>  {
>  	switch (format) {
>  	case MESA_FORMAT_XRGB8888:
> -		return 0x05;
> +		return NV20_3D_RT_FORMAT_COLOR_X8R8G8B8;
>  	case MESA_FORMAT_ARGB8888:
> -		return 0x08;
> +		return NV20_3D_RT_FORMAT_COLOR_A8R8G8B8;
>  	case MESA_FORMAT_RGB565:
> -		return 0x03;
> +		return NV20_3D_RT_FORMAT_COLOR_R5G6B5;
>  	case MESA_FORMAT_Z16:
> -		return 0x10;
> +		return NV20_3D_RT_FORMAT_DEPTH_Z16;
>  	case MESA_FORMAT_Z24_S8:
> -		return 0x20;
> +		return NV20_3D_RT_FORMAT_DEPTH_Z24S8;
>  	default:
>  		assert(0);
>  	}

Thanks, pushed.

[-- Attachment #1.2: Type: application/pgp-signature, Size: 229 bytes --]

[-- Attachment #2: Type: text/plain, Size: 181 bytes --]

_______________________________________________
Nouveau mailing list
Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
http://lists.freedesktop.org/mailman/listinfo/nouveau

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-19 18:06 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-16 22:22 [PATCH] dri/nouveau: Clean up magic numbers in get_rt_format Viktor Novotný
     [not found] ` <1289946153-3024-1-git-send-email-noviktor-9Vj9tDbzfuSlVyrhU4qvOw@public.gmane.org>
2010-11-19 18:06   ` Francisco Jerez

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.