X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fr600%2Fr600_asm.h;h=453c29790c158b68309f7b73b64a983ddef60aa7;hb=b922a0ce12916a91cfc3e56714913fcf63279ff2;hp=a9123299f1e6568274a9c4e9fce6bdd0e6f14c43;hpb=a25b91c2c2118741389f418a66de7ca145b8600b;p=mesa.git

diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h
index a9123299f1e..453c29790c1 100644
--- a/src/gallium/drivers/r600/r600_asm.h
+++ b/src/gallium/drivers/r600/r600_asm.h
@@ -34,6 +34,7 @@ struct r600_bc_alu_src {
 	unsigned			neg;
 	unsigned			abs;
 	unsigned			rel;
+	uint32_t			value;
 };
 
 struct r600_bc_alu_dst {
@@ -46,18 +47,14 @@ struct r600_bc_alu_dst {
 
 struct r600_bc_alu {
 	struct list_head		list;
-	struct list_head		bs_list; /* bank swizzle list */
 	struct r600_bc_alu_src		src[3];
 	struct r600_bc_alu_dst		dst;
 	unsigned			inst;
 	unsigned			last;
 	unsigned			is_op3;
 	unsigned			predicate;
-	unsigned			nliteral;
-	unsigned			literal_added;
 	unsigned			bank_swizzle;
 	unsigned			bank_swizzle_force;
-	u32				value[4];
 	unsigned			omod;
 };
 
@@ -111,15 +108,13 @@ struct r600_bc_vtx {
 struct r600_bc_output {
 	unsigned			array_base;
 	unsigned			type;
-	unsigned			end_of_program;
-	unsigned			inst;
 	unsigned			elem_size;
 	unsigned			gpr;
 	unsigned			swizzle_x;
 	unsigned			swizzle_y;
 	unsigned			swizzle_z;
 	unsigned			swizzle_w;
-	unsigned			barrier;
+	unsigned			burst_count;
 };
 
 struct r600_bc_kcache {
@@ -137,6 +132,7 @@ struct r600_bc_cf {
 	unsigned			cond;
 	unsigned			pop_count;
 	unsigned			cf_addr; /* control flow addr */
+	unsigned			barrier;
 	struct r600_bc_kcache		kcache[2];
 	unsigned			r6xx_uses_waterfall;
 	struct list_head		alu;
@@ -144,6 +140,8 @@ struct r600_bc_cf {
 	struct list_head		vtx;
 	struct r600_bc_output		output;
 	struct r600_bc_alu		*curr_bs_head;
+	struct r600_bc_alu		*prev_bs_head;
+	struct r600_bc_alu		*prev2_bs_head;
 };
 
 #define FC_NONE				0
@@ -195,16 +193,14 @@ void eg_cf_vtx(struct r600_vertex_element *ve, u32 *bytecode, unsigned count);
 int r600_bc_init(struct r600_bc *bc, enum radeon_family family);
 void r600_bc_clear(struct r600_bc *bc);
 int r600_bc_add_alu(struct r600_bc *bc, const struct r600_bc_alu *alu);
-int r600_bc_add_literal(struct r600_bc *bc, const u32 *value);
 int r600_bc_add_vtx(struct r600_bc *bc, const struct r600_bc_vtx *vtx);
 int r600_bc_add_tex(struct r600_bc *bc, const struct r600_bc_tex *tex);
 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);
+void r600_bc_special_constants(u32 value, unsigned *sel, unsigned *neg);
 void r600_bc_dump(struct r600_bc *bc);
-void r600_cf_vtx(struct r600_vertex_element *ve, u32 *bytecode, unsigned count);
-void r600_cf_vtx_tc(struct r600_vertex_element *ve, u32 *bytecode, unsigned count);
 
 int r600_vertex_elements_build_fetch_shader(struct r600_pipe_context *rctx, struct r600_vertex_element *ve);