diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_vertprog.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/xmesaP.h | 2 | ||||
| -rw-r--r-- | src/mesa/math/m_debug_util.h | 2 | ||||
| -rw-r--r-- | src/mesa/sparc/sparc_matrix.h | 2 | ||||
| -rw-r--r-- | src/mesa/x86/mmx_blend.S | 2 | ||||
| -rw-r--r-- | src/mesa/x86/read_rgba_span_x86.S | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c b/src/mesa/drivers/dri/r200/r200_vertprog.c index 100b715f9b0..bb8550332b3 100644 --- a/src/mesa/drivers/dri/r200/r200_vertprog.c +++ b/src/mesa/drivers/dri/r200/r200_vertprog.c @@ -350,7 +350,7 @@ static unsigned long op_operands(enum prog_opcode opcode) ((t_src_class(a.File) == VSF_IN_CLASS_PARAM && \ t_src_class(b.File) == VSF_IN_CLASS_PARAM) || \ (t_src_class(a.File) == VSF_IN_CLASS_ATTR && \ - t_src_class(b.File) == VSF_IN_CLASS_ATTR))) \ + t_src_class(b.File) == VSF_IN_CLASS_ATTR))) /* fglrx on rv250 codes up unused sources as follows: unused but necessary sources are same as previous source, zero-ed out. diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h index 6cd020f2ed3..9320442f46a 100644 --- a/src/mesa/drivers/x11/xmesaP.h +++ b/src/mesa/drivers/x11/xmesaP.h @@ -249,7 +249,7 @@ struct xmesa_buffer { #define PACK_TRUECOLOR( PIXEL, R, G, B ) \ PIXEL = xmesa->xm_visual->RtoPixel[R] \ | xmesa->xm_visual->GtoPixel[G] \ - | xmesa->xm_visual->BtoPixel[B]; \ + | xmesa->xm_visual->BtoPixel[B]; /** diff --git a/src/mesa/math/m_debug_util.h b/src/mesa/math/m_debug_util.h index 25ee029cebc..4959785093e 100644 --- a/src/mesa/math/m_debug_util.h +++ b/src/mesa/math/m_debug_util.h @@ -216,7 +216,7 @@ extern char *mesa_profile; x = LONG_MAX; \ for ( cycle_i = 0 ; cycle_i < 10 ; cycle_i++ ) { \ unsigned long cycle_tmp1, cycle_tmp2; \ - rdtscll(cycle_tmp1); \ + rdtscll(cycle_tmp1); #define END_RACE(x) \ rdtscll(cycle_tmp2); \ diff --git a/src/mesa/sparc/sparc_matrix.h b/src/mesa/sparc/sparc_matrix.h index f677d9bda13..6ef0acde69e 100644 --- a/src/mesa/sparc/sparc_matrix.h +++ b/src/mesa/sparc/sparc_matrix.h @@ -151,7 +151,7 @@ #define LDMATRIX_0_5_10(BASE) \ ld [BASE + ( 0 * 0x4)], M0; \ ld [BASE + ( 5 * 0x4)], M5; \ - ld [BASE + (10 * 0x4)], M10; \ + ld [BASE + (10 * 0x4)], M10; #define LDMATRIX_0_5_10_12_13_14(BASE) \ ld [BASE + ( 0 * 0x4)], M0; \ diff --git a/src/mesa/x86/mmx_blend.S b/src/mesa/x86/mmx_blend.S index eeaf43ea937..df736cdaa59 100644 --- a/src/mesa/x86/mmx_blend.S +++ b/src/mesa/x86/mmx_blend.S @@ -235,7 +235,7 @@ TWO(PUNPCKHWD ( MA2, MA2 )) /* pa2 | pa2 | | TWO(PUNPCKHDQ ( MA2, MA2 )) /* pa2 | pa2 | pa2 | pa2 */ #define GMB_PACK( MS1, MS2 ) \ - PACKUSWB ( MS2, MS1 ) /* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */ ;\ + PACKUSWB ( MS2, MS1 ) /* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */ ; #define GMB_STORE(rgba, MSS ) \ ONE(MOVD ( MSS, REGIND(rgba) )) /* | | | | sa1 | sb1 | sg1 | sr1 */ ;\ diff --git a/src/mesa/x86/read_rgba_span_x86.S b/src/mesa/x86/read_rgba_span_x86.S index 5def1f859ed..0b94f024ec2 100644 --- a/src/mesa/x86/read_rgba_span_x86.S +++ b/src/mesa/x86/read_rgba_span_x86.S @@ -65,7 +65,7 @@ movl (%ebx), %eax ; \ bswap %eax /* ARGB -> BGRA */ ; \ rorl $8, %eax /* BGRA -> ABGR */ ; \ - movl %eax, (%ecx) /* ABGR -> R, G, B, A */ ; \ + movl %eax, (%ecx) /* ABGR -> R, G, B, A */ ; /** |