diff options
| author | Kenneth Graunke <[email protected]> | 2011-06-30 00:05:49 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2011-07-07 13:31:41 -0700 |
| commit | 87de78523ae96737a39267aaa135ddabff05f2f2 (patch) | |
| tree | f459e809d657b5efdd3a9d56325998f813667813 | |
| parent | 473a519d20c97b54504ff61aaedc0665529c14b7 (diff) | |
i965: Convert PIPELINE_SELECT to OUT_BATCH style.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_misc_state.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c index a2ee7a592e2..fcbd97b44c8 100644 --- a/src/mesa/drivers/dri/i965/brw_misc_state.c +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c @@ -609,16 +609,10 @@ static void upload_invarient_state( struct brw_context *brw ) if (intel->gen == 6) intel_emit_post_sync_nonzero_flush(intel); - { - /* 0x61040000 Pipeline Select */ - /* PipelineSelect : 0 */ - struct brw_pipeline_select ps; - - memset(&ps, 0, sizeof(ps)); - ps.header.opcode = brw->CMD_PIPELINE_SELECT; - ps.header.pipeline_select = 0; - BRW_BATCH_STRUCT(brw, &ps); - } + /* Select the 3D pipeline (as opposed to media) */ + BEGIN_BATCH(1); + OUT_BATCH(brw->CMD_PIPELINE_SELECT << 16 | 0); + ADVANCE_BATCH(); if (intel->gen < 6) { /* Disable depth offset clamping. */ |