Am Mittwoch, 10. Dezember 2003 15:12 schrieb Alan Hourihane:
> On Wed, Dec 10, 2003 at 02:46:27PM +0100, Dieter Nützel wrote:
> > Am Sonntag, 10. August 2003 9:39 schrieb Andreas Stenglein:
> > > trivial...
> > > fixes some typos in the radeon driver
> > > ["r100_sanity_typo_patch1.txt" (text/x-patch)]
> > >
> > > diff -ru HEAD_ORIG/xc/lib/GL/mesa/src/drv/radeon/radeon_maos_verts.c \
> > > HEAD/xc/lib/GL/mesa/src/drv/radeon/radeon_maos_verts.c
> > > --- HEAD_ORIG/xc/lib/GL/mesa/src/drv/radeon/radeon_maos_verts.c Wed Apr
> > > 30
> >
> > 03:50:52 \
> >
> > > 2003
> > > +++ HEAD/xc/lib/GL/mesa/src/drv/radeon/radeon_maos_verts.c Sun Aug
> > > 10
> >
> > 11:10:27 2003
> >
> > > @@ -170,7 +170,7 @@
> > > RADEON_CP_VC_FRMT_ST0| \
> > > RADEON_CP_VC_FRMT_ST1| \
> > > RADEON_CP_VC_FRMT_N0)
> > > -#define TAG(x) x##_rgpa_spec_st_st_n
> > > +#define TAG(x) x##_rgba_spec_st_st_n
> > > #include "radeon_maos_vbtmp.h"
> >
> > [-]
> >
> > It "applies" on radeon _and_ r200.
> > Is this _needed_?
> > I have rediffed it against trunk (radeon and r200).
>
> It's not strictly a problem - more of a typo.
>
> I've just committed it.
Did you cover all this?
Maybe "radeon_sanity.c.diff" is wrong?
Thanks,
Dieter
--
Dieter Nützel
@home: <Dieter.Nuetzel () hamburg ! de>
--- xc/lib/GL/mesa/src/drv/r200/r200_maos_verts.c 2003-12-10 18:25:50.000000000 +0100
+++ xc/lib/GL/mesa/src/drv/r200/r200_maos_verts.c.Dieter 2003-09-20 16:57:51.000000000 +0200
@@ -174,7 +174,7 @@
R200_CP_VC_FRMT_ST0| \
R200_CP_VC_FRMT_ST1| \
R200_CP_VC_FRMT_N0)
-#define TAG(x) x##_rgpa_spec_st_st_n
+#define TAG(x) x##_rgba_spec_st_st_n
#include "r200_maos_vbtmp.h"
#define IDX 10
@@ -208,7 +208,7 @@
R200_CP_VC_FRMT_ST1| \
R200_CP_VC_FRMT_Q1| \
R200_CP_VC_FRMT_N0)
-#define TAG(x) x##_w_rgpa_spec_stq_stq_n
+#define TAG(x) x##_w_rgba_spec_stq_stq_n
#include "r200_maos_vbtmp.h"
@@ -231,10 +231,10 @@
init_rgba_st_n();
init_rgba_spec_st_st();
init_st_st_n();
- init_rgpa_spec_st_st_n();
+ init_rgba_spec_st_st_n();
init_rgba_stq();
init_rgba_stq_stq();
- init_w_rgpa_spec_stq_stq_n();
+ init_w_rgba_spec_stq_stq_n();
}
--- xc/lib/GL/mesa/src/drv/radeon/radeon_maos_verts.c 2003-12-10 18:25:50.000000000 +0100
+++ xc/lib/GL/mesa/src/drv/radeon/radeon_maos_verts.c.Dieter 2003-09-20 16:57:51.000000000 +0200
@@ -170,7 +170,7 @@
RADEON_CP_VC_FRMT_ST0| \
RADEON_CP_VC_FRMT_ST1| \
RADEON_CP_VC_FRMT_N0)
-#define TAG(x) x##_rgpa_spec_st_st_n
+#define TAG(x) x##_rgba_spec_st_st_n
#include "radeon_maos_vbtmp.h"
#define IDX 10
@@ -204,7 +204,7 @@
RADEON_CP_VC_FRMT_ST1| \
RADEON_CP_VC_FRMT_Q1| \
RADEON_CP_VC_FRMT_N0)
-#define TAG(x) x##_w_rgpa_spec_stq_stq_n
+#define TAG(x) x##_w_rgba_spec_stq_stq_n
#include "radeon_maos_vbtmp.h"
@@ -227,10 +227,10 @@
init_rgba_st_n();
init_rgba_spec_st_st();
init_st_st_n();
- init_rgpa_spec_st_st_n();
+ init_rgba_spec_st_st_n();
init_rgba_stq();
init_rgba_stq_stq();
- init_w_rgpa_spec_stq_stq_n();
+ init_w_rgba_spec_stq_stq_n();
}
--- xc/lib/GL/mesa/src/drv/radeon/radeon_sanity.c 2003-12-10 18:25:50.000000000 +0100
+++ xc/lib/GL/mesa/src/drv/radeon/radeon_sanity.c.Dieter 2003-09-20 16:57:51.000000000 +0200
@@ -136,7 +136,7 @@
{ 0, 5, "R200_PP_CUBIC_OFFSET_F1_5" },
{ RADEON_PP_TEX_SIZE_0, 2, "RADEON_PP_TEX_SIZE_0" },
{ RADEON_PP_TEX_SIZE_1, 2, "RADEON_PP_TEX_SIZE_1" },
- { RADEON_PP_TEX_SIZE_2, 2, "RADEON_PP_TEX_SIZE_1" },
+ { RADEON_PP_TEX_SIZE_2, 2, "RADEON_PP_TEX_SIZE_2" },
};
struct reg_names {
@@ -177,22 +177,22 @@
{ RADEON_PP_TXFILTER_2, "RADEON_PP_TXFILTER_2" },
{ RADEON_PP_TXFORMAT_0, "RADEON_PP_TXFORMAT_0" },
{ RADEON_PP_TXFORMAT_1, "RADEON_PP_TXFORMAT_1" },
- { RADEON_PP_TXFORMAT_2, "RADEON_PP_TXFORMAT_3" },
+ { RADEON_PP_TXFORMAT_2, "RADEON_PP_TXFORMAT_2" },
{ RADEON_PP_TXOFFSET_0, "RADEON_PP_TXOFFSET_0" },
{ RADEON_PP_TXOFFSET_1, "RADEON_PP_TXOFFSET_1" },
- { RADEON_PP_TXOFFSET_2, "RADEON_PP_TXOFFSET_3" },
+ { RADEON_PP_TXOFFSET_2, "RADEON_PP_TXOFFSET_2" },
{ RADEON_PP_TXCBLEND_0, "RADEON_PP_TXCBLEND_0" },
{ RADEON_PP_TXCBLEND_1, "RADEON_PP_TXCBLEND_1" },
- { RADEON_PP_TXCBLEND_2, "RADEON_PP_TXCBLEND_3" },
+ { RADEON_PP_TXCBLEND_2, "RADEON_PP_TXCBLEND_2" },
{ RADEON_PP_TXABLEND_0, "RADEON_PP_TXABLEND_0" },
{ RADEON_PP_TXABLEND_1, "RADEON_PP_TXABLEND_1" },
- { RADEON_PP_TXABLEND_2, "RADEON_PP_TXABLEND_3" },
+ { RADEON_PP_TXABLEND_2, "RADEON_PP_TXABLEND_2" },
{ RADEON_PP_TFACTOR_0, "RADEON_PP_TFACTOR_0" },
{ RADEON_PP_TFACTOR_1, "RADEON_PP_TFACTOR_1" },
- { RADEON_PP_TFACTOR_2, "RADEON_PP_TFACTOR_3" },
+ { RADEON_PP_TFACTOR_2, "RADEON_PP_TFACTOR_2" },
{ RADEON_PP_BORDER_COLOR_0, "RADEON_PP_BORDER_COLOR_0" },
{ RADEON_PP_BORDER_COLOR_1, "RADEON_PP_BORDER_COLOR_1" },
- { RADEON_PP_BORDER_COLOR_2, "RADEON_PP_BORDER_COLOR_3" },
+ { RADEON_PP_BORDER_COLOR_2, "RADEON_PP_BORDER_COLOR_2" },
{ RADEON_SE_ZBIAS_FACTOR, "RADEON_SE_ZBIAS_FACTOR" },
{ RADEON_SE_ZBIAS_CONSTANT, "RADEON_SE_ZBIAS_CONSTANT" },
{ RADEON_SE_TCL_OUTPUT_VTX_FMT, "RADEON_SE_TCL_OUTPUT_VTXFMT" },
