diff options
| author | Vadim Girlin <[email protected]> | 2013-07-31 20:02:22 +0400 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2014-02-05 10:40:23 +1000 |
| commit | 552aae7e47e93ada58649a92ae9e7da37afb05c3 (patch) | |
| tree | 169197e3e607f97be18353a36b725e94940ec52f /src/gallium/drivers/r600/r600_asm.h | |
| parent | 29a43cb0b622d8e40362b386a85c33bdd1a9bb54 (diff) | |
r600g: move barrier and end_of_program bits from output to cf struct (v2)
v2: fix regression on r600 NOP instructions.
Signed-off-by: Vadim Girlin <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_asm.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_asm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h index 82c6c8d1c7e..3bfbcb282a3 100644 --- a/src/gallium/drivers/r600/r600_asm.h +++ b/src/gallium/drivers/r600/r600_asm.h @@ -115,7 +115,6 @@ struct r600_bytecode_output { unsigned array_size; unsigned comp_mask; unsigned type; - unsigned end_of_program; unsigned op; @@ -126,7 +125,6 @@ struct r600_bytecode_output { unsigned swizzle_z; unsigned swizzle_w; unsigned burst_count; - unsigned barrier; }; struct r600_bytecode_kcache { @@ -148,6 +146,8 @@ struct r600_bytecode_cf { struct r600_bytecode_kcache kcache[4]; unsigned r6xx_uses_waterfall; unsigned eg_alu_extended; + unsigned barrier; + unsigned end_of_program; struct list_head alu; struct list_head tex; struct list_head vtx; |