diff options
| author | John Doe <glisse@localhost.localdomain> | 2010-09-15 11:47:32 -0400 |
|---|---|---|
| committer | John Doe <glisse@localhost.localdomain> | 2010-09-15 11:48:34 -0400 |
| commit | e0b6df4fcce0964ea7930efeb40cb487b4c53337 (patch) | |
| tree | 3ddfbc8e750d004391ad94a595c59bd437203485 /src/gallium/drivers/r600/r600_asm.h | |
| parent | 26fe16a99b762d27e8f499c2e02116e9c4b7a6bb (diff) | |
r600g: misc cleanup
Avoid using r600_screen structure to get ptr to radeon
winsys structure.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'src/gallium/drivers/r600/r600_asm.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_asm.h | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h index cc62535e5c..62a46cb0e1 100644 --- a/src/gallium/drivers/r600/r600_asm.h +++ b/src/gallium/drivers/r600/r600_asm.h @@ -23,7 +23,6 @@ #ifndef R600_ASM_H #define R600_ASM_H -#include "radeon.h" #include "util/u_double_list.h" #define NUM_OF_CYCLES 3 @@ -53,11 +52,11 @@ struct r600_bc_alu { unsigned inst; unsigned last; unsigned is_op3; - unsigned predicate; + unsigned predicate; unsigned nliteral; unsigned literal_added; - unsigned bank_swizzle; - unsigned bank_swizzle_force; + unsigned bank_swizzle; + unsigned bank_swizzle_force; u32 value[4]; int hw_gpr[NUM_OF_CYCLES][NUM_OF_COMPONENTS]; }; @@ -124,15 +123,15 @@ struct r600_bc_cf { unsigned addr; unsigned ndw; unsigned id; - unsigned cond; - unsigned pop_count; - unsigned cf_addr; /* control flow addr */ - unsigned kcache0_mode; + unsigned cond; + unsigned pop_count; + unsigned cf_addr; /* control flow addr */ + unsigned kcache0_mode; struct list_head alu; struct list_head tex; struct list_head vtx; struct r600_bc_output output; - struct r600_bc_alu *curr_bs_head; + struct r600_bc_alu *curr_bs_head; }; #define FC_NONE 0 @@ -143,39 +142,37 @@ struct r600_bc_cf { #define FC_PUSH_WQM 5 struct r600_cf_stack_entry { - int type; - struct r600_bc_cf *start; - struct r600_bc_cf **mid; /* used to store the else point */ - int num_mid; + int type; + struct r600_bc_cf *start; + struct r600_bc_cf **mid; /* used to store the else point */ + int num_mid; }; #define SQ_MAX_CALL_DEPTH 0x00000020 struct r600_cf_callstack { - unsigned fc_sp_before_entry; - int sub_desc_index; - int current; - int max; + unsigned fc_sp_before_entry; + int sub_desc_index; + int current; + int max; }; struct r600_bc { enum radeon_family family; - int chiprev; /* 0 - r600, 1 - r700, 2 - evergreen */ - unsigned use_mem_constant; + int chiprev; /* 0 - r600, 1 - r700, 2 - evergreen */ + unsigned use_mem_constant; struct list_head cf; struct r600_bc_cf *cf_last; unsigned ndw; unsigned ncf; unsigned ngpr; - unsigned nstack; + unsigned nstack; unsigned nresource; unsigned force_add_cf; u32 *bytecode; - - u32 fc_sp; - struct r600_cf_stack_entry fc_stack[32]; - - unsigned call_sp; - struct r600_cf_callstack callstack[SQ_MAX_CALL_DEPTH]; + u32 fc_sp; + struct r600_cf_stack_entry fc_stack[32]; + unsigned call_sp; + struct r600_cf_callstack callstack[SQ_MAX_CALL_DEPTH]; }; int r600_bc_init(struct r600_bc *bc, enum radeon_family family); @@ -187,4 +184,5 @@ int r600_bc_add_output(struct r600_bc *bc, const struct r600_bc_output *output); int r600_bc_build(struct r600_bc *bc); int r600_bc_add_cfinst(struct r600_bc *bc, int inst); int r600_bc_add_alu_type(struct r600_bc *bc, const struct r600_bc_alu *alu, int type); + #endif |