diff options
author | Eric Anholt <eric@anholt.net> | 2008-06-04 16:31:16 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2008-06-10 11:37:03 -0700 |
commit | b2216e7bc2f1a35f9fc1794bad83208cd5c583d1 (patch) | |
tree | 1eb5c6416740ffb2135a35a7bcfa70a635b8c09b /src/i915_3d.h | |
parent | d0fda9d24c5fe4870cdbd2ba0213091165666a8e (diff) |
Use batchbuffers instead of ring emits for general commands.
The batchbuffers are managed using libdrm and bufmgr_fake, and dispatched from
the ring from userland.
Diffstat (limited to 'src/i915_3d.h')
-rw-r--r-- | src/i915_3d.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/i915_3d.h b/src/i915_3d.h index 1a0bd45b..d3330e5b 100644 --- a/src/i915_3d.h +++ b/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); |