diff options
| author | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2006-12-04 15:48:04 +0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2007-01-06 15:06:39 -0800 |
| commit | 736d82a6b43f174cb95b425faacd4b0b889916fa (patch) | |
| tree | 287256c97eef955a5b2f9a48986134ef24d01630 /src/i830_exa.c | |
| parent | 53b42f5bc7a58d02106436486e5bb56e56dbbfa1 (diff) | |
| parent | 4c790f614ecba1f6468e51779cfaf0e36b6b17ad (diff) | |
Merge branch 'modesetting-origin' into modesetting
Diffstat (limited to 'src/i830_exa.c')
| -rw-r--r-- | src/i830_exa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c index 3e874c97..f23816f9 100644 --- a/src/i830_exa.c +++ b/src/i830_exa.c @@ -57,9 +57,9 @@ do { \ } while(0) #endif -float scale_units[2][2]; +static float scale_units[2][2]; -const int I830CopyROP[16] = +const static int I830CopyROP[16] = { ROP_0, /* GXclear */ ROP_DSa, /* GXand */ @@ -79,7 +79,7 @@ const int I830CopyROP[16] = ROP_1 /* GXset */ }; -const int I830PatternROP[16] = +const static int I830PatternROP[16] = { ROP_0, ROP_DPa, @@ -111,8 +111,8 @@ union intfloat { OUT_RING(tmp.ui); \ } while(0) -Bool is_transform[2]; -PictTransform *transform[2]; +static Bool is_transform[2]; +static PictTransform *transform[2]; extern Bool I830EXACheckComposite(int, PicturePtr, PicturePtr, PicturePtr); extern Bool I830EXAPrepareComposite(int, PicturePtr, PicturePtr, PicturePtr, |