diff options
| author | Eric Anholt <eric@anholt.net> | 2009-10-06 18:24:50 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-10-08 15:34:09 -0700 |
| commit | af27a3a0a5645c6f41f583611bd0f2559dc7cb2f (patch) | |
| tree | cc59506521f6177723ec16247c76e9ac96a48afe /src/i915_video.c | |
| parent | cc5d3ba3c331c3b1becf2d19277b24144bf34cfa (diff) | |
Rename the xf86 screen private from pScrn to scrn.
Diffstat (limited to 'src/i915_video.c')
| -rw-r--r-- | src/i915_video.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/i915_video.c b/src/i915_video.c index e2080e77..2b805e49 100644 --- a/src/i915_video.c +++ b/src/i915_video.c @@ -40,14 +40,14 @@ #include "i915_3d.h" void -I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, +I915DisplayVideoTextured(ScrnInfoPtr scrn, I830PortPrivPtr pPriv, int id, RegionPtr dstRegion, short width, short height, int video_pitch, int video_pitch2, int x1, int y1, int x2, int y2, short src_w, short src_h, short drw_w, short drw_h, PixmapPtr pPixmap) { - intel_screen_private *intel = intel_get_screen_private(pScrn); + intel_screen_private *intel = intel_get_screen_private(scrn); uint32_t format, ms3, s5; BoxPtr pbox = REGION_RECTS(dstRegion); int nbox_total = REGION_NUM_RECTS(dstRegion); @@ -69,9 +69,9 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, nbox_this_time = BOXES_IN_BYTES(BATCH_BYTES(intel)); nbox_total -= nbox_this_time; - intel_batch_start_atomic(pScrn, 200 + 20 * nbox_this_time); + intel_batch_start_atomic(scrn, 200 + 20 * nbox_this_time); - IntelEmitInvarientState(pScrn); + IntelEmitInvarientState(scrn); intel->last_3d = LAST_3D_VIDEO; BEGIN_BATCH(20); @@ -453,6 +453,6 @@ I915DisplayVideoTextured(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv, int id, ADVANCE_BATCH(); } - intel_batch_end_atomic(pScrn); + intel_batch_end_atomic(scrn); } } |