1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
$NetBSD: patch-ae,v 1.2 2013/03/02 18:13:14 joerg Exp $
Thou shalt not use reserved identifiers.
--- gx_transform.c.orig 2005-01-12 01:23:37.000000000 +0000
+++ gx_transform.c
@@ -34,7 +34,7 @@ float vdq, ndq, tdq[8];
-inline __u32 color_unpack_rgb565 (__u32 X)
+__u32 color_unpack_rgb565 (__u32 X)
{
#ifdef LIL_ENDIAN
return (((X & 0xf800) >> 8) | ((X & 0xe000) >> 13) |
@@ -52,15 +52,15 @@ inline __u32 color_unpack_rgb565 (__u32
inline __u32 color_unpack_rgba4 (__u32 X)
{
- __u32 _X = X;
+ __u32 m_X = X;
#ifdef LIL_ENDIAN
- _X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
+ m_X = ((X & 0x0f00) << 0) | ((X & 0x00f0) << 12) | ((X & 0x000f) << 24) | ((X & 0xf000) >> 12);
#else
- _X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12);
+ m_X = ((X & 0x0f00) << 8) | ((X & 0x00f0) << 4) | ((X & 0x000f) << 0) | ((X & 0xf000) << 12);
#endif
- return (_X | (_X << 4));
+ return (m_X | (m_X << 4));
}
@@ -111,7 +111,7 @@ inline __u32 color_unpack_rgb4a3 (__u32
}
-inline __u32 color_unpack_rgb5a3 (__u32 X)
+__u32 color_unpack_rgb5a3 (__u32 X)
{
if (X & 0x8000)
return (color_unpack_rgb555 (X) | MASK_ALPHA);
@@ -128,7 +128,7 @@ inline __u32 color_unpack_i4 (__u32 X)
}
-inline __u32 color_unpack_i8 (__u32 X)
+__u32 color_unpack_i8 (__u32 X)
{
X |= X << 8;
return (X | (X << 16));
@@ -151,7 +151,7 @@ inline __u32 color_unpack_ia4 (__u32 X)
}
-inline __u32 color_unpack_ia8 (__u32 X)
+__u32 color_unpack_ia8 (__u32 X)
{
__u32 a = X & 0xff00;
@@ -5663,7 +5663,7 @@ inline GXLight *xf_get_light (int i)
}
-inline void calc_color (float outcolor[4], float incolor[4], int chn, float pos[3], float normal[3])
+static inline void calc_color (float outcolor[4], float incolor[4], int chn, float pos[3], float normal[3])
{
float lightsum[4], lcolor[4], tcolor[4];
__u32 lmask;
|
