diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-06-25 20:16:45 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-06-25 20:16:45 +0000 |
| commit | 1968cea3515172a985c8cad914ead74b3621d8ff (patch) | |
| tree | 14f241250ecdc59597ec213a3b8f898fd5794bb8 /driver/xf86-video-intel/src/i915_3d.h | |
| parent | f3606649643e49df0add499c50a7d11e99f0d4f5 (diff) | |
update to xf86-video-intel 2.7.1. Tested by many.
Diffstat (limited to 'driver/xf86-video-intel/src/i915_3d.h')
| -rw-r--r-- | driver/xf86-video-intel/src/i915_3d.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/driver/xf86-video-intel/src/i915_3d.h b/driver/xf86-video-intel/src/i915_3d.h index 1a0bd45b1..d3330e5be 100644 --- a/driver/xf86-video-intel/src/i915_3d.h +++ b/driver/xf86-video-intel/src/i915_3d.h @@ -446,12 +446,12 @@ do { \ #define FS_END() \ do { \ int _i, _pad = (_cur_shader_commands & 0x1) ? 0 : 1; \ - BEGIN_LP_RING(_cur_shader_commands * 3 + 1 + _pad); \ - OUT_RING(_3DSTATE_PIXEL_SHADER_PROGRAM | \ + BEGIN_BATCH(_cur_shader_commands * 3 + 1 + _pad); \ + OUT_BATCH(_3DSTATE_PIXEL_SHADER_PROGRAM | \ (_cur_shader_commands * 3 - 1)); \ for (_i = 0; _i < _cur_shader_commands * 3; _i++) \ - OUT_RING(_shader_buf[_i]); \ + OUT_BATCH(_shader_buf[_i]); \ if (_pad != 0) \ - OUT_RING(MI_NOOP); \ - ADVANCE_LP_RING(); \ + OUT_BATCH(MI_NOOP); \ + ADVANCE_BATCH(); \ } while (0); |